diff -Nru opencpn-plugin-logbookkonni-1.2018.2/buildosx/InstallOSX/logbookkonni_pi.pkgproj.in opencpn-plugin-logbookkonni-1.2024/buildosx/InstallOSX/logbookkonni_pi.pkgproj.in
--- opencpn-plugin-logbookkonni-1.2018.2/buildosx/InstallOSX/logbookkonni_pi.pkgproj.in	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/buildosx/InstallOSX/logbookkonni_pi.pkgproj.in	2016-02-25 13:06:29.000000000 +0000
@@ -1048,7 +1048,7 @@
 							<key>LANGUAGE</key>
 							<string>Czech</string>
 							<key>SECONDARY_VALUE</key>
-							<string>Please install OpenCPN version 3.3.1606 (or later) in Applications folder.</string>
+							<string>Please install OpenCPN version 4.1 (or later) in Applications folder.</string>
 							<key>VALUE</key>
 							<string>OpenCPN not found.</string>
 						</dict>
@@ -1056,7 +1056,7 @@
 							<key>LANGUAGE</key>
 							<string>Dutch</string>
 							<key>SECONDARY_VALUE</key>
-							<string>Please install OpenCPN version 3.3.1606 (or later) in Applications folder.</string>
+							<string>Installeer OpenCPN versie 4.1 (of nieuwer) in Applications folder.</string>
 							<key>VALUE</key>
 							<string>OpenCPN not found.</string>
 						</dict>
@@ -1064,7 +1064,7 @@
 							<key>LANGUAGE</key>
 							<string>English</string>
 							<key>SECONDARY_VALUE</key>
-							<string>Please install OpenCPN version 3.3.1606 (or later) in Applications folder.</string>
+							<string>Please install OpenCPN version 4.1 (or later) in Applications folder.</string>
 							<key>VALUE</key>
 							<string>OpenCPN not found.</string>
 						</dict>
@@ -1072,7 +1072,7 @@
 							<key>LANGUAGE</key>
 							<string>French</string>
 							<key>SECONDARY_VALUE</key>
-							<string>S'il vous plait, installez la version 3.3.1606 (or later) dans le dossier des applications.</string>
+							<string>S'il vous plait, installez la version 4.1 (or later) dans le dossier des applications.</string>
 							<key>VALUE</key>
 							<string>OpenCPN n'existe pas</string>
 						</dict>
@@ -1080,7 +1080,7 @@
 							<key>LANGUAGE</key>
 							<string>German</string>
 							<key>SECONDARY_VALUE</key>
-							<string>Bitte erst OpenCPN Version3.3.1606 (or later) im Programme Ordner installieren.</string>
+							<string>Bitte erst OpenCPN Version 4.1 (or later) im Programme Ordner installieren.</string>
 							<key>VALUE</key>
 							<string>OpenCPN nicht gefunden.
 </string>
@@ -1089,7 +1089,7 @@
 							<key>LANGUAGE</key>
 							<string>Italian</string>
 							<key>SECONDARY_VALUE</key>
-							<string>Please install first OpenCPN version 3.3.1606 (or later) in Applications folder.</string>
+							<string>Please install first OpenCPN version 4.1 (or later) in Applications folder.</string>
 							<key>VALUE</key>
 							<string>OpenCPN not found.</string>
 						</dict>
@@ -1097,7 +1097,7 @@
 							<key>LANGUAGE</key>
 							<string>Spanish</string>
 							<key>SECONDARY_VALUE</key>
-							<string>Instale por favor primero OpenCPN versión 3.3.1606 (or later) en la carpeta de Aplicaciones</string>
+							<string>Instale por favor primero OpenCPN versión 4.1 (or later) en la carpeta de Aplicaciones</string>
 							<key>VALUE</key>
 							<string>OpenCPN no encontrado</string>
 						</dict>
@@ -1109,7 +1109,7 @@
 				</dict>
 				<dict>
 					<key>BEHAVIOR</key>
-					<integer>2</integer>
+					<integer>3</integer>
 					<key>DICTIONARY</key>
 					<dict>
 						<key>IC_REQUIREMENT_JAVASCRIPT_FUNCTION</key>
@@ -1131,7 +1131,7 @@
 							<key>SECONDARY_VALUE</key>
 							<string></string>
 							<key>VALUE</key>
-							<string>OpenCPN Version undetermined.  Assuming 3.3.1606 or later.</string>
+							<string>OpenCPN Version to old. This Plugin is for OpenCPN version 4.1.602 or later.</string>
 						</dict>
 					</array>
 					<key>NAME</key>
@@ -1365,7 +1365,7 @@
 // is it the right version of OpenCPN?
   ocpn_data = system.files.bundleAtPath('/Applications/OpenCPN.app');
 ocpn_vers = ocpn_data.CFBundleShortVersionString;
-chk_flag = (ocpn_vers &gt;= '3.3.1606'); }
+chk_flag = (ocpn_vers &gt;= '4.1'); }
 } catch (e) {
 // an exception just occurred
  return (false)
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/CMakeLists.txt opencpn-plugin-logbookkonni-1.2024/CMakeLists.txt
--- opencpn-plugin-logbookkonni-1.2018.2/CMakeLists.txt	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/CMakeLists.txt	2016-02-25 13:06:29.000000000 +0000
@@ -60,8 +60,6 @@
         	src/jsonreader.cpp
         	src/jsonval.cpp
         	src/jsonwriter.cpp
-		src/MessageBoxOSX.h
-		src/MessageBoxOSX.cpp
  	)
 
 IF(WIN32)
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/data/Help.html opencpn-plugin-logbookkonni-1.2024/data/Help.html
--- opencpn-plugin-logbookkonni-1.2018.2/data/Help.html	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/data/Help.html	2016-02-25 13:06:29.000000000 +0000
@@ -1637,7 +1637,8 @@
       <td class="dashedCell" valign="top"><a name="navDepth"></a>Column
 Depth</td>
       <td class="dashedCell" valign="top">If your echosounder sends
-data via NMEA, it's inserted automatically </td>
+data via NMEA, it's inserted automatically.<br>
+If data is from NMEA, the depth shown is below transducer. </td>
     </tr>
     <tr>
       <td class="dashedCell" valign="top"><a name="navRemarks"></a>Column
@@ -2429,11 +2430,10 @@
       <p><u>Set as Watchbase</u><br>
 When you have made changes on a specific day, e.g. day 3 merged watches
 because a member is seasick and doesn't recover. <br>
-</p>
+      </p>
       <p>Then you can set this
 day as new watchbase.<br>
 Delete if nessesary the unused members and click 'Calculate'. </p>
-
       <p><u>Split Watch<br>
       </u>Splits the Watch into two Watches.<br>
 Please select only one column. <br>
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/debian/changelog opencpn-plugin-logbookkonni-1.2024/debian/changelog
--- opencpn-plugin-logbookkonni-1.2018.2/debian/changelog	2015-06-04 22:20:48.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/debian/changelog	2016-02-25 13:22:33.000000000 +0000
@@ -1,3 +1,28 @@
+opencpn-plugin-logbookkonni (1.2024-0~trusty1) trusty; urgency=low
+
+  * Version 1.2024
+
+ -- Pavel Kalian <pavel@kalian.cz>  Thu, 25 Feb 2016 07:20:10 -0600
+opencpn-plugin-logbookkonni (1.2024-0~vivid1) vivid; urgency=low
+
+  * Version 1.2024
+
+ -- Pavel Kalian <pavel@kalian.cz>  Thu, 25 Feb 2016 07:20:10 -0600
+opencpn-plugin-logbookkonni (1.2024-0~wily1) wily; urgency=low
+
+  * Version 1.2024
+
+ -- Pavel Kalian <pavel@kalian.cz>  Thu, 25 Feb 2016 07:20:10 -0600
+opencpn-plugin-logbookkonni (1.2024-0~xenial1) xenial; urgency=low
+
+  * Version 1.2024
+
+ -- Pavel Kalian <pavel@kalian.cz>  Thu, 25 Feb 2016 07:20:10 -0600
+opencpn-plugin-logbookkonni (1.2018.2-0~precise1) precise; urgency=low
+
+  * Version 1.2018
+
+ -- Pavel Kalian <pavel@kalian.cz>  Thu, 04 Jun 2015 17:19:08 -0500
 opencpn-plugin-logbookkonni (1.2018.2-0~trusty1) trusty; urgency=low
 
   * Version 1.2018
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/debian/rules opencpn-plugin-logbookkonni-1.2024/debian/rules
--- opencpn-plugin-logbookkonni-1.2018.2/debian/rules	2015-06-04 22:19:13.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/debian/rules	2016-02-25 13:20:28.000000000 +0000
@@ -9,6 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+#Don't touch the SVG files otherwise cairo is not able to render them...
+DEB_DH_SCOUR_ARGS += -Xsvg
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/ca.po opencpn-plugin-logbookkonni-1.2024/po/ca.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/ca.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/ca.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-23 05:01-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Catalan\n"
 "Language: ca_ES\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: ca\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Quadern de bitàcola"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Els motors encara estan engegats\n\n"
 "Aturar el(s) motor(s)?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "des de "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Connector"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Quadern de bitàcola actiu"
 
@@ -58,15 +58,15 @@
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.htm\n"
 "Vídeos amb consells estan a Youtube, cerqueu a LogbookKonni."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Preferències del Quadern de bitàcola"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Seleccionar fitxers comprimits de disseny"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -79,143 +79,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr "Ma"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Tr"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr "Ji"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr "Mi"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr "Mt"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "St"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Sp"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Principal"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Provar"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Gènova 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Gènova 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Gènova 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Floc 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Floc 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Floc 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Floc"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Mesana"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr "Messana de Tempesta"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Vela Estai"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Vela Espí"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Podeu canviar les abreviacions i els noms de les veles\n"
 "A les Opcions/varis/veles"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "Línia automàtica del Waypoint d'arribada"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "Línia\n"
 "Automàtica de canvi de guàrdia"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "Línia\n"
 "Automàtica de canvi de curs>"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "Línia\n"
 "Automàtica de Distància> "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -225,88 +225,87 @@
 "o canviar el text a la Barra d'eines/Connectors/Quadern de Bitàcola\n\n"
 "Shift+Enter =afegeix una nova línia"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "KTS"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "ft"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "fth"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "mb"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "h"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "dia/es"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "setmana/es"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "mes"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Informació"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Cerca en el quadern de bitàcola"
 
@@ -317,46 +316,46 @@
 msgstr "El quadern de bitàcola té %i lines\n\n"
 "Cal crear un nou quadern de bitàcola per minimitzar el temps de càrrega."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr " apagat"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr " encès"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Esteu segur?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Nou quadern de bitàcola"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Reinicialitza tots els valors a zero ?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "El vostre quadern de bitàcola no té línies?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Última línia del Quadern de Bitàcola\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "El darrer Quadern de Bitàcola és\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Antic Quadern de Bitàcloa fins a %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -365,137 +364,137 @@
 "i fer còpia de seguretat de tots els fitxers de dades de la versió 1.1 a\n\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr "El quadern de bitàcola té %i línies\n\n"
 "\t\t\tCal crear un nou quadern de bitàcola per minimitzar el temps de càrrega."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "Ruta sense nom"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "***HOME A l'AIGUA***\n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Derrota "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Engegat Motor #1"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Funcionant motor #1"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Aturat motor #1"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Engegat Motor #2"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Funcionant motor #2"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Motor #2 funcionant"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Aturat motor #2"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Motor #2 aturat"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr "Generador engegat"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr "Generador funcionant"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr "\n"
 "Generador funcionant"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr "Generador aturat"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr "\n"
 "Generador aturat"
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Veles hissades"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Veles canviades"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Veles baixades"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Suprimir la línia Nr. %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Si us plau, introduïu la Data en el format: \n"
 " %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Si us plau, introduïu el Temps en el format:\n"
 " %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Si us plau, introduïu 0544512.15n0301205.15e per a\n"
 "054º 45' 12.15'' N 030º 12' 05.15'' E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Si us plau, introduïu 05445.1234n03012.0504e per a\n"
 "054º 45.1234' N 030º 12.0504' E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Superior a 59 minuts"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
@@ -503,19 +502,19 @@
 "Però el GPS no envia dades.\n"
 "El vent s'ha establert com a vent aparent\n\n"
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Cap senyal GPS!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Nom de WP següent: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Darrer punt de la Ruta"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -524,73 +523,72 @@
 "Nom del Waypoint: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Waypoint omès"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Waypoint d'arribada"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr "No es permet afegir dades a un vell quadern de bitàcola\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN retorna al quadern actual"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Cercar en"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Quadern de bitàcola actual"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Tots els quaderns"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Canvi de cadena"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "A la columna"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Data"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Seleccioneu la ruta"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Seleccioneu quadern de bitàcola"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Blocs de text"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Definir l'interval de temps"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Posició"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Afegiu la línia"
 
@@ -598,10 +596,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Afegir una línia al final del quadern de bitàcola"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Exportar"
 
@@ -611,71 +608,65 @@
 msgstr "exportar el vostre quadern de bitàcola en format: \n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr "Mostrar el mode de selecció de visualització"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Seleccioneu el disseny: "
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Seleccioneu un disseny per mostrar\n"
 "Amb el botó \"Veure\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "R"
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Recarregar dissenys"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "E"
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Editar el Disseny"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "Html"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Veure"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Veure dades al navegador (HTML) o Openoffice/LibreOffice (ODT)"
 
@@ -704,32 +695,32 @@
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Regular Temporitzador"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Establir l'interval pel temporitzador"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Temporitzador"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Vigilància"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Waypoints"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Distància"
 
@@ -739,7 +730,7 @@
 msgstr "Estableix la distància desitjada en MN\n"
 " = (Per millorar la derrota)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Rumb"
 
@@ -759,8 +750,8 @@
 "És una bona idea definir un valor >0 aquí\n"
 " per a trobar el vent verdader."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "Parar"
 
@@ -768,884 +759,895 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Suspendre/Reprendre el(s) event(s) en funcionament"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Ruta"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Hora"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr "Estat"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "DistànciaTotal"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG (T)"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Rumb"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "SOG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "STW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Profunditat"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Comentaris"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Esborrar línia"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Mostrar columnes amagades"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Amagar columnes"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Tancar el quadern de bitàcola"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Esborrar línia"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Canviar Dia<->Mes"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navegació"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Baròmetre"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Higròmetre"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Aire"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Aigua"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr "TWA"
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
-msgstr "TWS"
-
 #: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr "TWS\n"
+"Mín|Mitj|Màx"
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr "AWA"
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr "AWS\n"
+"Mín|Mitj|Màx"
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr "TWS"
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr "AWS"
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Corent"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Força del corrent"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Onades"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Onatge"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Meteorologia"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Núvols"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Visibilitat"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Meteorologia"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "#1 Total"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "#2 Total"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Combustible"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Total combustible"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Veles"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Rissos"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Alternador"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Total Alternador"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Banc #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "Total Amp. #1"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr "Banc #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "Total Amp. #2"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Desalinitzador"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "Total Aigua"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr "Consum d'Aigua"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Total d'aigua"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Ruta ID"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr "Derrota ID"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/Veles"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "Exportar les vostres dades de vista general com a HTML o ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Seleccionar una antiga bitàcola"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Inici"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Fi"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Temps Total"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Distància p. dia"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Millor Distàn.  p. dia"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Velocitat mitj."
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Velocitat Màx."
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Banc #1 gen."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Banc #1 utilitzat"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Banc #2 gen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Banc #2 utilitzat"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr "Produc. d'aigua"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Aigua comsumida"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr "TWA Avg."
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr "TWS Avg."
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr "TWS Max."
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Direcció mitj. del corrent"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Corrent Mitj."
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Corent màx."
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Ona Mitj."
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Ona Màx."
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Onatge Mitj."
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Onatge Màx."
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "S'utilitza principalment les veles"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Camí"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Anar a ruta"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Vista general"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Afegir tripulació"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Afegir un nou tripulant"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "Exportar les dades-tripulació com:\n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Copiar vigilància"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Nom complet"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Només el nom"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Només els cognoms"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "A bord"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Nom"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Cognom"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Nom"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Títol"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Data de naixement"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Lloc de naixement"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nacionalitat"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Num. de Passaport"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Emès en"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Data d'emissió"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Codi Postal"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "País"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Ciutat"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Carrer"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Mostra només a bord"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Mostra totes les entrades"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Ordre ascendent"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Ordenació descendent"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Paràmetres de vigilàncies"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Defineix la data d'inici de la travessia"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Defineix l'hora d'inici de la travessia"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Dies"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Durada de la teva travessia"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Calcular"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Calcular les vigilàncies amb els membres escrits en columnes"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Reseteja"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Reseteja dades al nivell d'edició"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Esborra"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Esborra totes les dades"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Dia anterior"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Ara"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Anar a la data/hora actual"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Dia següent"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Dia:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Mostra/Defineix la data\n"
 "Mostra les dades en el vostre ODT/Programa-navegador des d'aquest dia fins al final"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Mostra en pantalla"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "tot"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "aquest dia"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "Utilitzat pel programa Editor-Navegador/ODT\n"
 "Una línea per dia + dies seleccionats = dies mostrats"
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "1.Vigilància"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Durada de la Vigilància"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Tripulant"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
-msgstr ""
+msgstr "Establir com a base de vigilància"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Divideix guàrdia"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Uneix guàrdies"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Intercanvia guàrdies"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Esborra tripulants"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Llista de tripulants"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Afegir equipament"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "Afegir l'equipament del vaixell"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Mostra l'equipament"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Mostra/amaga la graella d'Equipament"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "Exportar les dades-equipament del vostre vaixell com:\n"
 " HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Editar el Disseny"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Vaixell"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Port base"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Indicatiu de trucada"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "Nº de Casc"
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Nº d'identificació del Casc"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Nº de la Vela"
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Assegurança"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Inscripció"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Pòlissa"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Patró"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Nom      "
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telèfon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Detalls"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Tipus"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Constructor"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Casc"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Data de llançament"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Nº d'amarrament"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Dissenyador"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Construcció"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Eslora total"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "LOD"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Longitud de coberta"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Eslora de Flotació"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Mànega"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Mànega màxima"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Calat"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Etiqueta d'Usuari"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "Escriure en la pròpia etiqueta"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Desplaçament"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Equipament"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Descripció"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Nº de Sèrie"
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Afegir nova línia"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "Exportar les vostres dades de servei com a HTML o ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Seleccioneu el disseny:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prioritat"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Servei pendent"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Si"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Valor d'alarma"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Valor urgent"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Valor inicial"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Actiu"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Servei efectuat"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Comprar peces d'aquest servei"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Servei"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Exporteu les dades-reparacions com HTML o ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Reparació pendent"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparació realitzada"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Comprar peces per a aquesta reparació"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparacions"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "exportar les dades-ComprarPeces com a HTML o ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Categoria"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Comprar peces"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "A"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Manteniment"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "cap"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr " -Temporitzador normal - Interval: "
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr "- Temporitzador ple"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr " -Temporitzador individual"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr "cap esdeveniment/s\n"
 "Clicar una o més bales per començar"
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Esdeveniment/s suspesos\n"
 "Clicar el botó per reiniciar tots els esdeveniments"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Esdeveniment/s actius\n"
 "Clicar el botó per suspendre o una vinyeta d'aturar"
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
@@ -1653,32 +1655,32 @@
 "vermell = l'esdeveniment està aturat\n"
 "groc = l'esdeveniment està suspès. Reprendre l'esdeveniment amb botó d'iniciar"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Full de càlcul OpenDocument (*.ods)|*. ods|Excel 2003 Format (*. xml)|*. XML |CSV Format OpenOffice (*. csv)|*. csv |Reserva Logbook (*. txt) *. txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr "Mostra el Mode Motors/Veles"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "Pista"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Seleccioneu la pista"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr "GUID"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "Utilitzar els Blocs de Text..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Salvar Fitxers de Qadern de Bitàcola"
 
@@ -1694,93 +1696,93 @@
 msgstr "No s'ha configurat camí a l'Editor HTML\n"
 "in Caixad'Eines/Connectors/Bitàcola Konni/Preferències"
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Desar l'Fitxer Llista de Tripulació"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Amagar equipament"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Desar Fitxer del Vaixell"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Desar Fitxer de Servei"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Desar l'Fitxer de reparacions"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Desar Fitxer Comprar Peces"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Desar Fitxer Vista General"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Filtre Maquetació de"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Renomenar Maquetació"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Esborrar Maquetació"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Enviar Maquetació per correu electrònic"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Instal.lar única Maquetació"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Primera/Darrera Entrada"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Fitxer"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Afegeix un ítem"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Eliminar ítem"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Renomenar Ítem"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Afegir arbre de nodes"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Suprimir arbre de nodes"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Text"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Blocs de Text"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1806,17 +1808,17 @@
 "Utilitzeu arrossegar i deixar anar per desplaçar un element al/del menú\n\n"
 "Veure l'arbre de nodes següent per a més ajuda"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "El nom d'element es mostra en el menú clic-dreta de la  Columna següent\n"
 "Clicant-hi el text quedarà insertat\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Textos per al menú clic-dret"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1824,11 +1826,11 @@
 "Motor apagat\n\n"
 "Demostració clic-dret sobre el Menú Blocs de text, per obtenir ajuda"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Demostració veles amunt"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1839,76 +1841,76 @@
 "Cliqueu el botó \"OK\"\n\n"
 "Utilitzeu \"arrossegar i deixar anar\" per afegir l'element al menú"
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "Textos quan s'utilitza només aquest diàleg"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Motor apagat\n\n"
 "Demostració Menú clic-dret a \"Utilitzar Test de Blocs de Text\" per a ajuda"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Demostració motor aturada"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Nou Node%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Nou item%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Temporitzador normal"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr "Temporitzador complet"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "cada"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "+ Minuts"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Esborrar tot"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Temporitzador individual"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr "Hora"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minuts"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr "AM/PM"
 
@@ -1924,18 +1926,16 @@
 msgid "Individual"
 msgstr "Individual"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Mes"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Dia"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "Any"
 
@@ -1979,49 +1979,73 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "cada 15 graus + /-1 hora"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Mostrar icona Quadern de Bitàcola"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr "Mostrar la posició del Format"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Mostrar icones d'Eines"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "No. de motors interiors"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Missatges de Navegació/ de veles"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr "Barra d'estat en la part inferior de la pàgina"
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr "Si no es comprova la Barra d'Estat es posarà sobre els botons de Navegació/Meteo/Motor-veles"
+
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr "Generador a bord"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr "Comprovar si hi ha un generador a bord. \n"
 "si no es marquen les columnes del Generador no es mostrarà en el Quadern de Bitàcola"
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr "Mostra les velocitats del vent Mín| Mitj| Màx"
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr "Si es comprova el TWS i l'AWS es mostrarà a la pantalla velocitats del vent Mín|Mitj|Màx"
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Missatges de Navegació/ de veles"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Escriure advertència \"Cap GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2029,45 +2053,41 @@
 "si el GPS és fora de servei, desmarcar a\n"
 "per prevenir la repetició de missatges."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr "Escriure missatge \"Motor funcionant\" "
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "A l'engegar el motor definir les veles com a abaixades"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Direcció del vent fixada a:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "per defecte"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "Per defecte = En relació al vaixell(vent aparent)\n"
 "Rumb = Direcció real del vent"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "A l'engegar el motor definir les veles com a abaixades"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr "Barra d'estat en la part inferior de la pàgina"
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr "Si no es comprova la Barra d'Estat es posarà sobre els botons de Navegació/Meteo/Motor-veles"
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Esdeveniments"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Escriu aquest text del quadern de bitàcola quan es produeix aquesta incidència, modifiqueu els textos al vostre gust"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2077,41 +2097,41 @@
 "fent clic al botó\n"
 "o canviar el text a les opcions"
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "Línia automàtica\n"
 "Waypoint d'arribada:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Canvis de curs"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Quadern de bitàcola en primer pla a cada esdeveniment"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Instal·lar dissenys"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Desinstal·lar Quadern de Bitàcola"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Instal·lar"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Instal·lar dissenys Quadern de Bitàcola (OpenCPN_Logbook_Layouts.zip)"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Desinstal·lar"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2125,248 +2145,244 @@
 "tots els idiomes del del Quadern de Bitàcola\n"
 "i netejar el fitxer OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Comportament"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Només s'utilitza quan entres 1/2, 1/4... en un camp total, o per a calcular el nivell d'aigua\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Tanc"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Escollir galons/litres en les abreviacions "
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Capacitat"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr "Graus"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Segons"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Velocitat"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Mostra la Profunditat en"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Metres"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Peus"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Braces"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Mostra Onada/Onatge en"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Veritable"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnètic"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr "fm"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Velocitat del vent"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Combustible/aigua"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Hores de Motor"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr "Amper"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr "Eix de propulsió"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr "S"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Revolucions"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr "RPM"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dia(es)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Setmana(es)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Setmana(es)"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Mes "
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Si el GPS no està disponible useu l'entrada manual"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Velocitat del vent "
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr " Direcció "
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Relativa"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Abreviacions"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Camí a ODT-Editor"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "per utilitzar MS-Word, annexa %s com aquest:\n"
 "\"C:\\el_vostre_Camí_a_Winword\\WINWORD. EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Camí cap al gestor de dades"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Camí cap al client de correu"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Camí a l'Editor-HTML\n"
 "(opcional)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Reiniciar camins"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Camins"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Amplada del conjunt de línies a"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Conjunt transparència a"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr "Transparent"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr "sòlid"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Conjunt de les línies de color de les rutes en"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "blanc"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "negre"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "vermell"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "groc"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Conjunt de les línies de color de les pistes en"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
-msgstr ""
+msgstr "Marqueu una de las caselles de verificació de sota, si voleu utilitzar la sentència ERRPM (veure ajuda)"
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "Verificar"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2374,114 +2390,115 @@
 "Haureu de veure la sentència ERRPM\n"
 "a l'esquerra del botó"
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "El Núm. del motor es correspon a la columna Motor #1"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr "Marqueu aquesta casella si les dades NMEA contenen missatges de RPM per a aquest motor\n"
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "El Núm. del motor es correspon a la columna Motor #2"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr "El Núm. del motor es correspon amb la columna Generador"
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr "Marqueu aquesta casella si les dades NMEA contenen missatges de RPM per a aquest generador\n"
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
-msgstr ""
+msgstr "Utilitzeu la sentència ERRPM per calcular les hores de motor"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
-msgstr ""
+msgstr "Utilitar les sentències WIMDA per a les informacions meteorològiques"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Pel baròmetre, temperatura de l'aire i humitat relativa"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr "Espai de selecció de caselles >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr "Facilita l'utilització d'una Tablet-PC"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
-msgstr ""
+msgstr "Abreviatures es mostren en les caselles de Verificació de veles\n"
+"El nom s'utilitza per a la columna \"Veles\" quan afegeix una nova entrada"
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<< Enrere"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
-msgstr ""
+msgstr "Tornar al nom de les veles"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Fila +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Fila -"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Columna +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Columna -"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr "El vostre generador encara està funcionant .\n\n"
 "aturar ara el Generador."
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "El vostre Motor #1 està funcionant en mode manual.\n\n"
 "aturar ara el Motor."
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "El vostre Motor #2 està funcionant en mode manual.\n\n"
 "aturar ara el Motor."
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr "El vostre Generador està funcionant en mode manual.\n\n"
 "aturar ara el Generador."
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr "La vostra regió utilitza un format de 24h.\n"
 "en aquest cas el sistema no utilitzarà pas els caràcters AM/PM.\n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
@@ -2490,103 +2507,102 @@
 "%s%s%s%s%s\n\n"
 "si us plau, utilitzeu un format de data diferent a les tres caselles d'elecció."
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Si us plau ompliu un caràcter en Graus, Minuts i Segons"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr "El vostre motor #2 encara està funcionant .\n\n"
 "El Motor #2 s'aturarà ara."
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Indiqueu el camí a l'editor HTML"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Indica el camí al gestor de dades"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Indica el camí al Client de correu electrònic"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Indica el camí a l'Editor-ODT"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "des de"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "a"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Ho sentim, no hi ha dissenys seleccionats"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Ho sentim, el Quadern de bitàcola no té línies"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "no es troba en en el fitxer de dissenys "
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "! \n\n"
 "us oblideu d'afegir aquesta línia en el vostre disseny?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Heu oblidat d'adjuntar la capçalera amb [[ i ]]\n"
 " o dades amb {{ and }} ?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Punts de ruta"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
-msgstr ""
+msgstr "Durada de les guàrdies per defecte ex.  3.30 / formats disponibles 3.30, 3,30, 3:30, 0330 per a 3 hores 30 minuts"
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
-msgstr ""
+msgstr "Modificar les guàrdies com es vulgui / Arrossegar i deixar el membres de la llista de tripulació"
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
-msgstr ""
+msgstr "*Opcional* Proposar a * un membre per fer-lo estàtic d'una vigilància / feu clic a Calcular"
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr "Tots els canvis relatius només per aquest dia."
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Si"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adreça"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Seleccioneu una data"
 
@@ -2610,8 +2626,8 @@
 msgid "Date + Months"
 msgstr "Data + Mesos"
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "No"
 
@@ -2619,16 +2635,16 @@
 msgid "Logbook until "
 msgstr "Quadern de bitàcola fins "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Qadern de Bitàcola Total"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i any(s) %i Mes(os) %i Dia(es)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E Setmana(es) %D Dia(es) %H:%M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/cs.po opencpn-plugin-logbookkonni-1.2024/po/cs.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/cs.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/cs.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-23 05:01-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: cs\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Lodní deník"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Vaše motory běží\n\n"
 "Zastavit motory?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "z "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Doplněk"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Aktivní  lodní deník"
 
@@ -63,15 +63,15 @@
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Na Youtube je pár videí, která Ti v začátku pomůžou, hledej \"LogbookKonni\"."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Nastavení lodního deníku"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Vyber zabalené šablony"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -84,143 +84,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Skutečný"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "do"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "do"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Hlavní"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Zkusit"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Můžete změnit zkratky a jména plachet\n"
 "v Nastavení/Různé/Plachty"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "automatický záznam, bod dosažen"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "automatický záznam\n"
 "změna hlídky"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "automatický záznam\n"
 "změna kurzu >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "automatický záznam\n"
 "Vzdálenost > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -230,88 +230,87 @@
 "nebo změnit tento text v Nástroje/Zásuvné moduly/Lodní deník\n\n"
 "Shift+Enter přidá nový záznam"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "dny"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "týdny"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "měsíc"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Informace"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Designer"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Hledej v lodním deníku"
 
@@ -322,46 +321,46 @@
 msgstr "Tvůj lodní deník má víc než %i řádků\n\n"
 "Měl bys založit nový deník pro minimalizaci nahrávacího času."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Jsi si jist?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Nový lodní deník"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Resetovat všechny hodnoty na nulu"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Tvůj lodní deník nemá žádné řádky?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Poslední řádka lodního deníku\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Poslední lodní deník je\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Starý deník do %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -370,154 +369,154 @@
 "a zálohovat všechny datové soubory z verze 1.1 do\n\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr "Tvůj lodní deník má víc než %i řádků\n\n"
 "\t\t\tMěl bys založit nový deník pro zkrácení času načítání."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "(Nepojmenovaná trasa)"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** Muž přes palubu *** \n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Stopa "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Motor #1 nastartován"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Motor #1 běží"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Demo Motor zastaven"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Motor #2 nastartován"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Motor #2 běží"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Motor #2 běží"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Demo Motor zastaven"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Demo Motor zastaven"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr "Generátor nastartován"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr "Generátor běží"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr "\n"
 "Generator běží"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr "Generátor zastaven"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Nejpoužívanější plachty"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Pokud je změněna hlídka"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Plachty"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Smazat řádku č. %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Prosím vlož datum ve formátu: \n"
 "      %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Prosím vlož datum ve formátu: \n"
 "   %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Prosím zadej  0544512.15n0301205.15e pro\n"
 "054Deg 45Min 12Sec N 030Deg 12Min 05Sec E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Prosím zadej 05445.1234n03012.0504e pro\n"
 "054Deg 45Min 12Sec N 030Deg 12Min 05Sec E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Minuty větší než 59"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Není GPS signál"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Jméno příštího WP:"
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Poslední bod trasy"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -526,72 +525,71 @@
 "Jméno bodu: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Bod vynechán"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Bod dosažen"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Hledej v"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Všechny deníky"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Hledaný řetězec"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "Ve sloupci"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Datum"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Vyber"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Vyber trasu"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Vybrat lodní deník"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr " - Časovač běží - Interval:"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Pozice"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Přidat záznam"
 
@@ -599,10 +597,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Přidat řádku na konec deníku"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Exportovat"
 
@@ -612,71 +609,65 @@
 msgstr "export dat deníku jako:\n"
 "HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Vybrat rozvržení:"
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Vyber rozvržení, které je zobrazeno\n"
 "tlačítkem \"Zobrazit\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Nahrát rozvržení"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Editovat rozvržení"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Zobrazit"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Zobrazit data v prohlížeči (HTML) nebo Openoffice/LibreOffice (ODT)"
 
@@ -704,32 +695,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Časovač"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Nastavit interval časovače"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Časovač"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Hlídka"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Bod vynechán"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Vzdálenost"
 
@@ -739,7 +730,7 @@
 msgstr "Nastavte požadovanou vzdálenost v NM\n"
 " (Track made good)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Mraky"
 
@@ -759,8 +750,8 @@
 "Je dobrý nápad, aby zde byla hodnota > 0\n"
 "aby byl nalezen správný vítr."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "do"
 
@@ -768,912 +759,921 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Pozastavení/obnovení probíhajících událostí"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Trasa"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Čas"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Celková vzdálenost"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Směr"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Hloubka"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Poznámky"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Smaž záznam"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Zobrazit schované sloupce"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Schovat sloupec"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Zobraz ikonu deníku"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Smaž záznam"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Přehodit den <-> měsíc"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navigace"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Barometr"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Vlhkoměr"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Vzduch"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Voda"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Proud"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "P/Síla"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Vlna"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Příboj"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Počasí"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Mraky"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Viditelnost"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Metry"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "Palivo celkem"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "Palivo celkem"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Palivo"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Palivo celkem"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Plachty"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Ref"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Teplota"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Gen. celkem"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Voda"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "Palivo celkem"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Voda"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Trasa"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/Plachty"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "exportovat tvá přehledová data jako HTML or ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Vyber jeden ze starších deníků"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Spustit"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Konec"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Celkový čas"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Vzdálenost za den"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Nej upluto za den"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Prúm. Rychlost"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Max rychlost"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Voda"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Prům. směr proudu"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Proud prům."
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Max proud"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Vlna prům."
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Vlna max"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Příboj prům."
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Příboj max"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Nejpoužívanější plachty"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Cesta"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Jít na trasu"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Přehled"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Přidej posádku"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "P5idat člena posádky"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "exportovat data posádky jako:\n"
 "HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Kopírovat do hlídky"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Celé jméno"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Jméno"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Pouze příjmení"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "Na palubě"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Příjmení"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Rodné příjmení"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Jméno"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Titul"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Datum narození"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Místo narození"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Národnost"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Číslo pasu"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Vydán v"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Datum vydání"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "PSČ"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Stát"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Město"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Ulice"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Zobraz pouze naloděné"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Ukaž všechny záznamy posádky"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Seřadit vzestupně"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Seřadit sestupně"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Nastav hlídky"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Nastavte datum začátku plavby"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Nastavte čas začátku plavby"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Dny"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Délka plavby"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Vypočítat"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Výpočet hlídek s členy zadanými ve sloupcích"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Stopy"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Obnovit data na úrovni úpravy"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Vymazat všechna data"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Den zpátky"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Ne"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Přejít na datum a čas teď"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Den dopředu"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Dny"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Ukáže/nastaví den\n"
 "Ve tvém prohlížečí se zobrazí data od tohoto dne do konce"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Výtlak"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "Instalovat"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "Tento den"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "Používá se pro ODT/prohlížeč\n"
 "Jeden řádek pro den + vybrané dny = Zobrazené dny"
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "Hlídka"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Hlídka"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Metry"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Stejná hlídka jako"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Nastav hlídky"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Nastav hlídky"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Nastav hlídky"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Smaž uzel stromu"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Seznam posádky"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Přidat vybavení"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "přidat vybavení na loď"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Ukaž vybavení"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Ukaž/Schovej tab. vybavení"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "exportovat data o lodi/vybavení jako:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Uprav rozvržení"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Loď"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Domovský přístav"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Volací znak"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "Č. trupu"
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Identifikační číslo trupu"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Č. plachty"
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Pojištění"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Registrace"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Podmínky"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Majitel"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Jméno"
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Detaily"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Typ"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Stavitel"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Trup"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Datum spuštění"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Č. doku"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Konstrukce"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Celková délka"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Délka přes palubu"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Délka vodorysky"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Šířka"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Největší šířka trupu"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Ponor"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "VlastPopis"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "Napiš vlastní popis"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Výtlak"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Vybavení"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Popis"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Cériové č."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Přidat nový záznam"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "exportuj data o servisu jako HTML nebo ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Vyber rozložení:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Priorita"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Co servisovat"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Pokud"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Hodnota varování"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Urgentní hodnota"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Počáteční hodnota"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Aktivní"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Servis proveden"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Koupit díly na tento servis"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Servis"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "exportuj data o opravách jako HTML nebo ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Co opravit"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Oprava provedena"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Koupit díly na tuto opravu"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Opravy"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "exportuj seznam nákupu dílů jako HTML nebo ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Koupit díly"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "U"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Údržba"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "nic"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr " - Časovač běží - Interval:"
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Vyber"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "použij Textblocks..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Ulož soubor deníku"
 
@@ -1689,93 +1689,93 @@
 msgstr "Není nastavena cesta k editoru HTML\n"
 "v Nástroje/Zásuvné moduly/LogbookKonni/Nastavení"
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Ulož soubor seznamu posádky"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Schovat vybavení"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Ulož soubor lodi"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Ulož soubor servisu"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Ulož soubor oprav"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Ulož soubor nákupního seznamu"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Ulož soubor přehledu"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Filtr rozvržení podle"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Přejmenovat  rozvržení"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Smaž rozvržení"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Odešli rozložení e-mailem"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Nainstaluj jedno rozvržení"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Jméno"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Přidej položku"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Smaž položku"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Přejmenovat  položku"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Přidej uzel stromu"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Smaž uzel stromu"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1801,17 +1801,17 @@
 "Přetáhni a pusť položku do/z nabídky\n\n"
 "Podívej se na ostatní uzly stromu pro další nápovědu"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "Název položky je zobrazen v kontextové nabídce následujících sloupců\n"
 "Po kliknutí na ně je text vložen\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Texty pro kontextovou nabídku"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1819,11 +1819,11 @@
 "Motor zastaven\n\n"
 "Demo - kontextová nabídka 'použij Testextblocks' pro nápovědu"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Demo Plachty vytaženy"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1835,76 +1835,76 @@
 "Klikni na tlačítko OK\n\n"
 "Táhni a pusť pro přidání položky do nabídky"
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "Texty pouze při použití tohoto dialogu"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Motor zastaven\n\n"
 "Demo - kontextová nabídka 'použij Testextblocks' pro nápovědu"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Demo Motor zastaven"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Nový uzel%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Nová položka%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Celkový čas"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "Metry"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "Minuty"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Vyber"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minuty"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1920,18 +1920,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Měsíc"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Dny"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1975,49 +1973,73 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "každých 15 stupňů +/- 1 hour"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Zobraz ikonu deníku"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr "Formát zobrazení pozice"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Zobraz tooltipy"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "Počet vestavěných motorů"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Pokud je změněna hlídka"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr "Generátor na palubě"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr "Zaškrtní, jestli je na palubě generátor. \n"
 "Pokud nezaškrtnuté, sloupec generátor nebude zobrazovat v lodním deníku"
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Pokud je změněna hlídka"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Vypisuj varování \"Není GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2025,45 +2047,41 @@
 "Pokud GPS není v pořádku, odškrtni\n"
 "aby se zpráva neopakovala."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr "Psát zprávy \"běh motoru\" "
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Při startu motoru všecny plachty dolů"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Směr větru nastaven na:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "výchozí"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "výchozí = Relativní k lodi\n"
 "Směr = Skutečný směr větru"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Při startu motoru všecny plachty dolů"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Události"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Zapíše text do lodního deníku, dojde-li k události, změnit texty podle potřeby"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2072,40 +2090,40 @@
 "Můžeš nastavit nebo zrušit interval časovače\n"
 "nebo změnit tento text v Nástroje/Zásuvné moduly/Lodní deník"
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "automatický záznam, bod dosažen"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Pokud se kurs změní o více než"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Zobrazit deník při události"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Instalovat rozvržení"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Odinstalovat Logbook"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Instalovat"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Nainstalovat OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Odinstalovat"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2119,248 +2137,244 @@
 "všechny Logbook překlady\n"
 "a vyčistí OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Chování"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Používá se pouze při zadání 1/2, 1/4... v poli součtu, nebo pro výpočet odsolovače\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Nádrž"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Nastavit gal/litr ve zkratkách "
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Kategorie"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Kapacita"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr "Stupně"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Sekundy"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Rychlost"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Zobraz hloubku v"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Metry"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Stopy"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Fathomy"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Zobraz vlny/příboj v"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Skutečný"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnetický"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Rychlost větru"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Teplota"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Palivo/voda"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Motohodiny"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Otáčky"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dny"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Týdny"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Týdny"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Měsíc"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Pokud je vypnutá GPS, použij pro ruční vstup"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Rychlost větru"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr " Směr"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Relativní"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Zkratky"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Cesta k editoru ODT"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "pro použití MS-Word, připoj %s jako:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Cesta k manažeru dat"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Cesta k poštovnímu programu"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Cesta k editoru HTML\n"
 "(volitelné)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Reset cest"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Cesty"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Zobrazit"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Nastavit šířku čáry na"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Nastavit průhlednost na"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr "průhledný"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr "plný"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Nastavit barvu čáry trasy na"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "bílá"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "černá"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "červená"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "žlutá"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Nastavit barvu čáry stopy na"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr "Zaškrtni jedno z následujících políček, pokud chceš použít ERRPM-věty (viz Nápověda)"
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "Označit"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2368,211 +2382,210 @@
 "Měl bys vydět věty ERRPM\n"
 "vlevo od tlačítka"
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "Č. motoru odpovídá sloupci motor #1"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr "Toto políčko zaškrtněte, pokud NMEA proud obsahuje RPM zprávy pro tento motor\n"
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "Č. motoru odpovídá sloupci motor #2"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr "Č. motoru odpovídá sloupci generátor"
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr "Toto políčko zaškrtněte, pokud NMEA proud obsahuje RPM zprávy pro tento generator\n"
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "Použít ERRPM-věty pro výpočet hodin motoru"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Použít WIMDA-věty z meteorologické stanice"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Ve sloupci"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Ve sloupci"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Prosím, vyplň jeden znak do stupňů, minut a sekund"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Nastavit cestu k editoru HTML"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Nastavit cestu k manažeru dat"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Nastavit cestu k poštovnímu programu"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Nastavit cestu k editoru ODT"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "z"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "do"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Promiň, není instalováno žádné rozvržení"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Promiň, deník nemá žádné záznamy"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "nenalezeno v souboru rozvržení"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Nezapomněl's přidat tuto řádku v rozvržení?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Nezapomněl's uzavřít hlavičku do [[ a ]]\n"
 " nebo Data do {{ a }} ?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Trasa"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Ano"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adresa"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Vyber trasu"
 
@@ -2596,8 +2609,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Ne"
 
@@ -2605,16 +2618,16 @@
 msgid "Logbook until "
 msgstr "Deník do"
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Deník celkem"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/da.po opencpn-plugin-logbookkonni-1.2024/po/da.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/da.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/da.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-31 23:22-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: da\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Logbog"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "fra"
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Aktive logbog"
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Logbog Indstillinger"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Vælg zip pakket Layout filer"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -74,143 +74,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Sand"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "til"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "til"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Storsejl"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Try-sejl"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genua 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genua 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genua 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Fok 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Fok 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Fok 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Fok"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Stagsejl"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Spiler"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Du kan ændre forkortelserne og navnene på sejlene\n"
 "i Indstillinger/Diverse/Sejl"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "automatisk linje Ankomst Waypoint"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "automatisk linie\n"
 "vagtskifte"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "automatisk linje\n"
 "Kursændring > "
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "automatisk linje\n"
 "Distance > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -220,88 +220,87 @@
 "eller ændre denne tekst i Værktøjer/Tilføjelser/Logbook\n\n"
 "Shift+Enter tilføjer ny linje"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "sømil"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "fod"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "favne"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "C"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/t"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "t"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "Dag(e)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "uge(r)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "måned"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Information"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Designer"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Søg i logbog"
 
@@ -312,200 +311,200 @@
 msgstr "Din logbog her %i linjer eller mere\n\n"
 "Venligst start en ny logbog for at minimere indhentnings tiden."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Er du sikker ?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Ny logbog"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Nulstil alle værdier ?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Din logbog har ingen linjer ?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Sidste linje fra logbog\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Sidste logbog er\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Gammel logbog indtil %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "(unavngivet rute)"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** MAND OVER BORD *** \n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Spor "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Motor #1"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Motor #1"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Maskine #1 stoppet"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Motor #2"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Motor #2"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Motor #2"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Maskine #2 stoppet"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Maskine #2 stoppet"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Mest brugte sejl"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Hvis vagt skiftet"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Sejl"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Slet række nr. %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Bekræft"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Anfør dato i formatet:\n"
 "      %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Anfør dato i formatet:\n"
 "   %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Anfør 0544512.15n0301205.15e for\n"
 "054° 45' 12.15\" N \n"
 "030°12' 05.15\" E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Anfør 05445.1234n03012.0504e for\n"
 "054° 45,1234' N \n"
 "030°12,0504' E "
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Minutter er større end 59"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "intet GPS-signal"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Næste WP navn:"
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Sidste waypoint i ruten"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -514,73 +513,72 @@
 "Navn på Waypoint: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Waypoint sprunget over"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Ankommet waypoint"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr "Det er ikke tilladt at tilføje information til en gammel logbog\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN skifter til den nuværende logbog"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Søg i"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Aktuel Logbog"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Alle logbøger"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Søgeord"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "I kolonne"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Dato"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Vælg"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Vælg rute"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Vælg logbog"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Tekstblokke"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "- Timer til - Interval:"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Position"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Tilføj linje"
 
@@ -588,10 +586,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Tilføj linje i slutningen af logbogen"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Eksporter"
 
@@ -601,71 +598,65 @@
 msgstr "Eksporter dine \"Logbog\"-data som:\n"
 "   HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Vælg layout:"
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Vælg et layout som vises\n"
 "med knappen \"Se\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Genindlæs Layouts"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Rediger layout"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "LOD"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Se"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Se data i Browser(HTML) eller Open/Libreoffice (ODT) "
 
@@ -693,32 +684,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Timer til/fra"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Timer til/fra"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Vagt"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Waypoint sprunget over"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -727,7 +718,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Skyer"
 
@@ -743,8 +734,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "til"
 
@@ -752,911 +743,920 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Suspender/genoptag løbende begivenheder"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Rute"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Tid"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Distance Total"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Kurs"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Dybde"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Bemærkninger"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Slet række"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Vis skjulte kolonner"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Skjul kolonne"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Vis logbogs Ikon"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Slet række"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Luft"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Vand"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Strøm"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Strømstyrke"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Bølgehøjde"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Dønning"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Vejr"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Skyer"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Sigtbarhed"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Meter"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "#1 total"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "#2 total"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Brændstof"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Brændstof total"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Sejl"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Reb"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "AH #1 total"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "AH #2 total"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Ferskvandsmaskine"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr "W-tilgængelig"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Vand Total"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Rute"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/Sejl"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "Eksporter dine  \"Oversigt\"-data som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Vælg en af de gamle logbøger"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Slut"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Total tid"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Distance pr. dag"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Bedste distance per dag"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Gennemsnitlig fart"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Maksimal fart"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Bank #1 produceret"
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Bank #1 forbrug"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Bank #2 produceret"
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Bank #2 forbrug"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr "Ferskvandsmaskine produktion"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Forbrug af Vand"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Gennemsnitlige strøm retning"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Gennemsnitlige strøm"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Maksimal strøm"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Gennemsnitlig bølgehøjde"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Maksimale bølgehøjde"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Gennemsnitlig dønning"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Maksimale dønning"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Mest brugte sejl"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Sti"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Gå til rute"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Oversigt"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Tilføj besætning"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Tilføj nyt besætningsmedlem"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "Eksporter dine \"Besætning\"-data som:\n"
 "        HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Fuldt navn"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Fornavn"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Efternavn"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "Ombord"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Navn"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Fødselsnavn"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Fornavn"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Titel"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Fødselsdag"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Fødselssted"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nationalitet"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Pas nummer"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Udsted i"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Udstedt dato"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Postnummer"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Land"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "By"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Gade"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Vis kun ombordværende"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Vis alle besætnings-tilføjelser"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Sorter stigende"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Sorter faldende"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Sæt vagter"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Angiv startdato for sejlturen"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Angiv starttidspunktet for din sejltur"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Dag(e)"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Længden af din sejltur"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Beregn"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Fod"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Dag forud"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Nej"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Gå til dato/klokkeslæt nu"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Dag fremad"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Dag(e)"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Viser/angiver dagen\n"
 "Viser data i din browser fra denne dag og fremad"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Deplacement"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "gal"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "denne dag"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "Vagt"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Vagt"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Meter"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "samme vagt som"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Sæt vagter"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Sæt vagter"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Sæt vagter"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Slet Træmenu"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Besætningsliste"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Tilføj udstyr"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "tilføj udstyret i din båd"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Vis udstyr"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Vis/Skjul udstyr"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "Eksporter dine \"Båd/Udrustning\"-data som:\n"
 "           HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Rediger layouts"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Båd"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Hjemhavn"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Kaldesignal"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "Skrog ID nummer"
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Skrog identifikations nummer"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Sejl nummer"
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Forsikring"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Registrerings-Nr."
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Police"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Ejer"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Navn"
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Værft"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Skrog"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Søsætningsdato"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Havneplads nummer"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Konstruktion"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Længde over alt"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Længde over dæk"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Længde - vandlinie"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Bredde"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Største bredde på skrog"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Dybgang"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Brugerlabel"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "skriv din egen label"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Deplacement"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Serie-Nr."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Tilføj ny linje"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "Eksporter dine  \"Service\"-data som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Vælg layout:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prioritet"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Service TODO"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Hvis"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Varselsværdi"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Presserende værdi"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Startværdi"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Service afsluttet"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Køb reservedel til denne reparation"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Eksporter dine \"Reparation\"-data som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Manglende reparationer"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparation afsluttet"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Køb reservedele til denne reparation"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparationer"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "Eksporter dine  \"Køb Dele\"-data som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Kategori"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Køb reservedele"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "Ved"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Vedligehold"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "ingen"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr "- Timer til - Interval:"
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Opendocument Regneark(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Vælg"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "brug Tekstblokke"
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Gem Logbog fil"
 
@@ -1672,93 +1672,93 @@
 msgstr "Ingen sti fundet til HTML-Editor\n"
 "i Værktøjer/Tilføjelser/Logbook/Indstillinger "
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Gem Besætningsliste fil"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Skjul udstyr"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Gem båd fil"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Gem Service fil"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Gem reparations fil"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Gem KøbReservedele fil"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Gem Oversigts fil"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Filtrer layout ved"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Omdøb layout"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Slet layout"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Send layout med email"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Installer enkelt layout"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Fornavn"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Tilføj Emne"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Slet Emne"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Omdøb Emne"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Tilføj Træmenu"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Slet Træmenu"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Tekst"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Tekstblokke"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1784,17 +1784,17 @@
 "Brug Træk og Slip for at flytte emner fra/til menu\n\n"
 "se næste træmenu for yderligere hjælp"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "Emnenavnet vises i Højreklik-Menuen på følgende kolonner\n"
 "Ved at klikke på den indsættes teksten\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Tekst til Højreklik-Menu"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1802,11 +1802,11 @@
 "Motor stoppet\n\n"
 "Demo - højreklik-Menu 'Brug Testtekstblok' for hjælp"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Demo Sejl op"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1818,76 +1818,76 @@
 "Klik OK-knap\n\n"
 "Brug Træk og Slip for at placere emne i menu"
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "Tekst kun til brug for denne Dialog"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Motor stoppet\n\n"
 "Demo - Højreklik-menu 'brug testtekstblok' for hjælp"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Demo Maskine stoppet"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Ny menu%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Nyt emne%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Total tid"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "Meter"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "Minutter"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Vælg"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minutter"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1903,18 +1903,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Måned"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Dag(e)"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1958,48 +1956,72 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "hver 15 grader +/- 1 time"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Vis logbogs Ikon"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Vis ToolTips"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "0"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Hvis vagt skiftet"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Hvis vagt skiftet"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Skriv advarsel  \"Ingen GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2007,45 +2029,41 @@
 "Fravælg hvis GPS ikke er funktionsdygtig\n"
 "for at undgå beskeden gentager sig."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr ""
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Vindretning sat til:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "Standard"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "Standard = Relativ vindretning\n"
 "Kurs = Sand vindretning"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr ""
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2054,41 +2072,41 @@
 "du kan slå timer til/fra\n"
 "eller ændre denne tekst under Indstillinger"
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "automatisk linje\n"
 "Ankomst Waypoint:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Hvis kurs ændres mere end °  "
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Installer layouts"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Afinstaller logbog"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Installer"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Installer OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Afinstaller"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2102,458 +2120,453 @@
 "alle Logbog-sprog\n"
 "og renser OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Indstillinger"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Kun brugt når du indfører 1/2, 1/4 .... i et total-felt, eller til at beregne ferskvandsmaskinen\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Indstil gal/liter i Forkortelser"
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Kapacitet"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Sekunder"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Fart"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Dybder i"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Fod"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Favne"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Bølger/dønning i"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Sand"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnetisk"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Vindstyrke"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Brændstof/Vand"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Motor timer"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Omdrejninger"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dag(e)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Uge(r)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Uger(r)"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Måned"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Hvis GPS er slået fra brug for manuel indput"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Vindstyrke"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr " Retning"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Relativ"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Forkortelser"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Sti til ODT-Editor"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "for at bruge MS-Word, tilføj %s på denne måde:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Sti til Datamanager"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Sti til Mail program"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Sti til HTML-Editor\n"
 "(valgfri)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Nulstil stier"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Stier"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Vis"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Indstil linjebredde til"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Indstil gennemsigtighed til"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "I kolonne"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "I kolonne"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Anfør én karakter i  Grader, Minutter og Sekunder"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "indstil sti til HTML-Editor"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Indstil sti til datamanager"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Indstil sti til mail program"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Indstil sti til ODT-Editor"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "fra"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "til"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Beklager, ingen layout installeret"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Beklager, logbog indeholder ingen linjer"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "ikke fundet i layoutfile"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Glemte du at tilføje denne linje it dit layout  ?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Har du glemt at indkapsle overskrift med [[ og ]]\n"
 "eller data med {{ og }} ?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Rute"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Ja"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adresse"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Vælg rute"
 
@@ -2577,8 +2590,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Nej"
 
@@ -2586,16 +2599,16 @@
 msgid "Logbook until "
 msgstr "Logbog indtil"
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Logbog Total"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/de.po opencpn-plugin-logbookkonni-1.2024/po/de.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/de.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/de.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:21-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: German\n"
 "Language: de_DE\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: de\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Logbuch"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Motor(en) laufen noch\n\n"
 "Stoppe Motor(en) ?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "vom "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Aktives Logbuch"
 
@@ -54,15 +54,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Logbuch Optionen"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Wähle gezippte Layout-Dateien"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -75,143 +75,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Wahr"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "Stop"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Stop"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Groß"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genua 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genua 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genua 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Mizzen"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr "Mizzen Sturm"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Stagsegel"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "automatische Zeile\n"
 "Wegpunlt erreicht"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "automatische Zeile\n"
 "Wachwechsel"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "automatische Zeile\n"
 "Kursänderung > "
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "automatische Zeile\n"
 "Distanz > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -221,88 +221,87 @@
 "oder diesen Text ändern unter Optionen/Plugins/Logbook\n\n"
 "Shift+Enter = Zeilenumbruch"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "kn"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "hPa"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "C"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "l"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "Tag(e)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "Woche(n)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "Monat(e)"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Info"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Suche in Logbuch"
 
@@ -313,46 +312,46 @@
 msgstr "Ihr Logbuch hat %i Zeilen\n\n"
 "Sie sollten ein neues Logbuch erstellen, um Ladezeiten zu verringern."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr "Aus"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr "An"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Sind Sie sicher ?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Neues Logbuch"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "alle Werte zurücksetzen ?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Ihr Logbuch hat keine Zeilen ?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Letzte Zeile aus Logbuch\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "letzte Logbuch-Datei ist\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Altes Logbuch bis %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -361,154 +360,154 @@
 "erstelle ein Backup aller Daten der Version 1.1 im Verzeichnis\n\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "unbenannte Route"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** Mann über Bord ***\n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Motor #1 gestartet"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Motor #1 läuft"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Motor #1 gestoppt"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Motor #2 gestartet"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Motor #2 läuft"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Motor #2 läuft"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Motor #2 gestoppt"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Motor #2 gestoppt"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Segel hoch"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Segel gewechselt"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Segel runter"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Lösche Zeile Nr. %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Bestätige"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Bitte geben Sie das Datum im Format:\n"
 "      %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Bitte geben Sie die Zeit im diesem Format ein:\n"
 "   %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Bitte geben Sie 0544512.15n0301205.15e für\n"
 "054° 45' 12.15\" N \n"
 "030°12' 05.15\" E ein"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Bitte geben Sie 05445.1234n03012.0504e für\n"
 "054° 45,1234' N \n"
 "030°12,0504' E ein"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Minuten sind größer als 59"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "kein GPS-Signal"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Nächster WP Name:"
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Letzter Wegpunkt in der Route"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -517,72 +516,71 @@
 "Wegpunkt-Name: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Wegpunkt übersprungen"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Wegpunkt erreicht"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Suche in"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Alle Logbücher"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Sucheingabe"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "In Spalte"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Datum"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Wähle"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Wähle Route"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Wähle Logbuch"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Textblöcke Dialog"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Setze das Timer-Interval"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Neue Zeile"
 
@@ -590,10 +588,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Fügt eine Zeile am Ende des Logbuchs hinzu"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -603,71 +600,65 @@
 msgstr "Exportieren Sie Ihre  \"Logbuch\"-Daten in:\n"
 "   HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr "Zeige Layout Auswahl Modus"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Wähle Layout"
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Wählt ein Layout, das angezeit wird \n"
 "mit dem Button \"Zeige\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Layouts neu laden"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Layout editieren"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Zeige"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Sehen Sie Ihre Daten im Browser(HTML) oder Open/Libreoffice (ODT) an"
 
@@ -695,32 +686,32 @@
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Timerintervall"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Timerintervall für den Timer setzen"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Timer an/aus"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Wache"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Wegpunkt"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Distanz"
 
@@ -730,7 +721,7 @@
 msgstr "Setze die gewünschte Distanz in sm ein\n"
 " = (Track made good)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Kurs"
 
@@ -750,8 +741,8 @@
 "Es ist immer ratsam, hier einnen Wert > 0 einzusetzen,\n"
 "um z.B. den richtigen Kurs zum Wind zu finden. "
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -759,884 +750,893 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Unterbrechen/Wiederaufnehmen von Ereignissen"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Zeit"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Distanz gesamt"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "KüG"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "KdW"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "FüG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "FdW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Tiefe"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Notizen"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Lösche Zeile"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Zeige versteckte Spalten"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Spalte ausblenden"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Logbuch schließen"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Lösche Zeile/n"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Tausche Tag<->Monat"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Luft"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Wasser"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Strom"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Stromstärke"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Wellenhöhe"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Schwell"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Wetter"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Wolken"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Sicht"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Wetter"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Maschine #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "#1 gesamt"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Maschine #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "#2 gesamt"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Treibstoff"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Treibstoff gesamt"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Segel"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Reff"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Gen. gesamt"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "AH #1 gesamt"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "AH #2 gesamt"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Wassermacher"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "W-Gesamt"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr "W-Ausstoß"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Wasser gesamt"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Maschine/Segel"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "Exportieren Sie Ihre \"Übersicht\"-Daten in HTML oder ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Wählen Sie eines der alten Logbücher"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Ende"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Reisezeit"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Distanz p. Tag"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Beste Dist. p. Tag"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Fahrt durchsch."
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Fahrt max."
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Bank #1 ges."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Bank #1 Verbrauch"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Bank #2 ges."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Bank #2 Verbrauch"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr "Wasserm. Ausst."
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Wasserverbrauch"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Stromrichtung durchsch."
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Strom durchsch."
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Strom max."
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Wellenhöhe durchschn."
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Wellen max."
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Swell durchsch."
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Swell max."
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Segel meistens"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Pfade"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Gehe zu Route"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Übersicht"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "neues Crewmitglied"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Fügt ein neues Crewmitglied hinzu"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "Exportieren Sie Ihre \"Crew\"-Daten in:\n"
 "        HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "In die Wachliste kopieren"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Vor-/Zuname"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "nur Vorname"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "nur Nachname"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "an Bord"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Geburtsname"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Vorname"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Titel"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Geburtstag"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Geburtsort"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nationalität"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Pass-Nr."
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "ausgestellt in"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "ausgegeben am"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "PLZ"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Land"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Stadt"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Strasse"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Zeige nur Crew an Bord"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Zeige alle Einträge"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Sortierung aufsteigend"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Sortierung absteigend"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Wachzeiten setzen"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Setze das Startdatum des Törns ein"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Setze die Startzeit des Törns ein"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Tag(e)"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Dauer des Törns"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Berechne"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Berechene die Wachzeiten mit den in den Spalten eingegebenen Mitgliedern"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Zurücksetzen der Daten"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Löschen"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Löscht alle Daten"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Tag zurück"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Jetzt"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Springe zur jetzigen Wache"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Tag vorwärts"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Tag:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Zeigt oder setzt den Tag\n"
 "Anzeige der Daten von diesem Tag bis Ende im ODT/Browser-Pragramm"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Anzeige"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "alle"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "dieser Tag"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "Zeigt im ODT/Browser-Programm die Daten ab dem im Textfeld\n"
 "eingegeben Tag an plus der gewählten Tage"
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "1. Wache"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Wachdauer"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Mitglied"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Setze als Wachzeiten-Basis"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Teile Wachzeiten"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Verbinde Wachzeiten"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Tausche zwei Wachzeiten"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Lösche Crewmitglieder"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Crewliste"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Zubehör hinzufügen"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "fügen Sie die Ausrüstung Ihres Bootes hinzu"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Zeige Zubehör"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Zeige/Verstecke Zubehör"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "Exportieren Sie Ihre \"Boots/Ausrüstungs\"-Daten in:\n"
 "           HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Layout editieren"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Boot"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Heimathafen"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Rufzeichen"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Rumpf Identifikations-Nr."
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Segel-Nr."
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Versicherung"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Register-Nr."
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Police"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Eigner"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Typ"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Hersteller"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Rumpf"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Stapellauf"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Werft-Nr."
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Konstruktion"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Länge über alles"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Länge über Deck"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Länge in der Wasserlinie"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Breite"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Größte Breite des Rumpfes"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Tiefgang"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Anwender-Label"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "schreiben Sie Ihr eigenes Label"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Verdrängung"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Zubehör"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Beschreibung"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Serien-Nr."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Neue Zeile"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "Exportieren Sie Ihre \"Service\"-Daten in HTML oder ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Wähle Layout:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Priorität"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Service zu erledigen"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Wenn"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Warnbetrag"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Dringendbetrag"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Startbetrag"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Service erledigt"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "kaufe Zubehör für diesen Service"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Exportieren Sie Ihre \"Reparatur\"-Daten in HTML oder ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Reparaturen zu erledigen"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparatur erledigt"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "kaufe Zubehör für diese Reparatur"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparaturen"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "Exportieren Sie Ihre \"Kaufe-Zubehör\"-Daten in HTML oder ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Zubehör kaufen"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "bei"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Instandhaltung"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "kein"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr "- Normaler Timer - Intervall:"
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr "- Stunden Timer"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr "- Individueller Timer"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr "keine Ereignisse\n"
 "Start mit Klick auf (roten) Knopf, mehrere Events möglich"
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Ereignis/se unterbrochen\n"
 "Klicke den Start-Button für Wiederaufnahme aller Ereignisse"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Ereignis/se gestartet\n"
 "Klick auf den Stop-Button unterbricht, auf einen Knopf (grün) stoppt "
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
@@ -1644,32 +1644,32 @@
 "rot = Ereignis gestoppt\n"
 "gelb = Ereignis pausiert. Wiederaufnahme mit Start-Button"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Opendocument Tabellenkalkulation(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr "Zeige Motor/Segel Modus"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Wähle Track"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "nutze Textblöcke..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Logbuchdatei speichern"
 
@@ -1685,93 +1685,93 @@
 msgstr "kein Pfad zum HTML-Editor\n"
 "in Optionen/Plugins/LogbookKonni/Preferences gesetzt "
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Crewliste speichern"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Verstecke Zubehör"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Boot Datei speichern"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Service-Datei speichern"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Reparaturen-Datei speichern"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Kaufe-Zubehör-Datei speichern"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Übersicht-Datei speichern"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Filtere Layout nach"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Layout umbenennen"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Lösche Layout"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Sende Layout via Email"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Installiere ein Layout"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Erster/Letzter Eintrag"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Datei"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Neuen Eintrag einfügen"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Lösche Eintrag"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Eintrag umbenennen"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Neuen Knoten einfügen"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Knoten löschen"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Textblöcke"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1797,17 +1797,17 @@
 "Nutze Drag 'n Drop um einen Eintrag ins Menü zu verschieben\n\n"
 "Für mehr Hilfe klicke auf die nächsten Knoten"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "Der Name des Eintrags wird im Rechtsklickmenü der folgenden Spalten angezeigt.\n"
 "Wenn der Name angeklickt wird, wird der entsprechende Text eingefügt.\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Texte für das Rechtsklick-Menü"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1815,11 +1815,11 @@
 "Maschine gestoppt\n\n"
 "Demo - klicke im Rechtsklickmenu 'nutze Textblocks für Hilfe'"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Demo Segel rauf"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1831,76 +1831,76 @@
 "Klicke den OK-Button\n\n"
 "Nutze Drag'n Drop, um einen Eintrag ins Menü zu verschieben."
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "Texte nur mit diesem Dialog"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Maschine gestoppt\n\n"
 "Demo - klicke im Rechtsklickmenu 'nutze Textblocks für Hilfe'"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Demo Maschine gestartet"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Neuer Knoten%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Neuer Eintrag%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Normaler Timer"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr "Ereignis"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr "Stunden Timer"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "jede"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "+ Minuten"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Lösche alles"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Individueller Timer"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr "Stunde"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minuten"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1916,18 +1916,16 @@
 msgid "Individual"
 msgstr "Individuell"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Monat(e)"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Tag"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "Jahr"
 
@@ -1971,48 +1969,72 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "je 15 Grad +/- 1 Stunde"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Zeige Logbuch-Icon"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Zeige Tooltips"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Segel Nachricht"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Segel Nachricht"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "schreibe Warnung  \"kein GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2020,45 +2042,41 @@
 "oder es defekt ist. Es verhindert, dass die\n"
 "Nachricht permanent wiederholt wird."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Bei Motorstart immer Segel runter"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Windrichtung bezogen auf:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "default = Relativ zum Schiff\n"
 "KdW = Aktuelle Windrichtung"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Bei Motorstart immer Segel runter"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Ereignisse"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Schreibt diesen Text in das Logbuch, wenn ein Ereignis auftritt. Ändere den Text nach Wunsch"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2068,41 +2086,41 @@
 "durch klicken auf den Timer-Bullet.\n"
 "Ändere diesen Text in Options"
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "automatische Zeile\n"
 "Wegpunlt erreicht"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Kursänderung"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Zeige Logbuch bei einem Ereignis an (Popup)"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Installiere ein Layout"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Deinstalliere Logbuch"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Installiere"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Installiere OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Deinstalliere"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2116,250 +2134,246 @@
 "alle Logbuchsprachen\n"
 "und bereinigt OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Verhalten"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Wird zwingend benötigt bei einer Eingabe von 1/2, 1/4....\n"
 "in einem Gesamt-Feld (z.B. Wasser gesamt)\n"
 "oder um den Wassermacher zu berechnen\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "gal/l kann in Abkürzungen gesetzt werden"
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Kapazität"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Sekunden"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Fahrt"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Tiefe in"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Fuß"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Faden"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Welle/Schwell in"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Wahr"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnet"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Windstärke"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Treibstoff/Wasser"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Motor Stunden"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr "Propwelle"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Umdrehungen"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr "U/min"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Tag(e)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Woche(n)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Woche(n)"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Monat"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Wenn GPS nicht eingeschaltet ist benutze"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Windstärke"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr "Richtung"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Relativ"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Abkürzungen"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Pfad zum ODT-Editor"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "damit MS-Word richtig started, bitte ein %s anhängen:\n"
 "\"C:\\DeinPfadzuWinword\\WINWORD.EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Pfad zum Dateimanager"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Pfad zum Mail-Programm"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Pfad zum HTML-Editor\n"
 "(optional)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Pfade zurücksetzen"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Pfade"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Zeige"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Setze Zeilenbreite auf"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Setze Transparenz auf"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Setze Routen-Linienfarbe auf"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "weiß"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "schwarz"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "rot"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "gelb"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Setze Track-Linienfarbe auf"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2367,111 +2381,111 @@
 "Es soll die ERRPM-Sequenz links vom Button\n"
 "zu sehen sein"
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "Motor-Nr. entspricht Spalte Motor #1"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "Motor-Nr. entspricht Spalte Motor #2"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "Verwende ERRPM-Sequenz zur Berechnung Motorstunden"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Verwende WIMDA-Sequenz von Wetterstation"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Für Barometer, Lufttemperatur und rel. Feuchte"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr "Checkbox Leerz.  >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr "Nützlich für Tablet-PC's"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr "Abkürzungen gezeigt in den Segel-Checkboxen\n"
 "Der Name wird in der Spalte \"Segel\" beim Zufügen eines neuen Eintrags benutzt"
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<<  Zurück"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr "Zurück zu Segelnamen"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Zeile +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Zeile -"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Spalte +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Spalte -"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Sonstiges"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr "In Ihrem Land wird das 24 Stunden Format verwendet.\n"
 "In diesem Fall stellt das Betriebssytem keine AM/PM-Strings zur Verfügung. \n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
@@ -2480,102 +2494,101 @@
 "%s%s%s%s%s\n\n"
 "Bitte setzen Sie in den drei Auswahlboxen unterschiedliche Daten."
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Bitte ein Zeichen für Grad, Minuten, Sekunden einfügen"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Pfad zum HTML-Editor"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Pfad zum Dateimanager"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Pfad zum Mail-Program"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Pfad zum ODT-Editor"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "vom"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "bis"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Sorry, kein Layout installiert"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Sorry, Logbuch hat keine Einträge"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "nicht gefunden in Layoutdatei"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Haben Sie diese Zeile im Layout vergessen  ?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Haben Sie vergessen den Header mit [[ und ]]\n"
 "oder Daten mit {{ und }} einzuschließen ?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Routenpunkte"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr "Geben Sie eine Wachzeit ein, z.B. 3.30 / verfügbare Eingabeformate sind: 3.30, 3,30, 3:30, 0330 für 3 Std 30 Min"
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr "Ändere die Wachzeiten nach Wunsch / Drag'n Drop Crewmitglieder aus der Crewliste"
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr "*Optional* Setzte ein '*'-Zeichen voran, und das Mitglied wird dieser Wache statisch zugewiesen. (Hat immer diese Wache)"
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr "Alle Änderungen betreffen nur diesen Tag"
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Ja"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adresse"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Wähle ein Datum"
 
@@ -2599,8 +2612,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Nein"
 
@@ -2608,16 +2621,16 @@
 msgid "Logbook until "
 msgstr "Altes Logbuch bis "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Logbuch gesamt"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i Jahr(e) %i Monat(e) %i Tage(s)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E Woche(n) %D Tag(e) %H:%M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/el.po opencpn-plugin-logbookkonni-1.2024/po/el.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/el.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/el.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:21-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
@@ -16,34 +16,35 @@
 "X-Crowdin-Language: el\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Ημερολόγιο"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
-msgstr ""
+msgstr "Οι μηχανές σας λειτουργούν ακόμα\n\n"
+"Κλείσιμο μηχανών;"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
-msgstr ""
+msgstr "Από "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
-msgstr ""
+msgstr "-πρόσθετο"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
-msgstr ""
+msgstr "Ενεργό ημερολόγιο"
 
 #: src/logbook_pi.cpp:681
 msgid "Logbook for OpenCPN"
-msgstr ""
+msgstr "Ημερολόγιο για OpenCPN"
 
 #: src/logbook_pi.cpp:686
 msgid "Logbook for OpenCPN\n\n"
@@ -51,1680 +52,1726 @@
 "If you find a bug post it on\n"
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Helpful videos are at Youtube, search for LogbookKonni."
-msgstr ""
+msgstr "Ημερολόγιο Πλοίου για OpenCPN\n\n"
+"Ευχαριστούμε την Κοινότητα για τις χρήσιμες προτάσεις.\n\n"
+"Αν βρείτε λάθη στείλτε τα στο\\ nhttp://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html \n"
+"Χρήσιμα βίντεο είναι στο Youtube, αναζήτηση για LogbookKonni."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
-msgstr ""
+msgstr "Προτιμήσεις ημερολογίου"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
-msgstr ""
+msgstr "Επιλέξτε ZIP αρχεία διάταξης"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr ""
+msgstr "Σχεδιαγράμματα %s εγκαταστάθηκαν σε\n\n"
+"%s\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
-msgstr ""
+msgstr "Μαΐστρα"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
-msgstr ""
+msgstr "Θυέλης"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
-msgstr ""
+msgstr "Τζένοα 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
-msgstr ""
+msgstr "Τζένοα 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
-msgstr ""
+msgstr "Τζένοα 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
-msgstr ""
+msgstr "Φλόκος 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
-msgstr ""
+msgstr "Φλόκος 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
-msgstr ""
+msgstr "Φλόκος 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
-msgstr ""
+msgstr "Φλόκος"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
-msgstr ""
+msgstr "Μιζένα"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
-msgstr ""
+msgstr "Μιζένα θυέλης"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
-msgstr ""
+msgstr "Στέισεϊλ"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
-msgstr ""
+msgstr "Μπαλόνι"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
-msgstr ""
+msgstr "Μπορείτε να αλλάξετε τα ονόματα των πανιών\n"
+"in στο διάφορα/επιλογές/πανιά"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
-msgstr ""
+msgstr "αυτόματη νέα γραμμή με την άφιξη στο σημείο πορείας"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
-msgstr ""
+msgstr "Αυτόματη νέα γραμμή\n"
+" όταν αλλάζει η βάρδια"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
-msgstr ""
+msgstr "Αυτόματη νέα γραμμή\n"
+" όταν αλλάζει η πορεία >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
-msgstr ""
+msgstr "Αυτόματη νέα γραμμή\n"
+" όταν η απόσταση είναι > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
-msgstr ""
+msgstr "Γραμμή αυτόματα από το χρονόμετρο\n\n"
+"Ένα χρ. διάστημα μπορεί να ορισθεί/καταργηθεί\n"
+"ή το κείμενο στο Toolbox/Plugins/Logbook να αλλαχθεί\n\n"
+"Shift+Enter προσθέτει μια νέα γραμμή"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
-msgstr ""
+msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
-msgstr ""
+msgstr "ν.μ."
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
-msgstr ""
+msgstr "κόμβοι"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
-msgstr ""
+msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
-msgstr ""
+msgstr "πόδια"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
-msgstr ""
+msgstr "οργιές"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
-msgstr ""
+msgstr "hPa"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
-msgstr ""
+msgstr "γαλ."
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
-msgstr ""
+msgstr "ημέρα (ες)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
-msgstr ""
+msgstr "εβδομάδα(ες)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
-msgstr ""
+msgstr "μήνας"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
-msgstr ""
+msgstr "Πληροφοριες"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
-msgstr ""
+msgstr "Υπενθύμιση"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
-msgstr ""
+msgstr "Αναζήτηση στο ημερολόγιο πλοίου"
 
 #: src/Logbook.cpp:48
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "You should create a new logbook to minimize loadingtime."
-msgstr ""
+msgstr "Το ημερολόγιο σας έχει %i γραμμές\n\n"
+"Πρέπει να δημιουργήσετε ένα νέο ημερολόγιο για να μειωθεί ο χρόνος φόρτωσης."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
-msgstr ""
+msgstr "Είσαι σίγουρος;"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
-msgstr ""
+msgstr "Νέο ημερολόγιο"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
-msgstr ""
+msgstr "Επαναφορά όλων των τιμών στο μηδέν;"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
-msgstr ""
+msgstr "Το ημερολόγιο δεν έχει καμία γραμμή;"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
-msgstr ""
+msgstr "Τελευταία γραμμή από το ημερολόγιο\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
-msgstr ""
+msgstr "Το τελευταίο ημερολόγιο είναι\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
-msgstr ""
+msgstr "Παλιό ημερολόγιο μέχρι το %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
-msgstr ""
+msgstr "Ξεκινήστε τη μετατροπή σε νέο φορμά ημερομηνίας/ώρας\n"
+"και κάντε backup σε όλα τα δεδομένα από την έκδοση 1.1 ως\n\n"
+"%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
-msgstr ""
+msgstr "Το ημερολόγιο σας έχει %i γραμμές\n\n"
+"\t\t\tΠρέπει να δημιουργήσετε ένα νέο ημερολόγιο για να μειωθεί ο χρόνος φόρτωσης."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
-msgstr ""
+msgstr "ανώνυμη διαδρομή"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
-msgstr ""
+msgstr "***ΑΝΘΡΩΠΟΣ ΣΤΗ ΘΑΛΑΣΣΑ ***\n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
-msgstr ""
+msgstr "Ίχνος "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
-msgstr ""
+msgstr "Εκκίνηση μηχανής #1"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
-msgstr ""
+msgstr "Μηχανή #1 σε λειτουργία"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
-msgstr ""
+msgstr "Παύση μηχανής #1"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
-msgstr ""
+msgstr "Εκκίνηση μηχανής #2"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
-msgstr ""
+msgstr "Μηχανή #2 σε λειτουργία"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
-msgstr ""
+msgstr "\n"
+"Μηχανή #2 σε λειτουργία"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
-msgstr ""
+msgstr "Η μηχανή #2 σταμάτησε"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
-msgstr ""
+msgstr "\n"
+"Η μηχανή #2 σταμάτησε"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
-msgstr ""
+msgstr "Ξεκίνησε η γεννήτρια"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
-msgstr ""
+msgstr "Γεννήτρια τρέχει"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
-msgstr ""
+msgstr "\n"
+"Γεννήτρια τρέχει"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
-msgstr ""
+msgstr "Η γεννήτρια σταμάτησε"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
-msgstr ""
+msgstr "\n"
+"Η γεννήτρια σταμάτησε"
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
-msgstr ""
+msgstr "Σηκώθηκαν τα πανιά"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
-msgstr ""
+msgstr "Αλλαγή πανιών"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
-msgstr ""
+msgstr "Κατέβηκαν τα πανιά"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
-msgstr ""
+msgstr "Διαγραφή γραμμής αρ. %i;"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
-msgstr ""
+msgstr "Επιβεβαίωση"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
-msgstr ""
+msgstr "Πληκτρολογήστε την ημερομηνία σε μορφή: \n"
+" %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
-msgstr ""
+msgstr "Πληκτρολογήστε την ώρα σε μορφή: \n"
+" %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
-msgstr ""
+msgstr "Παρακαλώ εισάγετε 0544512.15n0301205.15e για\n"
+"054° 45' 12.15\" Β 030° 12' 05.15'' Α"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
-msgstr ""
+msgstr "Παρακαλώ εισάγετε 05445.1234n03012.0504e \n"
+"54° 45.1234' Β 030° 12.0504' E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
-msgstr ""
+msgstr "Αρ. λεπτών πάνω από 59"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
-msgstr ""
+msgstr "Όχι σήμα GPS !"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
-msgstr ""
+msgstr "Όνομα επόμενου σημείου πορείας: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
-msgstr ""
+msgstr "Τελευταίο σημείο της διαδρομής"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
-msgstr ""
+msgstr "\n"
+"Όνομα του σημείου πορείας: %s\n"
+"%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
-msgstr ""
+msgstr "Το σημείο πορείας παραλείφθηκε"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
-msgstr ""
+msgstr "Άφιξη στο σημείο πορείας"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
-msgstr ""
+msgstr "Δεν επιτρέπεται να προσαρτήσετε δεδομένα σε ένα παλιό ημερολόγιο\n\n"
+"\t\t\t\t\t\t\t\t\t\t\t\t\t\t Το OpenCPN γυρίζει στο τρέχον ημερολόγιο"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
-msgstr ""
+msgstr "Αναζήτηση σε"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
-msgstr ""
+msgstr "Τρέχον ημερολόγιο"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
-msgstr ""
+msgstr "Όλα τα ημερολόγια"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
-msgstr ""
+msgstr "Ψάξιμο"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
-msgstr ""
+msgstr "Στη στήλη"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
-msgstr ""
+msgstr "Ημερομηνία"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
-msgstr ""
+msgstr "Επιλογή"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
-msgstr ""
+msgstr "Επιλογή Διαδρομής"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
-msgstr ""
+msgstr "Επιλογή ημερολογίου"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
-msgstr ""
+msgstr "Διάλογος για κείμενα"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
-msgstr ""
+msgstr "Ορίστε διάστημα χρονομέτρου"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
-msgstr ""
+msgstr "Θέση"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
-msgstr ""
+msgstr "Προσθήκη γραμμής"
 
 #: src/LogbookDialog.cpp:99
 msgid "add a line to the end of your logbook"
-msgstr ""
+msgstr "προσθέστε μια γραμμή στο τέλος του ημερολογίου σας"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
-msgstr ""
+msgstr "Εξαγωγή"
 
 #: src/LogbookDialog.cpp:104
 msgid "export your logbook-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
-msgstr ""
+msgstr "εξαγωγή των δεδομένων ημερολογίου ως: \n"
+"HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
-msgstr ""
+msgstr "Εμφάνιση λειτουργίας επιλογής διάταξης"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
-msgstr ""
+msgstr "Επιλέξτε διάταξη: "
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
-msgstr ""
+msgstr "Επιλέξτε μια διάταξη προβολής\n"
+"με το κουμπί \"Προβολή\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
-msgstr ""
+msgstr "Επαναφόρτωση διάταξης"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
-msgstr ""
+msgstr "Επεξεργασία διάταξης"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
-msgstr ""
+msgstr "Προβολή"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
-msgstr ""
+msgstr "Δείτε τα δεδομένα σε HTML ή Openoffice/LibreOffice (ODT)"
 
 #: src/LogbookDialog.cpp:192
 msgid "Create a new logbook\n"
 "the active logbook is saved with today's date\n"
 "and can be viewed with Button \"Select Logbook\""
-msgstr ""
+msgstr "Δημιουργία ενός νέου ημερολογίου\n"
+"το ενεργό ημερολόγιο αποθηκεύεται με σημερινή ημερομηνία\n"
+"aκαι μπορεί να φανεί με το κουμπί \"Επιλέξτε ημερολόγιο\""
 
 #: src/LogbookDialog.cpp:197
 msgid "Select a old logbook\n"
 "Everytime a new logbook is created, you'll \n"
 "find the active logbook as old logbook here"
-msgstr ""
+msgstr "Επιλέξτε ένα παλιά ημερολόγιο\n"
+"Κάθε φορά που δημιουργείται ένα νέο ημερολόγιο,\n"
+"θα βρείτε το ενεργό ημερολόγιο ως παλιό ημερολόγιο εδώ"
 
 #: src/LogbookDialog.cpp:205
 msgid "Show/Hide Statusbar"
-msgstr ""
+msgstr "Εμφάνιση/απόκρυψη μπάρας κατάστασης"
 
 #: src/LogbookDialog.cpp:210
 msgid "Help"
-msgstr ""
+msgstr "Βοήθεια"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
-msgstr ""
+msgstr "Όρισε χρονόμετρο"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
-msgstr ""
+msgstr "Όρισε χρ. διάστημα για το χρονόμετρο"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
-msgstr ""
+msgstr "Χρονομετρητής"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
-msgstr ""
+msgstr "Βάρδια"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
-msgstr ""
+msgstr "Σημείο πορείας"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
-msgstr ""
+msgstr "Απόσταση"
 
 #: src/LogbookDialog.cpp:283
 msgid "Set the desired distance in NM\n"
 " = (Track made good)"
-msgstr ""
+msgstr "Ορίστε την επιθυμητή απόσταση σε ν. μ.\n"
+" = (ωφέλιμη πορεία)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
-msgstr ""
+msgstr "Πορεία"
 
 #: src/LogbookDialog.cpp:301
 msgid "Set desired Degrees\n"
 "if the course changes by this amount\n"
 "a course-changed-event occurs"
-msgstr ""
+msgstr "Ορίστε τις επιθυμητές μοίρες\n"
+"όταν αλλάζει τόσο η πορεία\n"
+"τότε δημιουργείται ένα συμβάν-αλλαγής-πορείας"
 
 #: src/LogbookDialog.cpp:306
 msgid "Set desired delay in minutes\n"
 "It's a good idea to set here a value > 0\n"
 "to find the right wind."
-msgstr ""
+msgstr "Ορίστε την επιθυμητή καθυστέρηση σε λεπτά\n"
+"Μπορείτ να βάλετε μια τιμή > 0\n"
+"για να βρείτε τον σωστό άνεμο."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
-msgstr ""
+msgstr "Στοπ"
 
 #: src/LogbookDialog.cpp:315
 msgid "Suspend/Resume running event/s"
-msgstr ""
+msgstr "Αναστολή/επαναφορά τρεχόντων διεργασιών"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
-msgstr ""
+msgstr "Διαδρομή"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
-msgstr ""
+msgstr "Χρόνος"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
-msgstr ""
+msgstr "Κατάσταση"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
-msgstr ""
+msgstr "ΣυνολικήΑπόσταση"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
-msgstr ""
+msgstr "Πορεία"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
-msgstr ""
+msgstr "Βάθος"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
-msgstr ""
+msgstr "Παρατηρήσεις"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
-msgstr ""
+msgstr "Διαγραφή γραμμής"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
-msgstr ""
+msgstr "Εμφανίσετε τις κρυφές στήλες"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
-msgstr ""
+msgstr "Απόκρυψη στήλης"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
-msgstr ""
+msgstr "Κλείσιμο ημερολογίου"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
-msgstr ""
+msgstr "Διαγραφή γραμμών"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
-msgstr ""
+msgstr "Αναστροφή ημέρα<->μήνα"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
-msgstr ""
+msgstr "Πλοήγηση"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
-msgstr ""
+msgstr "Βαρόμετρο"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
-msgstr ""
+msgstr "Υγρόμετρο"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
-msgstr ""
+msgstr "Αέρα"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
-msgstr ""
+msgstr "Νερού"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
-msgstr ""
-
 #: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr "TWS\n"
+"ελαχ.|μέσο|μεγ."
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr "AWS\n"
+"ελαχ.|μέσο|μεγ."
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
-msgstr ""
+msgstr "Ρεύμα"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
-msgstr ""
+msgstr "Ένταση ρεύματος"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
-msgstr ""
+msgstr "Κύμα"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
-msgstr ""
+msgstr "Ρεστία"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
-msgstr ""
+msgstr "Καιρός"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
-msgstr ""
+msgstr "Σύννεφα"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
-msgstr ""
+msgstr "Ορατότητα"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
-msgstr ""
+msgstr "Μετεωρολογία"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
-msgstr ""
+msgstr "Μηχανή #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
-msgstr ""
+msgstr "#1 σύνολο"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
-msgstr ""
+msgstr "Μηχανή #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
-msgstr ""
+msgstr "#2 σύνολο"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
-msgstr ""
+msgstr "Καύσιμο"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
-msgstr ""
+msgstr "ΣυνολικόΚαύσιμο"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
-msgstr ""
+msgstr "Ιστία"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
-msgstr ""
+msgstr "Ύφαλος"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
-msgstr ""
+msgstr "Γεννήτρια"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
-msgstr ""
+msgstr "Γενν. σύνολο"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
-msgstr ""
+msgstr "Μπαταρία #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
-msgstr ""
+msgstr "AH #1 σύνολο"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
-msgstr ""
+msgstr "Μπαταρία #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
-msgstr ""
+msgstr "AH #2 σύνολο"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
-msgstr ""
+msgstr "Δείκτης νερού"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
-msgstr ""
+msgstr "Νερό σύνολο"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
-msgstr ""
+msgstr "Κατανάλωση νερού"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
-msgstr ""
+msgstr "ΝερόΣύνολο"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
-msgstr ""
+msgstr "ID διαδρομής"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
-msgstr ""
+msgstr "ID ίχνους"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
-msgstr ""
+msgstr "Μηχανή/πανιά"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
-msgstr ""
+msgstr "εξαγωγή δεδομένων επισκόπησης ως HTML ή ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
-msgstr ""
+msgstr "Επιλέξτε ένα από τα παλιά ημερολόγια"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
-msgstr ""
+msgstr "Εκκίνηση"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
-msgstr ""
+msgstr "Λήξη"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
-msgstr ""
+msgstr "Συνολικός Χρόνος"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
-msgstr ""
+msgstr "Απόσταση την ημέρα"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
-msgstr ""
+msgstr "Βελτίστη απόσταση ανά μέρα"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
-msgstr ""
+msgstr "Μέση ταχύτητα"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
-msgstr ""
+msgstr "Μέγιστη ταχύτητα"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
-msgstr ""
+msgstr "Μπαταρία #1 γεν."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
-msgstr ""
+msgstr "Μπαταρία #1 χρήση"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
-msgstr ""
+msgstr "Μπαταρία #2 γεν."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
-msgstr ""
+msgstr "Μπαταρία #2 χρήση"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
-msgstr ""
+msgstr "Παραγωγή νερού"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
-msgstr ""
+msgstr "Κατανάλωση νερού"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
-msgstr ""
+msgstr "Μέσο TWA"
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
-msgstr ""
+msgstr "TWS μ.ο."
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
-msgstr ""
+msgstr "TWS Max."
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
-msgstr ""
+msgstr "Μέση κατεύθυνση ρεύματος"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
-msgstr ""
+msgstr "Μέσο ρεύμα"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
-msgstr ""
+msgstr "Μεγ. ρεύμα"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
-msgstr ""
+msgstr "Μέσο κύμα"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
-msgstr ""
+msgstr "Max. κύμα"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
-msgstr ""
+msgstr "Μέσος κυματισμός"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
-msgstr ""
+msgstr "Μεγ. κυματισμός"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
-msgstr ""
+msgstr "Κύρια πανιά"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
-msgstr ""
+msgstr "πορεία"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
-msgstr ""
+msgstr "Στη διαδρομή"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
-msgstr ""
+msgstr "Επισκόπηση"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
-msgstr ""
+msgstr "Προσθήκη πληρώματος"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
-msgstr ""
+msgstr "Προσθήκη νέου μέλους του πληρώματος"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
-msgstr ""
+msgstr "εξαγωγή των δεδομένων πληρώματος ως: \n"
+"HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
-msgstr ""
+msgstr "Αντίγραφο στη βάρδια"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
-msgstr ""
+msgstr "Όνομα ολογράφως"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
-msgstr ""
+msgstr "\"Όνομα\" μόνο"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
-msgstr ""
+msgstr "Επώνυμο μόνο"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
-msgstr ""
+msgstr "Στο πλοίο"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
-msgstr ""
+msgstr "Όνομα"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
-msgstr ""
+msgstr "το γένος"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
-msgstr ""
+msgstr "Όνομα"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
-msgstr ""
+msgstr "Τίτλος"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
-msgstr ""
+msgstr "Ημερομηνία Γέννησης"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
-msgstr ""
+msgstr "Τόπος γέννησης"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
-msgstr ""
+msgstr "Εθνικότητα"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
-msgstr ""
+msgstr "Αρ. διαβατηρίου"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
-msgstr ""
+msgstr "Εκδόθηκε σε"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
-msgstr ""
+msgstr "Ημερομηνία έκδοσης"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
-msgstr ""
+msgstr "Τ.Τ."
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
-msgstr ""
+msgstr "Χώρα"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
-msgstr ""
+msgstr "Πόλη"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
-msgstr ""
+msgstr "Οδός"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
-msgstr ""
+msgstr "Εμφάνιση μόνο επί του σκάφους"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
-msgstr ""
+msgstr "Δείτε όλες τις καταχωρήσεις"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
-msgstr ""
+msgstr "Αύξουσα ταξινόμηση"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
-msgstr ""
+msgstr "Φθίνουσα ταξινόμηση"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
-msgstr ""
+msgstr "Καθορισμός βαρδιών"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
-msgstr ""
+msgstr "Ορίστε την ημερομηνία έναρξης του ιστιοπλοϊκού ταξιδιού"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
-msgstr ""
+msgstr "Ορίστε την ώρα έναρξης του ιστιοπλοϊκού ταξιδιού"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
-msgstr ""
+msgstr "Μέρες"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
-msgstr ""
+msgstr "Μήκος ταξιδιού"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
-msgstr ""
+msgstr "Υπολογισμός"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
-msgstr ""
+msgstr "Υπολογίστε τις βάρδιες με τα μέλη που υπάρχουν στις στήλες"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
-msgstr ""
+msgstr "Επαναφορά"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
-msgstr ""
+msgstr "Επαναφορά δεδομένων σε επίπεδο επεξεργασίας"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
-msgstr ""
+msgstr "Καθαρισμός"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
-msgstr ""
+msgstr "Καταργήστε όλα τα δεδομένα"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
-msgstr ""
+msgstr "Ημέρα προς τα πίσω"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
-msgstr ""
+msgstr "Τώρα"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
-msgstr ""
+msgstr "Μεταβείτε στην ημερομηνία/ώρα τώρα"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
-msgstr ""
+msgstr "Ημέρα προς τα εμπρός"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
-msgstr ""
+msgstr "Ημέρα:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
-msgstr ""
+msgstr "Δείχνει/ορίζει την ημέρα\n"
+"Δείχνει τα δεδομένα στο ODT/Browser από σήμερα μέχρι το τέλος"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
-msgstr ""
+msgstr "Προβολή"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
-msgstr ""
+msgstr "όλα"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
-msgstr ""
+msgstr "αυτή την ημέρα"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
-msgstr ""
+msgstr "1. Βάρδια"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
-msgstr ""
+msgstr "Χρόνος βάρδιας"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
-msgstr ""
+msgstr "Μέλος πληρώματος"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
-msgstr ""
+msgstr "Ορισμός ως βάση βάρδιας"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
-msgstr ""
+msgstr "Χωρισμός βάρδιας"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
-msgstr ""
+msgstr "Συγχώνευση βαρδιών"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
-msgstr ""
+msgstr "Ανταλλαγή βαρδιών"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
-msgstr ""
+msgstr "Διαγραφή μελών πληρώματος"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
-msgstr ""
+msgstr "Λίστα πληρώματος"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
-msgstr ""
+msgstr "Προσθήκη εξοπλισμού"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
-msgstr ""
+msgstr "Προσθέστε τον εξοπλισμό του σκάφους σας"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
-msgstr ""
+msgstr "Παρουσίαση εξοπλισμού"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
-msgstr ""
+msgstr "Εμφάνιση/απόκρυψη πίνακα εξοπλισμού"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
-msgstr ""
+msgstr "εξαγωγή των δοδομένων του σκάφους/εξοπλισμού ως: \n"
+" HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
-msgstr ""
+msgstr "Επεξεργασία διατάξεων"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
-msgstr ""
+msgstr "Πλοίο"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
-msgstr ""
+msgstr "Λιμάνι ελλιμενισμού"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
-msgstr ""
+msgstr "Χαρακτηριστικό κλήσης"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
-msgstr ""
+msgstr "Αρ. Κύτους"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
-msgstr ""
+msgstr "Αρ. πανιού"
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
-msgstr ""
+msgstr "Ασφάλεια"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
-msgstr ""
+msgstr "Καταχώρηση"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
-msgstr ""
+msgstr "Αρ. συμβολαίου"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
-msgstr ""
+msgstr "Ιδιοκτήτης"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
-msgstr ""
+msgstr "Όνομα      "
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
-msgstr ""
+msgstr "Τηλέφωνο"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
-msgstr ""
+msgstr "Λεπτομέρειες"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
-msgstr ""
+msgstr "Τύπος"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
-msgstr ""
+msgstr "Κατασκευαστής"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
-msgstr ""
+msgstr "Κύτος"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
-msgstr ""
+msgstr "Ημερομηνία καθέλκυσης"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
-msgstr ""
+msgstr "Αρ. ναυπηγείου"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
-msgstr ""
+msgstr "Σχεδιαστής"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
-msgstr ""
+msgstr "Κατασκευή"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
-msgstr ""
+msgstr "Ολικό μήκος"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
-msgstr ""
+msgstr "Μήκος καταστρώματος"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
-msgstr ""
+msgstr "Μήκος ισάλων"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
-msgstr ""
+msgstr "Πλατος"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
-msgstr ""
+msgstr "Μέγιστο πλάτος του κύτους"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
-msgstr ""
+msgstr "Βύθισμα"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
-msgstr ""
+msgstr "ΕτικέταΧρήστη"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
-msgstr ""
+msgstr "Γράψτε τη δική σας ετικέτα"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
-msgstr ""
+msgstr "Εκτόπισμα"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
-msgstr ""
+msgstr "Εξοπλισμός"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
-msgstr ""
+msgstr "Περιγραφή"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
-msgstr ""
+msgstr "Σειριακός αρ."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
-msgstr ""
+msgstr "Προσθέστε μια νέα γραμμή"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
-msgstr ""
+msgstr "εξαγωγή δεδομένων σέρβις ως HTML ή ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
-msgstr ""
+msgstr "Επιλέξτε διάταξη:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
-msgstr ""
+msgstr "Προτεραιότητα"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
-msgstr ""
+msgstr "Σέρβις TODO"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
-msgstr ""
+msgstr "Αν"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
-msgstr ""
+msgstr "ΤιμήΣυναγερμού"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
-msgstr ""
+msgstr "ΤιμήΕπείγοντος"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
-msgstr ""
+msgstr "ΤιμήΑρχής"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
-msgstr ""
+msgstr "Ενεργό"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
-msgstr ""
+msgstr "Σέρβις"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
-msgstr ""
+msgstr "Αγορά ανταλλακτικών για σέρβις"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
-msgstr ""
+msgstr "Σέρβις"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
-msgstr ""
+msgstr "εξαγωγή δεδομένων-επισκευών ως HTML ή ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
-msgstr ""
+msgstr "Επισκευές που ΧΡΕΙΑΖΟΝΤΑΙ"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
-msgstr ""
+msgstr "Επισκευή που έγινε"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
-msgstr ""
+msgstr "Αγορά ανταλλακτικών για την επισκευή"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
-msgstr ""
+msgstr "Επισκευές"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
-msgstr ""
+msgstr "εξαγωγή δεδομένων ανταλλακτικών ως HTML ή ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
-msgstr ""
+msgstr "Κατηγορία"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
-msgstr ""
+msgstr "Αγορά ανταλλακτικών"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
-msgstr ""
+msgstr "Σε"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
-msgstr ""
+msgstr "Συντήρηση"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
-msgstr ""
+msgstr "κανένα"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
-msgstr ""
+msgstr " - Διάστημα κανονικού χρονομετρητή: "
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
-msgstr ""
+msgstr "Εμφάνιση τρόπου πλεύσης: μηχανή/πανιά"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
-msgstr ""
+msgstr "Ίχνος"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
-msgstr ""
+msgstr "Επιλογή ίχνους"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
-msgstr ""
+msgstr "Χρησιμοποιήστε μπλοκ κειμένου..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
-msgstr ""
+msgstr "Αποθηκεύστε το αρχείο ημερολογίου"
 
 #: src/LogbookDialog.cpp:4798
 msgid "Normal Timer has 0 h 0 Min.\n\n"
 "Please change settings (Timer-Interval)"
-msgstr ""
+msgstr "Το κανονικό χρονόμετρο έχει 0 h 0 min.\n\n"
+"Αλλάξτε τις ρυθμίσεις (χρονικό διάστημα)"
 
 #: src/LogbookDialog.cpp:4960
 msgid "No Path set to HTML-Editor\n"
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
-msgstr ""
+msgstr "Αποθηκεύστε τον κατάλογο πληρώματος"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
-msgstr ""
+msgstr "Απόκρυψη εξοπλισμού"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
-msgstr ""
+msgstr "Αποθηκεύστε το αρχείο δεδομένων του πλοίου"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
-msgstr ""
+msgstr "Αποθηκεύστε το αρχείο του σέρβις"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
-msgstr ""
+msgstr "Αποθηκεύστε το αρχείο επισκευών"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
-msgstr ""
+msgstr "Αποθηκεύστε το αρχείο BuyParts"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
-msgstr ""
+msgstr "Αποθηκεύστε το αρχείο επισκόπησης"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
-msgstr ""
+msgstr "Φιλτράρετε τη διάταξη σύμφωνα με"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
-msgstr ""
+msgstr "Μετονομάστε τη διάταξη"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
-msgstr ""
+msgstr "Διαγραφή της διάταξης"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
-msgstr ""
+msgstr "Αποστολή διάταξης με email"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
-msgstr ""
+msgstr "Εγκατάσταση ενιαίας διάταξης"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
-msgstr ""
+msgstr "Πρώτη/τελευταία εγγραφή"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
-msgstr ""
+msgstr "Αρχείο"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
-msgstr ""
+msgstr "Προσθήκη στοιχείου"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
-msgstr ""
+msgstr "Διαγραφή Στοιχείου"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
-msgstr ""
+msgstr "Μετονομασία στοιχείου"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
-msgstr ""
+msgstr "Προσθέστε Διακλάδωση"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
-msgstr ""
+msgstr "Διαγραφή διακλάδωσης"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
-msgstr ""
+msgstr "Κείμενο"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
-msgstr ""
+msgstr "Μπλοκ κειμένου"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1786,27 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
-msgstr ""
+msgstr "Το όνομα του στοιχείου εμφανίζεται με δεξί κλικ στις παρακάτω στήλες\n"
+"Κάνοντας κλικ πάνω του εμφανίζεται το κείμενο\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
-msgstr ""
+msgstr "Κείμενα για μενού από δεξί κλικ"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,128 +1814,126 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
-msgstr ""
+msgstr "Νέος κόμβος%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
-msgstr ""
+msgstr "Νέο στοιχείο%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
-msgstr ""
+msgstr "Κανονικό χρονόµετρο"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
-msgstr ""
+msgstr "Συμβάν"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
-msgstr ""
+msgstr "Χρονόμετρο ωρών"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
-msgstr ""
+msgstr "κάθε"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
-msgstr ""
+msgstr "+ Λεπτά"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
-msgstr ""
+msgstr "Αποεπιλογή όλων"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
-msgstr ""
+msgstr "Επιμέρους χρονόμετρο"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
-msgstr ""
+msgstr "Ώρα"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
-msgstr ""
+msgstr "Λεπτά"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
-msgstr ""
+msgstr "μ.μ."
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
-msgstr ""
+msgstr "π.μ."
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
-msgstr ""
+msgstr "π.μ./μ.μ."
 
 #: src/LogbookOptions.cpp:70
 msgid "Date-Format:"
-msgstr ""
+msgstr "Μορφή ημερομηνίας:"
 
 #: src/LogbookOptions.cpp:74
 msgid "Local Format"
-msgstr ""
+msgstr "Τοπικό φορμά"
 
 #: src/LogbookOptions.cpp:74
 msgid "Individual"
-msgstr ""
+msgstr "Ατομικό"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
-msgstr ""
+msgstr "μήνας"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
-msgstr ""
+msgstr "Ημέρα"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
-msgstr ""
+msgstr "Έτος"
 
 #: src/LogbookOptions.cpp:111
 msgid "Separator"
-msgstr ""
+msgstr "Διαχωριστικό"
 
 #: src/LogbookOptions.cpp:115
 msgid "."
-msgstr ""
+msgstr "."
 
 #: src/LogbookOptions.cpp:129
 msgid "Time-Format:"
-msgstr ""
+msgstr "Μορφή ώρας:"
 
 #: src/LogbookOptions.cpp:133
 msgid "24 Hour Format"
-msgstr ""
+msgstr "24 ωρο"
 
 #: src/LogbookOptions.cpp:133
 msgid "12 Hour Format"
-msgstr ""
+msgstr "12 ώρο"
 
 #: src/LogbookOptions.cpp:139
 msgid "No Seconds"
-msgstr ""
+msgstr "Χωρίς δευτερόλεπτα"
 
 #: src/LogbookOptions.cpp:160
 msgid "UTC"
@@ -1895,7 +1941,7 @@
 
 #: src/LogbookOptions.cpp:163
 msgid "Local = UTC"
-msgstr ""
+msgstr "Τοπική = UTC"
 
 #: src/LogbookOptions.cpp:190
 msgid "GPS Auto"
@@ -1903,133 +1949,155 @@
 
 #: src/LogbookOptions.cpp:191
 msgid "every 15 Degrees +/- 1 hour"
-msgstr ""
+msgstr "κάθε 15 μοίρες +/-1 ώρα"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
-msgstr ""
+msgstr "Εμφανίζεται εικονίδιο ημερολογίου"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
-msgstr ""
+msgstr "Δείξε το φορμά της θέσης"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
-msgstr ""
+msgstr "Εμφάνιση επεξηγήσεων εργαλείων"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
-msgstr ""
+msgstr "Αριθμός εσωλέμβιων κινητήρων"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
-msgstr ""
+msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
-msgstr ""
+msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr ""
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr "Γραμμή κατάστασης στο κάτω μέρος της σελίδας"
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr "Εάν δεν είναι επιλεγμένο, η λωρίδα κατάστασης θα τοποθετηθεί επάνω από τα κουμπιά πλοήγησης/καιρού/κινητήρα-πανιών"
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
-msgstr ""
+msgstr "Γεννήτρια επί του σκάφους"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
+msgstr "Τσεκ άν υπάρχει μια γεννήτρια στο σκάφος. \n"
+"Αν μείνει κενό οι στήλες για τη γεννήτρια δεν θα εμφανιστούν στο ημερολόγιο πλοίου"
+
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr "Εμφάνισε ελαχ.|μέση|μέγ. ταχύτητες ανέμου"
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr "Εάν είναι επιλεγμένο, η TWS και η AWS θα εμφανίζουν ελαχ.|μέση|μεγ. ταχύτητα ανένου"
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Μηνύματα πανιών"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
-msgid "Write warning \"No GPS\""
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:277
+msgid "Write warning \"No GPS\""
+msgstr "Γράψτε την προειδοποίηση \"Δεν υπάρχει GPS\""
+
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
-msgstr ""
+msgstr "Καταργήστε την επιλογή εάν δεν ν έχετε GPS\n"
+"ή είναι εκτός λειτουργίας."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
+msgstr "Γράψτε το μήνυμα \"η μηχανή λειτουργεί.\" "
+
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Με την έναρξη του κινητήρα όρισε ότι όλα τα πανιά είναι κάτω"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
-msgstr ""
+msgstr "     Η κατεύθυνση του ανέμου καθορίστηκε σε:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
-msgstr ""
+msgstr "προεπιλογή"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr ""
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
-msgstr ""
+msgstr "Συμβάντα"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
-msgstr ""
+msgstr "Γράφει το κείμενο αυτό το ημερολόγιο πλοίου, όταν επέρχεται το συμβάν, μεταβάλλει τα κείμενα"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
-msgstr ""
+msgstr "Αλλαγές πορείας"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
-msgstr ""
+msgstr "Αναδυόμενο παράθυρο ημερολογίου σε συμβάν"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
-msgstr ""
+msgstr "Εγκατάσταση διατάξεων"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
-msgstr ""
+msgstr "Απεγκατάσταση ημερολόγιου"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
-msgstr ""
+msgstr "Εγκατάσταση"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
-msgstr ""
+msgstr "Εγκατάσταση OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
-msgstr ""
+msgstr "Κατάργηση"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,495 +2106,490 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
-msgstr ""
+msgstr "Συμπεριφορά"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
-msgstr ""
+msgstr "Χρησιμοποιείται μόνο όταν εισάγετε 1/2, 1/4... σε ένα συνολικό πεδίο, ή για να υπολογίσετε το watermaker\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
-msgstr ""
+msgstr "Τεπόζιτο"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
-msgstr ""
+msgstr "Βάλτε γαλόνια/λίτρα στις ακροστοιχίες "
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
-msgstr ""
+msgstr "Μπαταρία"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
-msgstr ""
+msgstr "Χωρητικότητα"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
-msgstr ""
+msgstr "Μοίρες"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
-msgstr ""
+msgstr "Δευτερόλεπτα"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
-msgstr ""
+msgstr "Ταχύτητα"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
-msgstr ""
+msgstr "Εμφάνιση βάθους σε"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
-msgstr ""
+msgstr "Μέτρα"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
-msgstr ""
+msgstr "πόδια"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
-msgstr ""
+msgstr "οργιές"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
-msgstr ""
+msgstr "Εμφάνιση κυματισμού σε"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
-msgstr ""
+msgstr "Αληθή"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
-msgstr ""
+msgstr "Μαγνητική"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
-msgstr ""
+msgstr "fm"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
-msgstr ""
+msgstr "Ταχύτητα ανέμου"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
-msgstr ""
+msgstr "Θερμοκρασία"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
-msgstr ""
+msgstr "Καύσιμο/νερό"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
-msgstr ""
+msgstr "Ώρες κινητήρα"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
-msgstr ""
+msgstr "Αμπέρ"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
-msgstr ""
+msgstr "Κινητήρας"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
-msgstr ""
+msgstr "Άξονας προπέλας"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
-msgstr ""
+msgstr "S"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
-msgstr ""
+msgstr "Στροφές"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
-msgstr ""
+msgstr "σ.α.λ."
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
-msgstr ""
+msgstr "Ημέρα(ες)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
-msgstr ""
+msgstr "Εβδομάδα(ες)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
-msgstr ""
+msgstr "Μήνας "
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
-msgstr ""
+msgstr "Χρήση για μη αυτόματη καταχώρηση αν το GPS δεν λειτουργεί"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
-msgstr ""
+msgstr "Ταχύτητα ανέμου "
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
-msgstr ""
+msgstr " Κατεύθυνση "
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
-msgstr ""
+msgstr "Σχετική"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
-msgstr ""
+msgstr "Συντομογραφίες"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
-msgstr ""
+msgstr "Εμφάνιση"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
-msgstr ""
+msgstr "Όρισε πλάτος γραμμής σε"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
-msgstr ""
+msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
-msgstr ""
+msgstr "Όρισε διαφάνεια σε"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
-msgstr ""
+msgstr "διαφανές"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
-msgstr ""
+msgstr "στερεό"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
-msgstr ""
+msgstr "Ορισμός χρώματος γραμμής διαδρομής"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
-msgstr ""
+msgstr "λευκό"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
-msgstr ""
+msgstr "μαύρο"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
-msgstr ""
+msgstr "κόκκινο"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
-msgstr ""
+msgstr "κίτρινο"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
-msgstr ""
+msgstr "Ορισμός χρώματος γραμμής ίχνους"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
-msgstr ""
+msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
-msgstr ""
+msgstr "Για βαρόμετρο, θερμοκρασία αέρα και σχετική υγρασία"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
-msgstr ""
+msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
-msgstr ""
+msgstr "<< Πίσω"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
-msgstr ""
+msgstr "Πίσω στα ονόματα των πανιών"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
-msgstr ""
+msgstr "Σειρά +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
-msgstr ""
+msgstr "Σειρά -"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
-msgstr ""
+msgstr "Στήλη +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
-msgstr ""
+msgstr "Στήλη -"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Διάφορα"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
-msgstr ""
+msgstr "από"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
-msgstr ""
+msgstr "προς"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
-msgstr ""
+msgstr "Ναί"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
-msgstr ""
+msgstr "Διεύθυνση"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
-msgstr ""
+msgstr "Επιλέξτε μια ημερομηνία"
 
 #: src/Maintenance.cpp:92 src/Maintenance.cpp:93
 msgid "Engine "
-msgstr ""
+msgstr "Κινητήρας "
 
 #: src/Maintenance.cpp:99
 msgid "Fix Date"
-msgstr ""
+msgstr "Καθορισμένη ημερομηνία"
 
 #: src/Maintenance.cpp:100
 msgid "Date + Days"
-msgstr ""
+msgstr "Ημερομηνία + ημέρες"
 
 #: src/Maintenance.cpp:101
 msgid "Date + Weeks"
-msgstr ""
+msgstr "Ημερομηνία + εβδομάδες"
 
 #: src/Maintenance.cpp:102
 msgid "Date + Months"
-msgstr ""
+msgstr "Ημερομηνία + μήνες"
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
-msgstr ""
+msgstr "Όχι"
 
 #: src/OverView.cpp:220
 msgid "Logbook until "
-msgstr ""
+msgstr "Ημερολόγιο μέχρι "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
-msgstr ""
+msgstr "Ημερολόγιο συνολικά"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
-msgstr ""
+msgstr "%i έτη %i μήνες %i ημέρα(ες)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
-msgstr ""
+msgstr "%E εβδομάδες %D ημέρες %H: %M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/es.po opencpn-plugin-logbookkonni-1.2024/po/es.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/es.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/es.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:21-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
@@ -16,35 +16,35 @@
 "X-Crowdin-Language: es-ES\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Bitácora"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
-msgstr "¿Los motores siguen corriendo\n\n"
-"Parar motores?"
+msgstr "El(los) motor(es) está(n) funcionando\n\n"
+"¿Parar moto(res)?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
-msgstr "Viento"
+msgstr "desde "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
-msgstr ""
+msgstr "-Plugin"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
-msgstr "Bitácora nueva"
+msgstr "Cuaderno de Bitácora activo"
 
 #: src/logbook_pi.cpp:681
 msgid "Logbook for OpenCPN"
-msgstr "Bitácora para OpenCPN"
+msgstr "Cuaderno de Bitácora para OpenCPN"
 
 #: src/logbook_pi.cpp:686
 msgid "Logbook for OpenCPN\n\n"
@@ -52,26 +52,21 @@
 "If you find a bug post it on\n"
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Helpful videos are at Youtube, search for LogbookKonni."
-msgstr "Bitácora para OpenCPN\n\n"
-"\t- entrada automática (NMEA) o manual\n"
-"\t- temporizador para entradas automáticas\n"
-"\t- exportar a ods,html,xml(Windows únicamente),csv\n"
-"\t- layouts múltiples\n"
-"\t- layouts modificables\n\n"
-"Strg+Enter = salto de línea en celda de bitácora\n\n"
-"Todo:\n"
-"En falta de señal GPS/NMEA: parar temporizador y borar posición etc. - Mandar alerta\n"
-"."
+msgstr "Cuaderno de Bitácora para OpenCPN\n\n"
+"\\Gracias a la comunidad por sus útiles sugerencias.\n\n"
+"Si encuentra un error postee en\n"
+"http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
+"Hay vídeos de ayuda en Youtube, busque por LogbookKonni."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
-msgstr "Bitácora preferencias"
+msgstr "Preferencias de Cuaderno de Bitácora"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
-msgstr "Seleccione ficheros .zip de layout"
+msgstr "Seleccione ficheros .zip de plantillas"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -84,143 +79,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
-msgstr ""
+msgstr "Ma"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Verdadero"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
-msgstr ""
+msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
-msgstr ""
+msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
-msgstr ""
+msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
-msgstr ""
+msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
-msgstr ""
+msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
-msgstr ""
+msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
-msgstr ""
+msgstr "Fo"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
-msgstr ""
+msgstr "Me"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
-msgstr ""
+msgstr "Mt"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
-msgstr ""
+msgstr "St"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
-msgstr ""
+msgstr "Sp"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
-msgstr ""
+msgstr "Mayor"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
-msgstr ""
+msgstr "Probar"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
-msgstr ""
+msgstr "Génova 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
-msgstr ""
+msgstr "Génova 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
-msgstr ""
+msgstr "Génova 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
-msgstr ""
+msgstr "Foque 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
-msgstr ""
+msgstr "Foque 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
-msgstr ""
+msgstr "Foque 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
-msgstr ""
+msgstr "Foque"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
-msgstr ""
+msgstr "Mesana"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
-msgstr ""
+msgstr "Tormentín de mesana"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
-msgstr ""
+msgstr "Trinqueta"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
-msgstr ""
+msgstr "Spinnaker"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Usted puede cambiar las abreviaturas y los nombres de las velas\n"
 "en opciones/misceláneo/velas"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
-msgstr "línea automática para la llegada al Waypoint"
+msgstr "línea automática para la llegada a Marca"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "linea automática\n"
-"cambio de gaurdias"
+"cambio de guardia"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "linea automática\n"
-"cambio del curso >"
+"cambio del rumbo >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "linea automática\n"
 "Distancia > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -230,291 +225,296 @@
 "o modificar el texto en Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter = añade línea"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
-msgstr ""
+msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
-msgstr ""
+msgstr "MN"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
-msgstr ""
+msgstr "kts"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
-msgstr ""
+msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
-msgstr ""
+msgstr "pies"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
-msgstr ""
+msgstr "fth"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
-msgstr ""
+msgstr "mb"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
-msgstr ""
+msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
-msgstr ""
+msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
-msgstr ""
+msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
-msgstr ""
+msgstr "gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
-msgstr ""
+msgstr "h"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "día(s)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "Mes"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Información"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Diseñador"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
-msgstr "Seleccione bitácora"
+msgstr "Buscar en Cuaderno de Bitácora"
 
 #: src/Logbook.cpp:48
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "You should create a new logbook to minimize loadingtime."
 msgstr "La bitácora tiene %i entradas\n\n"
-"Pf. genere una bitácora nueva para reduzir los tiempos de carga."
+"Pf. Debe crear una bitácora nueva para reducir los tiempos de carga."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
-msgstr " desactivar"
+msgstr " desactivado"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
-msgstr ""
+msgstr " activado"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Estás seguro ?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Bitácora nueva"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
-msgstr ""
+msgstr "¿Restablecer los valores a cero?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "La bitácora está sin entradas ?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Última entrada de la bitácora\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
-msgstr "Última entrada de la bitácora\n"
+msgstr "Última entrada de la bitácora es\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Bitácora antiguo hasta %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
-msgstr ""
+msgstr "Iniciar conversión a nuevo formato fecha/hora\n"
+" y salvaguarda de todos los archivos de datos de la versión 1.1 a la\n\n"
+"%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
-msgstr ""
+msgstr "Su cuaderno de bitácora tiene %i lineas\n\n"
+"\t\t\tDebe crear un nuevo cuaderno de bitácora para minimizar el tiempo de carga."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
-msgstr "Leer Layouts de nuevo"
+msgstr "Ruta sin nombre"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
-msgstr ""
+msgstr "***HOMBRE AL AGUA*** \n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
-msgstr ""
+msgstr "Derrota "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
-msgstr "Máquina #1 encendida"
+msgstr "Motor #1 arranque"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
-msgstr "Máquina #1 corriendo"
+msgstr "Motor #1 funcionando"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
-msgstr "Máquina #1 apagada"
+msgstr "Motor #1 paro"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
-msgstr "Máquina #2 encendida"
+msgstr "Motor #2 arranque"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
-msgstr "Máquina #2 corriendo"
+msgstr "Motor #2 funcionando"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
-"Máquina #2 corriendo"
+"Motor #2 funcionando"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
-msgstr "Máquina #2 apagada"
+msgstr "Motor #2 paro"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
-"Máquina #2 apagada"
+"Motor #2 paro"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
-msgstr ""
+msgstr "Generador iniciado"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
-msgstr ""
+msgstr "Generador funcionando"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
-msgstr ""
+msgstr "\n"
+"Generador funcionando"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
-msgstr ""
+msgstr "Generador parado"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr "\n"
 "Generador parado"
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Izada de las velas"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Velas cambiadas"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
-msgstr "Velas"
+msgstr "Arriado de Velas"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Eliminar línea Nº. %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Confirme"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Por favor indique la fecha en el formato: \n"
 " %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Por favor ingrese la hora en el formato: \n"
 " %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Entre por favor 0544512n0301205e para\n"
 "054° 45' 12\" N  030°12' 05\" E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Entre por favor 0544512n0301205e para\n"
 "054° 45' 12\" N  030°12' 05\" E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
-msgstr "Minuteos mayor que 59!"
+msgstr "¡Minutos mayores de 59!"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
-msgstr ""
+msgstr "El viento ha sido fijado como verdadero\n"
+"pero el GPS no envía información\n"
+"Se fija el viento como aparente\n\n"
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "No hay señal GPS!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Siguiente nombre WP: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Último waypoint de la ruta"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -523,73 +523,72 @@
 "Nombre del Waypoint: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Waypoint saltado"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Llegada al Waypoint"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
-msgstr "No está permitido para añadir datos al vieja bitácora\n\n"
+msgstr "No está permitido para añadir datos a la antigua bitácora\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN cambia a la bitácora actual"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
-msgstr "Seleccione bitácora"
+msgstr "Buscar en"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Bitácora actual"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Bitácora nueva"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Seleccione bitácora"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "En la columna"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Fecha"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Seleccione ruta"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Seleccione ruta"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Seleccione bitácora"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Diálogo TextBlocks"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "- Temporizador activo - Intervalo:"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Posición"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Añadir línea"
 
@@ -597,10 +596,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Añadir una línea al final de tu bitácora"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Exportar"
 
@@ -610,71 +608,65 @@
 msgstr "exportardatos de tu bitácora como: \n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr "Mostrar el modo de selección de disposición"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Seleccione Layout"
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Seleccione una disposición mostrada\n"
 "con el botón \"Mostrar\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
-msgstr ""
+msgstr "R"
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Leer Layouts de nuevo"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
-msgstr ""
+msgstr "E"
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Editar Layout"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
-msgstr ""
+msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Ver"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Ver datos en el navegador (HTML) u OpenOffice.org/LibreOffice (ODT)"
 
@@ -702,41 +694,42 @@
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Temporizador"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
-msgstr ""
+msgstr "Fijar tiempo para el temporizador"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Temporizador"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Guardia"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
-msgstr ""
+msgstr "Marca"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "DistanciaEtmal"
 
 #: src/LogbookDialog.cpp:283
 msgid "Set the desired distance in NM\n"
 " = (Track made good)"
-msgstr ""
+msgstr "Fijar la distancia deseada en MN\n"
+" = (Mejora de Derrota)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Nubolosidad"
 
@@ -744,900 +737,916 @@
 msgid "Set desired Degrees\n"
 "if the course changes by this amount\n"
 "a course-changed-event occurs"
-msgstr ""
+msgstr "Establecer los grados deseados\n"
+"si el rumbo cambia esa cantidad\n"
+"se producirá un cambio de rumbo"
 
 #: src/LogbookDialog.cpp:306
 msgid "Set desired delay in minutes\n"
 "It's a good idea to set here a value > 0\n"
 "to find the right wind."
-msgstr ""
+msgstr "Fijar el retraso en minutos\n"
+"es una buena idea poner un valor >0\n"
+"para encontrar viento bueno."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #: src/LogbookDialog.cpp:315
 msgid "Suspend/Resume running event/s"
-msgstr ""
+msgstr "Suspender/reanudar ejecución de evento/s"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Ruta"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Hora"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr "Estado"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Distancia total"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Rumbo"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
-msgstr ""
+msgstr "SOG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
-msgstr ""
+msgstr "STW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Sonda"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Comentarios"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Elimiar línea"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Mostrar columnas ocultas"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Ocultar columna"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Ver ícono bitácora"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Elimiar línea"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Cambiar día <-> mes"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navigación"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Barómetro"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Hygrometro"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Aire"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Agua"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
-msgstr ""
-
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
-msgstr ""
+msgstr "TWA"
 
 #: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr "TWS\n"
+"Min|Med|Max"
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
-msgstr ""
+msgstr "AWA"
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr "AWS\n"
+"Min|Med|Max"
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr "TWS"
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
-msgstr ""
+msgstr "AWS"
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Corriente"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Amperaje"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Oleaje"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Mar de fondo"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Meteo"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Nubolosidad"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Visibilidad"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Metros"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
-msgstr "Máquina"
+msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "Agua total"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
-msgstr "Máquina"
+msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "Agua total"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Combustible"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Combustible total"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Velas"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Rizo"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Generador"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Gen. total"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Banco #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
-msgstr ""
+msgstr "Ah #1 Total"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
-msgstr ""
+msgstr "Banco #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
-msgstr ""
+msgstr "Ah #2 Total"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Agua"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "Agua total"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
-msgstr ""
+msgstr "W-salida"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Agua total"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Ruta"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
-msgstr ""
+msgstr "DerrotaID"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/Vela"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
-msgstr ""
+msgstr "exportar datos de la vista como HTML u ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
-msgstr ""
+msgstr "Seleccione uno de los diarios antiguos"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Calle"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
-msgstr ""
+msgstr "Fin"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
-msgstr ""
+msgstr "Tiempo total"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "DistanciaEtmal"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
-msgstr ""
+msgstr "Mejor Dist. p. día"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Velocidad"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Mar de fondo"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
-msgstr ""
+msgstr "Banco #1 gen."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
-msgstr ""
+msgstr "Banco #1 utilizado"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
-msgstr ""
+msgstr "Banco #2 gen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
-msgstr ""
+msgstr "Banco #2 utilizado"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
-msgstr ""
+msgstr "Producción de agua"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Agua"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
-msgstr ""
+msgstr "TWA promedio"
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
-msgstr ""
+msgstr "TWS Promedio"
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
-msgstr ""
+msgstr "TWS Max."
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Corriente"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Corriente"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Corriente"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Oleaje"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Oleaje"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Mar de fondo"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Mar de fondo"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
-msgstr ""
+msgstr "Velas utilizadas habitualmente"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Guardia"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Ruta"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Servicio"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Añadir tripulante"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
-msgstr ""
+msgstr "Añadir un nuevo miembro de la tripulación"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
-msgstr ""
+msgstr "exportar los datos de tripulación como: \n"
+"HTML, CSV, XML, ODT, ODS"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
-msgstr ""
+msgstr "Copiar para controlar"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
-msgstr ""
+msgstr "Nombre completo"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Nombre"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
-msgstr ""
+msgstr "Apellido sólo"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
-msgstr ""
+msgstr "A bordo"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Nombre"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
-msgstr ""
+msgstr "Nombre"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Nombre"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Título"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Fecha de nacimiento"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Lugar de nacimiento"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nacionalidad"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Nº.Pasaporte"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "expedido en"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Fecha expedición"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "CP"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "País"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Ciudad"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Calle"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Ver ícono bitácora"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Leer Layouts de nuevo"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
-msgstr ""
+msgstr "Ordenar ascendente"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
-msgstr ""
+msgstr "Ordenar descendente"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Inicio 1ªguardia"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
-msgstr ""
+msgstr "Establecer la fecha de inicio de la singladura"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
-msgstr ""
+msgstr "Establecer la hora de inicio de la singladura"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
-msgstr ""
+msgstr "Días"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
-msgstr ""
+msgstr "Duración de tu singladura"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Calcular"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Calcular las guardias con los miembros entrados en las columnas"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Pie"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Restaurar datos a nivel de edición"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Borrar"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Borrar todos los datos"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Día atrás"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Ahora"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Ir a fecha/hora ahora"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Día en adelante"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Día:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Muestra o establece el día\n"
 "Muestra los datos en su programa ODT/navegador de este día hasta el fin"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Desplazamiento"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "Intervalo:"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "este día"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "Utilizado para el programa ODT/navegador\n"
 "Una linea por día + días seleccionados = días mostrados"
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "Guardia"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Guardia"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Metros"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Inicio 1ªguardia"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Inicio 1ªguardia"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Inicio 1ªguardia"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Inicio 1ªguardia"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Elimiar línea"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Listado de tripulación"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Añadir equipamiento"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "agregar el equipo del barco"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Equipamiento"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Añadir equipamiento"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "exportar datos de tu barco/equipo como: \n"
 " HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Editar Layout"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Embarcación"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Puerto de registro"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Identificativo"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
-msgstr ""
+msgstr "HIN-Nr."
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "No. de identificación del casco"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Vela-Nº"
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Seguro"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Nº de registro"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Poliza"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
-msgstr ""
+msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Patrón"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Nombre    "
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Teléfon0"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Detalles"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Tipo"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Fabricante"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Casco"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Fecha botadura"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Nº amarre"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Diseñador"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Construcción"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
-msgstr ""
+msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Longitud sobre todo"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
-msgstr ""
+msgstr "LOD"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Longitud sobre cubierta"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
-msgstr ""
+msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Longitud de la línea de flotación"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Manga"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Mayor ancho del casco"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Calado"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
-msgstr ""
+msgstr "UserLabel"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "Escriba su propia etiqueta"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Desplazamiento"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Equipamiento"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Descripción"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Nº de serie"
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Añadir línea"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "exportar datos de su servicio como HTML o ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Seleccione Layout:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prioridad"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Servicio pendiente"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Si"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "ValorAlarma"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "ValorAlerta"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Valor inicial"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Activo"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Servicio acabado"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Comprar recambios para este servicio"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Servicio"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "exportar datos de sus reparaciones como HTML o ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Reparaciones pendientes"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparación efectuada"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Comprar recambios para esta reparación"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparaciones"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "exportar sus datos de compras de partes como HTML o ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Categoría"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Comprar recambios"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "en"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Mantenimiento"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "Máquina"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr "- Temporizador activo - Intervalo:"
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr " -Contador de horas completo"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr " -Contador del tiempo individual"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr "ningún evento(s)\n"
 "Haz click a una o más balas para empezar"
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Evento(s) suspenddidos\n"
 "Haz click al botón para reiniciar todos los eventos"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Evento(s) activos\n"
 "Haz click al botón para suspender o a la bala para detener"
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
@@ -1645,32 +1654,32 @@
 "rojo = evento está detenido\n"
 "amarillo = evento está suspendido. Reinicie el evento con el botón Start"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Opendocument Hoja de cálculo(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
-msgstr "Mostrar el modo motores/velas"
+msgstr "Mostrar Modo motores/velas"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "Pista"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Seleccione ruta"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
-msgstr ""
+msgstr "GUID"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "usa Textblocks..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Guardar Bitácora"
 
@@ -1686,93 +1695,93 @@
 msgstr "No hay ruta al editor de HTML\n"
 "en Opciones/Plugins/LogbookKonni/Preferencias"
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Guardar Listado de tripulación"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Añadir equipamiento"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Guardar fichero embarcación"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Guardar Listado de tripulación"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Guardar Listado de tripulación"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Guardar fichero embarcación"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Guardar Listado de tripulación"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Editar Layout"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Leer Layouts de nuevo"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Seleccione Layout:"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Enviar disposición por correo electrónico"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Instalar única disposición"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Nombre"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Archivo"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Añadir tripulante"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Seleccione Layout:"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Leer Layouts de nuevo"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Añadir tripulante"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Elimiar línea"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Texto"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
-msgstr ""
+msgstr "Textblocks"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1785,155 +1794,170 @@
 "In 'Texts when using this Dialog only' you can insert/delete treenodes only\n\n"
 "Use Drag 'n Drop to move item from/to menu\n\n"
 "see next treenodes for more help"
-msgstr ""
+msgstr "Ayuda\n"
+"---\n\n"
+"Abra el nodo del árbol\n"
+" 'Textos cuando solo se usa este cuadro de diálogo' \n"
+" y seleccione, p. ej. 'Observaciones' \n\n"
+"clic con botón derecho en la vista del árbol para menu\n\n"
+"Añada un elemento y cambiele el nombre\n"
+" USE NOMBRES ÚNICOS PARA LOS ITEMS \n\n"
+"Insertar texto\n\n"
+"In 'Textos cuando se usa solo este cuadro de diálogo' puede insertar/eliminar nodos del árbol\n\n"
+"Use arrastrar y soltar para mover el artículo de/a menu\n\n"
+"ver siguiente nodo de árbol para obtener más ayuda"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
-msgstr ""
+msgstr "El nombre de item se muestra en el menú del botón derecho de las siguientes Columnas\n"
+"Haciendo clic sobre él, el texto se inserta\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Textos para el menú de clic derecho"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Velas arriba\n"
 "Motor parado\n\n"
-"Demo - menú de clic derecho 'usa Textblocks' para obtener ayuda"
+"Demo - clic derecho -Menú  'usa Textblocks' para obtener ayuda"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Detalles"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
 "Click OK-Button\n\n"
 "Use Drag 'n Drop to place a item in menu"
-msgstr ""
+msgstr "Estos textos se insertan en la trama de colmnas\n"
+"al llamar a este cuadro de dialogo\n\n"
+"Seleccione Item\n"
+"Clic en el botón OK\n\n"
+"use arrastrar y soltar para colocar un elemento en el menú"
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
-msgstr ""
+msgstr "Textos solo al usar este cuadro de diálogo"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
-msgstr ""
+msgstr "Motor parado\n\n"
+"Demo - clic derecho -Menú 'use Testextblocks' para obtener ayuda"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
-msgstr ""
+msgstr "Demo motor parado"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
-msgstr ""
+msgstr "Nodo nuevo %i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
-msgstr ""
+msgstr "Item nuevo %i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
-msgstr ""
+msgstr "Temporizador normal"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
-msgstr ""
+msgstr "Evento"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
-msgstr ""
+msgstr "Temporizador completo"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "Metros"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "Minutos"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Seleccione ruta"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
-msgstr ""
+msgstr "Temporizador individual"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
-msgstr ""
+msgstr "Hora"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minutos"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
-msgstr ""
+msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
-msgstr ""
+msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
-msgstr ""
+msgstr "AM/PM"
 
 #: src/LogbookOptions.cpp:70
 msgid "Date-Format:"
-msgstr ""
+msgstr "Formato de Fecha:"
 
 #: src/LogbookOptions.cpp:74
 msgid "Local Format"
-msgstr ""
+msgstr "Formato local"
 
 #: src/LogbookOptions.cpp:74
 msgid "Individual"
-msgstr ""
+msgstr "Individual"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Mes"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #: src/LogbookOptions.cpp:111
 msgid "Separator"
-msgstr ""
+msgstr "Separador"
 
 #: src/LogbookOptions.cpp:115
 msgid "."
-msgstr ""
+msgstr "."
 
 #: src/LogbookOptions.cpp:129
 msgid "Time-Format:"
-msgstr ""
+msgstr "Formato de hora:"
 
 #: src/LogbookOptions.cpp:133
 msgid "24 Hour Format"
-msgstr ""
+msgstr "Formato de 24 horas"
 
 #: src/LogbookOptions.cpp:133
 msgid "12 Hour Format"
-msgstr ""
+msgstr "Formato de 12 horas"
 
 #: src/LogbookOptions.cpp:139
 msgid "No Seconds"
@@ -1941,105 +1965,129 @@
 
 #: src/LogbookOptions.cpp:160
 msgid "UTC"
-msgstr ""
+msgstr "UTC"
 
 #: src/LogbookOptions.cpp:163
 msgid "Local = UTC"
-msgstr ""
+msgstr "Local = UTC"
 
 #: src/LogbookOptions.cpp:190
 msgid "GPS Auto"
-msgstr ""
+msgstr "GPS Auto"
 
 #: src/LogbookOptions.cpp:191
 msgid "every 15 Degrees +/- 1 hour"
-msgstr ""
+msgstr "cada 15 grados +/-1 hora"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Ver ícono bitácora"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
-msgstr ""
+msgstr "Mostrar formato de posición"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
-msgstr ""
+msgstr "Mostrar información"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
-msgstr ""
+msgstr "Núm. de motores a bordo"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
-msgstr ""
+msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
-msgstr ""
+msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr ""
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr "Barra de estado al final de la página"
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr "Si deselecciona la Barra de Estado se colocará encima de los botones de Navegación/Meteo/Motor-velas"
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
-msgstr ""
+msgstr "Generador a bordo"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
+msgstr "Compruebe si hay un generador a bordo. \n"
+"Si no lo selecciona, no aparecerán las columnas de generador, en el Cuaderno de Bitácora"
+
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr "Show Min|Med|Max velocidad viento"
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr "Si está marcado TWS y AWS se mostrarán velocidades de viento Min|Med|Max"
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Mensajes de velas"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
-msgid "Write warning \"No GPS\""
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:277
+msgid "Write warning \"No GPS\""
+msgstr "Escribir el aviso \"No GPS\""
+
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
-msgstr ""
+msgstr "Desmarcar si no tienes GPS\n"
+"si el GPS está averiado, desactive la casilla para\n"
+"prevenir que el mensaje se repita."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
+msgstr "Escribir mensaje \"motor funcionando\" "
+
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Cuando arranque motor establecer arriar velas"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
-msgstr ""
+msgstr "     Dirección del viento puesto en:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
-msgstr ""
+msgstr "Por defecto"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
-msgstr ""
+msgstr "Por defecto = Aparente\n"
+"Real = Actual dirección del viento"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Todas las velas abajo al arranque del motor"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Eventos"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Escribe este texto en la bitácora cuando ocurre el evento, modificar textos según lo deseado"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2048,290 +2096,291 @@
 "Puedes activar o apagar el temporizador\n"
 "o modificar el texto en 'Opciones' "
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "línea automática\n"
 "llegada al Waypoint:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Cambios del curso"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Bitácora emerga por evento"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Leer Layouts de nuevo"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Bitácora nueva"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Intervalo:"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Instalar OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Máquina total"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
 "all Logbook-Layouts,\n"
 "all Logbook-Languages\n"
 "and cleans the OpenCPN.ini"
-msgstr ""
+msgstr "Desinstalar\n"
+"Logbook-Plugin, \n"
+"todos los datos del Diario de Navegación,\n"
+"todas los diseños,\n"
+"todos los lenguajes\n"
+"y limpia el archivo OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Comportamiento"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Sólo se utiliza cuando entras 1/2, 1/4... en un campo total, o para calcular la potabilizadora\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Tanque"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Sistema gal/litro en abreviaturas "
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Categoría"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Capacidad"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr "Grados"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Segundos"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Velocidad"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Ver sonda en"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Metros"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Pie"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Brazas"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Ver oleaje/mar de fondo en"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Verdadero"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnético"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
-msgstr ""
+msgstr "fm"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Fuerza Viento"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperature"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Combustible/Agua"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Horas máquina"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
-msgstr ""
+msgstr "Amperio"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
-msgstr "Máquina"
+msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
-msgstr ""
+msgstr "Eje de propulsión"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
-msgstr ""
+msgstr "S"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Revoluciones"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
-msgstr ""
+msgstr "RPM"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dia(s)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Semana"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Semana"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Mes"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Al GPS no disponible usa para la entrada manual"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Fuerza Viento"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr "Rumbo"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Relativo"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Abreviaciones"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Ruta al editor HTML"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "para utilizar MS-Word, anexar %s como: \n"
 " \"C:\\yourPathToWinword\\WINWORD.\"EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Ruta a Datamanager"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Ruta al cliente de correo"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Ruta al editor HTML (opcional)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Guardia"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Guardia"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Anchura de línea"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
-msgstr ""
+msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Transparencia"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr "transparente"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr "sólido"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Color de la ruta"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "blanco"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "negro"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "rojo"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "amarillo"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Color de la pista"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
-msgstr ""
+msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr "Marque una de las casillas de verificación abajo, si quieres usar sentencia ERRPM (ver ayuda)"
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "Marcar"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2339,211 +2388,219 @@
 "deberías ver las sentencia ERRPM\n"
 "por la izquierda del botón"
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "No. del motor correspondiente con la columna Engine #1"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr "Marque esta casilla si la corriente NMEA contiene mensajes RPM para este motor\n"
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "No. del motor correspondiente con la columna Engine #2"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr "No. del motor correspondiente con la columna generador"
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr "Marque esta casilla si la corriente NMEA contiene mensajes RPM para este generador\n"
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "Usa sentencias ERRPM para calcular las horas motor"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Usa sentencias WIMDA de la estación meteorológica"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Para el barómetro, temperatura del aire y humedad relativa"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
-msgstr ""
+msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
-msgstr ""
+msgstr "Espacio de las Casillas de verificación >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
-msgstr ""
+msgstr "Utilizable en Tabletas y PCs"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
-msgstr ""
+msgstr "Las abreviaturas aparecen en las casillas con nombre de velas\n"
+"Cuando añade una nueva, el Nombre se empleará en la columna \"Velas\""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
-msgstr ""
+msgstr "<< Atrás"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
-msgstr ""
+msgstr "Volver a Nombres de Velas"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
-msgstr ""
+msgstr "Fila +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
-msgstr ""
+msgstr "Fila -"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
-msgstr ""
+msgstr "Columna +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
-msgstr ""
+msgstr "Columna-"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Misceláneo"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
-msgstr ""
+msgstr "Su generador sigue funcionando .\n\n"
+"Generator parado ahora."
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
-msgstr ""
+msgstr "Su motor #1 funciona en modo manual.\n\n"
+"Motor ahora parado."
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
-msgstr ""
+msgstr "Su motor #2 funciona en modo manual.\n\n"
+"Motor ahora parado."
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
-msgstr ""
+msgstr "Su Generador funciona en modo manual.\n\n"
+"Generador ahora parado."
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
-msgstr ""
+msgstr "Su país utiliza el formato de 24 horas.\n"
+"en este caso el SO no empleará las siglas AM/PM.\n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
-msgstr ""
+msgstr "No puede establecer este formato de fecha.\n\n"
+"%s%s%s%s%s\n\n"
+"Por favor utilice un formato de fecha diferente en los tres controles de entrada de datos."
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
-msgstr ""
+msgstr "Por favor, rellene un carácter en grados, minutos y segundos"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
-msgstr ""
+msgstr "Su motor #2 sigue funcionando.\n\n"
+"Motor #2 ahora parado."
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Ruta al editor HTML"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Ruta al editor HTML"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Ruta al editor HTML"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Ruta al editor HTML"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "Viento"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
-msgstr ""
+msgstr "a"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Siento, está sin instalar un layout"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Siento, la bitácora no tiene entradas"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "no encontrado en fichero de Layout"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Te has olvidado esta línea en el Layout ?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Te has olvidado delimitar el Header con [[ y ]]\n"
 "o Datos con {{ y }} ?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Ruta"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
-msgstr ""
+msgstr "Entrar tiempo de las guardias por defecto p.ej. 3.30 / formatos disponibles son 3.30, 3,30, 3:30, 0330 para 3 horas 30 minutos"
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
-msgstr ""
+msgstr "Cambie los tiempo de las guardias como quiera / arrastre y suelte tripulantes de la lista de tripulación"
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
-msgstr ""
+msgstr "*Opcional* dejar a * como tripulante que hace fijo la guardia / Clic Calcular"
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
-msgstr ""
+msgstr "Todos los cambios relativos a este día solo."
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Si"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
-msgstr ""
+msgstr "Dirección"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Seleccione ruta"
 
@@ -2565,27 +2622,27 @@
 
 #: src/Maintenance.cpp:102
 msgid "Date + Months"
-msgstr ""
+msgstr "Fecha + Meses"
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: src/OverView.cpp:220
 msgid "Logbook until "
 msgstr "Abrir fichero de bitácora antiguo"
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Abrir fichero de bitácora antiguo"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
-msgstr ""
+msgstr "%i Año(s) %i Mes(es) %i Día(s)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
-msgstr ""
+msgstr "%E Semana(s) %D Día(s) % H: %M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/et.po opencpn-plugin-logbookkonni-1.2024/po/et.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/et.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/et.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-06-02 20:34-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:05-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Estonian\n"
 "Language: et_EE\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: et\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -70,227 +70,226 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr ""
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr ""
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr ""
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -300,264 +299,263 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -565,10 +563,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -577,70 +574,64 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -664,32 +655,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -698,7 +689,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -714,8 +705,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -723,908 +714,917 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1638,93 +1638,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1739,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,75 +1766,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1850,18 +1850,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1905,131 +1903,151 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
-msgstr ""
-
-#: src/LogbookOptions.cpp:312
-msgid "default"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
-msgid "default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,453 +2056,448 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2508,8 +2521,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2517,16 +2530,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/fi.po opencpn-plugin-logbookkonni-1.2024/po/fi.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/fi.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/fi.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-06-02 20:34-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Finnish\n"
 "Language: fi_FI\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: fi\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Lokikirja"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Sinun kone(esi) käy(vät)\n\n"
 "Pysäytätkö?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "mistä "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Lisäosa"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Aktiivinen lokikirja"
 
@@ -58,15 +58,15 @@
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Ohjevideoita on Youtube:ssa, Etsi LogbookKonni:a."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Lokikirja asetukset"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Valitse zip asettelu-tiedostot"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -79,143 +79,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr "Ma"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Tr"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr "Ji"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr "Mi"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr "Mt"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "St"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Sp"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Pää"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Kokeile"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genoa 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genoa 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genoa 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Fokka 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Fokka 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Fokka 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Jib"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Välipurje"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr "Myrskyvälipurje"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Staysail"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Spinnacker"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Voit muuttaa lyhenteitä ja purjenimiä\n"
 "asetuksissa/Sekalaiset/Purjeet"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "Automaattilisäys reittipiste saavutettu"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "Automaattilisäys\n"
 "suoja-alue muutos"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "Automaattilisäys\n"
 "kurssimuutos >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "Automaattilisäys\n"
 "Etäisyys > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -225,88 +225,87 @@
 "tai muuttaa tätä tekstiä Toolbox/plugins/Logbook\n\n"
 "Shift + Enter lisää uuden rivin"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "Kts"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "jalkaa"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "FTH"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "mb"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "h"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "päivä(ä)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "viikko(ja)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "kuukausi"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Informaatiota"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Hae lokikirjasta"
 
@@ -317,46 +316,46 @@
 msgstr "Lokikirjassasi on %i riviä\n\n"
 "Sinun on aloitettava uusi lokikirja minimoimaan latausaika."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr " pois"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr " päällä"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Oletko varma ?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Uusi lokikirja"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Palauta kaikki arvot nollaksi?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Lokikirjassasi ei ole rivejä?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Viimeinen rivi Lokikirjasta\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Viime lokikirja on\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Vanha lokikirja %s asti"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -365,137 +364,137 @@
 "ja varmuuskopioi kaikki datatiedostot versiosta 1.1 \n\n"
 "%s versioon"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr "Lokikirjassasi on %i riviä\n\n"
 "\t\t\tSinun on aloitettava uusi lokikirja minimoimaan latausaika."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "nimeämätön reitti"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** MIES yli LAIDAN *** \n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Jälki "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Moottorin #1 käynnistetty"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Moottori #1 käynnissä"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Moottori #1 pysäytetty"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Moottorin #2 käynnistetty"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Moottori #2 käynnissä"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Kone #2 käynnissä"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Moottori #2 pysäytetty"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Kone #2 pysäytetty"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr "Generaattori käynnistetty"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr "Generaattori käynnissä"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr "\n"
 "Generaattori käynnissä"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr "Generaattori pysäytetty"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr "\n"
 "Generatori pysäytetty"
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Purjeet nostettu"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Purjeet vaihdettu"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Purjeet alas"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Poista rivi Nr. %i?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Vahvista"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Kirjoita päivämäärä muodossa: \n"
 " %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Kirjoita ajan muoto: \n"
 " %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Anna 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15 Sec N 030Deg 12Min 05.15 s E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Anna 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Suurempi kuin 59 minuuttia"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
@@ -503,19 +502,19 @@
 "mutta GPS ei lähetä suuntatietoa.\n"
 "Tuuli on asetettu nyt suhteelliseksi\n\n"
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Ei GPS-signaalia!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Seuraava WP nimi: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Viimeinen reittipiste reitistä"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -524,73 +523,72 @@
 "Reittipisteen nimi: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Reittipiste ohitettu"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Saavuttu reittipisteen"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr "Ei ole sallitua liittää tietoa vanhaan Lokikirjaan\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN kääntää on nykyiseen lokikirjaan"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Haku"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Nykyinen lokikirja"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Kaikki lokikirjat"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Hakumerkkijono"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "Sarakkeessa"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Valitse"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Valitse reitti"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Valitse lokikirja"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Tekstien valintaikkuna"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Aseta ajastimen aikaväli"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Sijainti"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Lisää rivi"
 
@@ -598,10 +596,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Lisää rivi lokikirjasi loppuun"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "&Vie"
 
@@ -611,71 +608,65 @@
 msgstr "vie lokikirja-tietoja mudossa:\n"
 "HTML, ODT, XML, CSV, ODS"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr "Näytä valinta asettelutilassa"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Valitse asettelu: "
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Valitse asettelu, jossa on näytetään\n"
 "\"View\" painike"
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "R"
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Lataa asettelut"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "E"
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Muokkaa asettelua"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Näkymä"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Näytä tiedot selaimessa (HTML) tai Openoffice/LibreOffice (ODT)"
 
@@ -703,32 +694,32 @@
 msgid "Help"
 msgstr "Ohje"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Aseta ajastin"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Asetta ajastimen aikaväli"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Ajastin"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Vahti"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Reittipiste"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Etäisyys"
 
@@ -738,7 +729,7 @@
 msgstr "Aseta haluttu etäisyys NM\n"
 " = (TMG)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Kurssi"
 
@@ -758,8 +749,8 @@
 "viivästyminen on hyvä asettaa tässä > 0\n"
 "jotta löydät oikean tuulen."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "Seis"
 
@@ -767,884 +758,895 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Keskeyttää/jatkaa käynnissä tapahtuma/s"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Reitti"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Aika"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr "Tila"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Kokonaismatka"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG(T)"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Suunta"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "SOG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "STW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Syvyys"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Huomautukset"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Poista rivi"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Näytä piilotetut sarakkeet"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Piilota sarake"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Sulje lokikirja"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Poista rivejä"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Vaihda päivä <-> kuukausi"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navigointi"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Ilmapuntari"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Kosteusmittari"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Ilma"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Vesi"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr "TWA"
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
-msgstr "TWS"
-
 #: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr "TWS\n"
+"Min|Avg|Max"
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr "AWA"
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr "AWS\n"
+"Min|Avg|Max"
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr "TWS"
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr "AWS"
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Virran nopeus, solmua"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "W/vahvuus"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Aalto"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Maininki"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Sää"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Pilvet"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Näkyvyys"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Sää"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Moottori #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "#1 yhteensä"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Moottori #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "#2 yhteensä"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Polttoaine"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Kaikki polttoaine"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Purjeet"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Reivi"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Generaattori"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Generaattorit yht."
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Akusto #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "AH #1 yhteensä"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr "Akusto #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "AH #2 yhteensä"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Juomaveden valmistin"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "W-yhteensä"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr "W-tuotos"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Kaikki vesi"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Reitin tunniste"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr "Jäljen tunniste"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Moottorilla/Purjein"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "Yleiskatsaus tietojen vieminen HTML-tai ODT muotoon"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Valitse jokin vanhoista lokikirjoista"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Aloita"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Lopeta"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Kokonaisaika"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Matka/päivä"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Paras matka/päivä"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Nopeus keskim."
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Nopeus Max."
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Akusto #1 gen."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Akustoi #1 käytetty"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Akusto #2 gen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Akusto #2 käytetty"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr "Juomavesi tuotto"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Käytetty vettä"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr "TWA keskim."
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr "TWS keskim."
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr "TWS Maks."
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Nykyinen keskimääräinen suunta"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Nykyinen keskimääräinen"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Nykyinen Max."
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Aalto Keskim."
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Aalto Max."
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "keskim. maininki"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Maks. maininki"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Purjeita käytetty enimmäkseen"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Polku"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Mene reitille"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Yleistä"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Lisää miehistö"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Lisää uusi miehistön jäsen"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "vie miehistön-tiedot muodossa: \n"
 "HTML, ODT, XML, CSV, ODS"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Kopioi vahtiin"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Täydellinen nimi"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Vain etunimi"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Sukunimi vain"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "Laivalla"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Nimi"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Syntymä nimi"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Etunimi"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Otsikko"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Syntymäaika"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Syntymäpaikka"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "kansallisuus"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Passin nro"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Myönnetty"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Antopäivä"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Postinumero"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Maa"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Kaupunki"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Katuosoite"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Näytä vain laivalla"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Näytä kaikki merkinnät"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Lajittele nousevasti"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Lajittele laskevasti"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Aseta vahtiajat"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Määritä purjehduksen aloituspvm"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Määritä purjehduksesi aloitusaika"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Päivät"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Purjehduksen pituus"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Laske"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Laske vahdit sarakkeiden jäsenten kesken"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Tyhjennä"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Palauta tiedot Muokkaa-tasolle"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Poista kaikki tiedot"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Päivä taaksepäin"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Nyt"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Mene nyt päiväykseen"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Päivästä"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Päivä:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Näyttää tai määrittää päivän\n"
 "Näyttää tiedot ODT/Browser-ohjelmassa tästä päivästä loppuun"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Näyttö"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "kaikki"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "tämä päivä"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "Käytetty ODT/selain-ohjelmalle\n"
 "Yksi rivi käytetään päivälle + valitut päivät = päivät näytetty"
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "1. Vahti"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Vahtiaika"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Jäsen"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Aseta Watchbase"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Jaa vahti osiin"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Yhdistä vahdit"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Vaihda kaksi vahtia"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Poista miehistön jäsenet"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Miehistöluettelo"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Lisää laite"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "Lisää veneesi varusteet"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Näytä laitteet"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Näytä/Piilota laiteverkko"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "tulosta veneen/laitteet-tietoja muodossa:\n"
 " HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Muokkaa asetteluja"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Vene"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Kotisatama"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Kutsu"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "HIN-Nr."
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Rungon tunnus nro"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Purje-Nr."
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Vakuutus"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Rekisteröinti"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Politiikka"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Omistaja"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Nimi      "
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Tyyppi"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Rakentaja"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Runko"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Vesillelasku pvm"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Telakka-Nr."
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Suunnittelija"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Rakenne"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Kokonaispituus"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "LOD"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Kannen pituus"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Vesilinjan pituus"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Leveys"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Rungon suurin leveys"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Syväys"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Käyttäjän nimilaatta"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "kirjoitta oman otsakkeesi"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Uppouma"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Sarja-Nr."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Lisää uusi rivi"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "Huoltotietojen vieminen HTML-tai ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Valitse asettelu:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Huollon tehtävälista"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Jos"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Varoitusarvo"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Kiireellisyys"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Alkuarvo"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Aktivoi"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Huolto on tehty"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Osta varaosia tähän huoltoon"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Huolto"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Korjaustietojen vieminen HTML-tai ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Korjausten tehtävälista"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Korjaus tehty"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Osta osia tähän korjaukseen"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Korjaukset"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "Osien ostotietojen vieminen HTML-tai ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Kategoria"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Osta osia"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "Klo"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Asennus"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "ei mitään"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr " -Tavallisen Ajastimen - aikaväli: "
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr " -Koko tunnin ajastin"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr " -Yksilöllinen ajastin"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr "ei tapahtuma/s\n"
 "Klikkaa yhtä tai useampaa pallukkaa aloittaaksesi"
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Tapahtuma/s peruttu\n"
 "Klikkaa napia jotta käynnistät kaikki tapahtumat uudelleen"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Tapahtuma/s käynnissä\n"
 "Klikkaa painiketta keskeyttääksi tai pallukkaa lopettaaksesi"
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
@@ -1652,32 +1654,32 @@
 "punainen = tapahtuma on pysäytetty\n"
 "keltainen = tapahtuma on keskeytetty. Käynnistä tapahtuman Käynnistä-painiketta"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "OpenDocument-laskentataulukkona (*.ods) | *. ods|Excel 2003-muodossa (*.xml) | *. xml|CSV muodossa OpenOffice (*.csv) | *. csv|Varmuuskopio lokikirja (*.txt) | * .txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr "Näytä moottorit/Purjeet tila"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "Jälki"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Valitse jälki"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr "GUID-TUNNUS"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "Käytä Tekstiblokkia..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Tallenna lokikirja"
 
@@ -1693,93 +1695,93 @@
 msgstr "HTML-Editorin polkua ei ole asetettu\n"
 " ToolBox/Plugins/LogbookKonni/Asetukset"
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Tallenna CrewList"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Piilota laitteet"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Tallenna vene"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Tallenna huolto"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Tallenna korjaukset tiedosto"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Tallenna Ostavaraosat tiedosto"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Tallenna yhteenveto tidosto"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Suodata asettelu"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Nimeä asettelu uudelleen"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Poista asettelu"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Lähetä asettelu sähkopostilla"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Asenna yksi asettelu"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Ensimmäinen/viimeinen merkintä"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Tiedosto"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Lisää kohde"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Poista kohde"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Kohteen nimeäminen uudelleen"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Lisää puumuotoinen esitys"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Poista puumuotoinen esitys"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Teksti"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Tekstiblokki"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1805,17 +1807,17 @@
 "Käytä vedä ja pudota tapa siirtäessäsi kohteita menuun ja pois\n\n"
 "katso seuraavista puumuodoista lisäohjeita"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "Yksikön nimi näytetään seuraavan rivin oikeaklikkaus-valikosta \n"
 "Klikkaamalla tekstiä sisäistyksessä\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Tekstejä klikkaaoikealla Menuun"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1823,11 +1825,11 @@
 "Kone seis\n\n"
 "Demo - Oikeaklikkausmenu 'käytä Testextblocks' saadaksesi apua"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Demo purjeet ylhäällä"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1839,76 +1841,76 @@
 "Klikkaa OK nappia\n\n"
 "Käytä vedä ja pudota jos sijoitatyksityiskohdan valikkoon"
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "Tekstejä käytettään vain tässä valintaikkunassa"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Moottori pysäytetty\n\n"
 "Demo -Klikkaa oikealla Menua \"Käytä tekstiblokkia\" avun saamiseksi"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Demo moottori pysäytetty"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Uusi solmu%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Uusi yksityiskohta%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Tavallinen ajastin"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr "Koko tunnin ajastin"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "Jokainen"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "+ Minuuttia"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Tyhjennä kaikki"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Yksittäinen ajastin"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr "Tunti"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minuuttia"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr "AM/PM"
 
@@ -1924,18 +1926,16 @@
 msgid "Individual"
 msgstr "Yksilö"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "kuukausi"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Päivä"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "vuosi"
 
@@ -1979,49 +1979,73 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "Jokainen 15 astetta on +/-1 tunti"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Näytä lokikirja kuvake"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr "Näytä sijainti muodossa"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Näytä Työkaluvihjeet"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "Sisämoottorien moottoriien nro;t"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Purje viestit"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr "StatusBar sivun alareunassa"
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr "Jos  StatusBar ei ole valittu, se sijoitetaan  Navigointi/Meteo/Moottori-Sails painikkeiden yläpuolelle"
+
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr "Generaattori aluksella"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr "Tarkista, onko generaattori aluksella. \n"
 "Jos valitsematta, niin  generaattori sarakkeita ei näytetä lokikirjassa"
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr "Näytä Min| Avg| Max tuulen nopeudet"
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr "Jos valittuna TWS ja AWS näyttää Min| AVG| Max tuulennopeudet"
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Purje viestit"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Kirjoita varoitus \"Ei GPS:ää\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2029,45 +2053,41 @@
 "Jos GPS on epäkunnossa, poista niin\n"
 "estät viestin toistumisen."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr "Kirjoita viesti \"Moottori käynnissä\" "
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Kun Moottori Käynnistetään lasketaan aina kaikki purjeet"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Tuulen suunta asetettu:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "Oletus"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "oletus = suhteessa veneeseen\n"
 "Kulkusuunta = tosi tuulensuunta"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Kun Moottori Käynnistetään lasketaan aina kaikki purjeet"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr "StatusBar sivun alareunassa"
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr "Jos  StatusBar ei ole valittu, se sijoitetaan  Navigointi/Meteo/Moottori-Sails painikkeiden yläpuolelle"
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Kirjoittaa tämän tekstin lokikirjaan kun tapahtuma sattuu, muuttaa tekstejä halutusti"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2077,41 +2097,41 @@
 " klikkaamalla pallukkaa\n"
 "Muuta tätä tekstiä asetuksissa"
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "Automaattinen rivi\n"
 " reittipiste saavutettu:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Kurssimuutoksia"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Näytä lokikirja tapahtuman sattuessa"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Asenna näyttöasetelmia"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Poista lokikirja"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Asenna"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Asenna OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Poista asennus"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2125,248 +2145,244 @@
 "kaikki Lokikirjan kielet\n"
 "puhdistetaan OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Käyttäytyminen"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Käytetty vain, kun annat 1/2, 1/4... yhteensä-kentässä tai lasket watermakerin arvoja\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Säiliö"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Aseta gal/liter lyhenteet "
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Akku"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Kapasiteetti"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr "Asteita"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "sekunnit"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Nopeus"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Näytä syvyys muodossa"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Metri"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Jalat"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Syli"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Näytä aalto/maininki"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Tosi"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magneettinen"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr "fm"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Tuulen nopeus"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Lämpötila"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Polttoainetta/vettä"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Moottorin tunnit"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr "Ampeeri"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Moottori"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr "Potkuriakseli"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr "S"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Kierrokset"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr "RPM"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "päivä(t)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "viikko(ja)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Viikon (s)"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "kuukausi "
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Jos GPS pois käytöstä manuaalisessa määrityksessä"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Tuulen nopeus "
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr " Suunta "
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Suhteellinen"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Lyhenteet"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Polku ODT-Editorille"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "Jos käytät MS-Wordia liitä %s näin:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\"%s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Datamanager polku"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Polku MailClient"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Polku HTML-Editor\n"
 "(optional)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Nollaa polut"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Polut"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Näytä"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Aseta viivanleveys"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Aseta läpinäkyvyys"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr "Läpinäkyvä"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr "kiinteä"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Asettaa reitin viivaväri"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "valkoinen"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "musta"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "punainen"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "keltainen"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Aseta jäljen viivan väri"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr "Rastita yksi alla olevista valintaneliöistä, jos haluat käyttää ERRPM lausetta (Katso Ohje)"
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "Tarkista"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2374,115 +2390,115 @@
 "Sinun pitäisi nähdä ERRPM lauseke\n"
 "painikkeen vasemmalla puolella"
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "Moottorin nro vastaa moottorin #1 sarakkeessa"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr "Valitse tämä valintaruutu, jos NMEA virta sisältää RPM lauseita tälle moottorille\n"
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "Moottorin nro vastaa moottorin #2 sarakkeessa"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr "Moottorin nro vastaa sarakkeen generaattoria"
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr "Valitse tämä valintaruutu, jos NMEA virta sisältää RPM lauseita tälle moottorille\n"
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "ERRPM lauseen avulla lasket moottorin käyttötunnit"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Käytä WIMDA lausetta sääasemasta"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Barometri, ilman lämpötila ja ilmankosteus"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr "Valintaruutu tilaa >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr "Käyttökelpoinen Tablet-PC:lle"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr "Lyhenteet on esitetty purjeet valintaruuduissa\n"
 "Nimeä käytetään sarakkeessa \"Purjeet\", kun lisätään uusi merkintä"
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<< Takaisin"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr "Palaa purjenimiin"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Rivi +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Rivi-"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Sarake +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Sarake -"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Sekalaista"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr "Generaattori on edelleen käynnissä .\n\n"
 "Generatori pysäytetään nyt."
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "Moottorin #1 on käynnissä manuaalisesti.\n\n"
 "Moottori on pysäytetty nyt."
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "Moottorin #2 on käynnissä manuaalisesti.\n\n"
 "Moottori on pysäytetty nyt."
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr "Generaattori on käynnissä manuaalisesti.\n\n"
 "Generaattori on pysäytetty nyt."
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr "Maasi on 24 tunnin muodossa. \n"
 "Tässä tapauksessa OS ei käytä AM/PM-muotoja.\n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
@@ -2491,103 +2507,102 @@
 "%s%s%s%s%s\n\n"
 "Käytä eri päivämäärämuotoa kaikkissa kolmessa valintalokerossa."
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Täytä yksi merkki asteteisiin, minuutteihin ja sekunteihin"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr "Moottorin #2 on käynnissä.\n\n"
 "Moottori #2 on pysäytetty nyt."
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Aseta polku HTML-editori"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Aseta polku DataManagerille"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Asetettu polku MailClient"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Aseta polku ODT-Editor:lle"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "lähtien"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "loppuen"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Anteeksi, ei asettelua asennettu"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Valitettavasti lokikirjassa ei ole rivejä"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "layoutfile ei löytynyt "
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Unohditko lisätä tämän rivin layouttiisi ?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Oletko unohtanut kirjoittaa otsikon [[ja]] \n"
 " tai tietoja {{ ja }}?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Reittipisteet"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr "Anna oletus vahtiaika esimerkiksi 3,30 / käytettävissä olevat muodot ovat 3,30, 3,30, 3:30, 0330 on 3 tuntia 30 minuuttia"
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr "Kun vahtiajat on asetettu / vedä ja pudota jäsenet miehistöluettelosta"
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr "* Valinnainen * Prepend * jäsenelle, jotta tämä jäsen on vakio vahti / Valitse Laske"
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr "Kaikki muutokset liityen vain tähän päivään."
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Osoite"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Valitse päivämäärä"
 
@@ -2611,8 +2626,8 @@
 msgid "Date + Months"
 msgstr "Pvm + kuukausi"
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Ei"
 
@@ -2620,16 +2635,16 @@
 msgid "Logbook until "
 msgstr "Lokikirja asti "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Lokikirja yhteensä"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i vuotta %i kk %i päivä(ä)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E viikoa %D päivää % H: %M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/fr.po opencpn-plugin-logbookkonni-1.2024/po/fr.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/fr.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/fr.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-06-04 16:22-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:03-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: fr\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Livre de bord"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Le(s) moteur(s) sont démarré(s)\n\n"
 "Faut-il arrêter le(s) moteur(s) ?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "de"
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Complément"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Livre de bord actif"
 
@@ -58,15 +58,15 @@
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Des vidéos d'aide sont sur Youtube, cherchez LogbookKonni."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Préférences de LogBook"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Sélectionner le fichier (zip) de mise en page"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -79,144 +79,144 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr "GV"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Tr"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr "Ji"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr "Ar"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr "Arl"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "Tri"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Spi"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Grand-voile"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Genois"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genois avec 1 tour/ris"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genois avec 2 tours/ris"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genois avec 3 tours/ris"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Foc 1 ris"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Foc 2 ris"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Foc 3 ris"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Foc"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Artimon"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr "Artimon lourd"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Trinquette"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Spi"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Vous pouvez modifier les abréviations et le nom des voiles\n"
 "dans Options/Divers/Voiles"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "Ajouter automatiquement une ligne \n"
 "à l'arrivée d'un waypoint"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "Ajouter automatiquement une ligne \n"
 "lors d'un changement de quart"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "Ajouter automatiquement une ligne \n"
 "lors d'un changement de COG > à"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "Ajouter automatiquement une ligne \n"
 "si la Distance parcourue est > à "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -226,88 +226,87 @@
 "ou changer ce choix dans la \"Boite à outils\" d'OpenCPN, onglet \"Compléments\" puis \"Livre de bord\"\n\n"
 "Shift+Entre ouvre une nouvelle ligne"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "Kts"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "ft"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "fth"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "Hp"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "C"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "Gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "h"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "jour(s)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "semaine(s)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "mois"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Information"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Rappeler"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Chercher dans le livre de bord ..."
 
@@ -318,47 +317,47 @@
 msgstr "Votre livre de bord a %i lignes \n\n"
 "Vous devriez créer un nouveau livre de bord pour réduire le temps de chargement"
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr " OFF"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr " ON"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Etes vous certain  ?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Nouveau\n"
 "livre de bord"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Réinitialiser toutes les valeurs à zéro ?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Votre livre de bord ne contient aucune ligne"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Dernière ligne du livre de bord\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Le dernier livre de bord est\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Ancien livre de bord depuis %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -367,138 +366,138 @@
 "et sauvegarder toutes les donées de la version 1.1 vers\n\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr "Votre livre de bord a %i lignes\n\n"
 "\t\t\tVous devriez en créer un nouveau pour minimiser le temps de chargement."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "(Route sans nom)"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** HOMME A LA MER ***\n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Trace"
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Démarrage Moteur #1"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Moteur #1 en marche"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Arrêt du Moteur #1"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Démarrage Moteur #2"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Moteur #2 en marche"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Moteur #2 en marche"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Arrêt du Moteur #2"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Arrêt du Moteur #2"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr "Générateur démarré"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr "Générateur  en marche"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr "\n"
 "Générateur en marche"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr "Générateur arrêté"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr "\n"
 "Générateur à  l’arrêt"
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Voile utilisée\n"
 "principalement"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Si la montre a changé"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Voiles"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Supprimer la ligne n° %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Confirmez"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Veuillez entrer la date au format :\n"
 "    %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Veuillez entrer la date au format :\n"
 "   %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Veuillez entrer 0544512.15n0301205.15e pour\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Veuillez entrer 05445.1234n03012.0504e pour\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Supérieur à 59 minutes"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
@@ -506,19 +505,19 @@
 "mais le GPS ne renvoie aucune information.\n"
 "Le vent est maintenant defini en \"vent apparent\" \n\n"
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Pas de signal GPS"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Nom du prochain WP :"
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Dernier waypoint de la route"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -527,74 +526,73 @@
 "Nom du waypoint : %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Waypoint évité"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Waypoint d'arrivé"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr "Il n'est pas permis d'entrer des données dans un ancien livre de bord.\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN retourne au livre de bord en cours"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Cherchez dans"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Livre de bord actuel"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Tous les livres de bord"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Chaine cherchée"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "Dans la colonne"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Date"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Sélectionner une date"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Sélectionner une route"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Sélectionner\n"
 "le livre de bord"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Blocs de texte"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Choisir l'intervalle de temps"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Position"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Ajouter\n"
 "une ligne"
@@ -603,10 +601,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Ajouter une ligne à la fin du livre de bord"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Exporter"
 
@@ -616,74 +613,68 @@
 msgstr "Exporter votre logbook au format:\n"
 "HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr "Afficher la mise en page sélectionnée"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Sélectionner la\n"
 "mise en page :"
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Sélectionner une mise en page à afficher\n"
 "avec le bouton \"Voir\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "R\n"
 " "
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Recharger les mises en page"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "E\n"
 " "
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Editer la mise en page"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "Editeur"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Voir"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Voir les données dans le navigateur (Html) ou OpenOffice/LibreOffice (Odt)"
 
@@ -711,32 +702,32 @@
 msgid "Help"
 msgstr "Aide"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Paramétrer la minuterie"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Définir un interval pour la minuterie"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Minuterie"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Quart"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Waypoint"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Distance"
 
@@ -746,7 +737,7 @@
 msgstr "Définir une distance en MN\n"
 "pour un meilleur suivi"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "COG"
 
@@ -766,8 +757,8 @@
 "supérieur à 0\n"
 "pour trouver le vent vrai"
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "Stop"
 
@@ -775,931 +766,942 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Suspendre/Reprendre les évenements"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Route"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Heure"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr "Statut"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Distance totale"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG\n"
 "Rte fond"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Cap\n"
 "compas"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "SOG\n"
 "Vit. fond"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "STW\n"
 "Vit. eau"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Profondeur"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Remarque"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Supprimer la ligne"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Montrer les colonnes cachées"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Cacher la colonne"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Fermer le livre de bord"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Supprimer les lignes"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Permuter Jour<->Mois"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navigation"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Baromètre"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Hygromètre"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Air"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Eau"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr "TWA"
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
-msgstr "TWS"
-
 #: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr "TWS\n"
+"Min | Moy | Max"
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr "AWA"
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr "AWS\n"
+"Min | Moy | Max"
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr "TWS"
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr "AWS"
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Courant"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Vitesse\n"
 "du courant"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Vague"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Houle"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Temps"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Nuages"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Météo"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Moteur1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "Total 1"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Moteur2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "Total 2"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Carburant"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Carburant\n"
 "total"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Voiles"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Nombre\n"
 "de ris"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Alternateur"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Gen. total"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Batterie 1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "Amp./H Total 1"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr "Batterie 2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "Amp./H Total 2"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Production d'eau par heure"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "Capacité d'eau"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr "Conso.\n"
 "eau"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Total\n"
 "eau"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Route ID"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr "Trace ID"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Moteur/Voile"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "Exporter l'aperçu de vos données en Html ou Odt."
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Sélectionner un des anciens livres de bord"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Début"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Fin"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Durée\n"
 "totale"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Distance\n"
 "quotidienne"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Meilleure distance\n"
 "quotidienne"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Vitesse\n"
 "moy. fond"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Vitesse\n"
 "maximale"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Batterie #1 gen."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Batterie #1 utilisé"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Batterie #2 gen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "batterie #2 utilisé"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr "Eau produite"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Eau utilisée"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr "TWA Avg."
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr "TWS Avg."
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr "TWS Max."
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Direction moy.\n"
 "du courant."
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Courant\n"
 "moyen"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Courant\n"
 "maximal"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Vague\n"
 "moyenne"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Vague la\n"
 "plus haute"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Houle\n"
 "moyenne"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Houle\n"
 "la plus haute"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Voile utilisée\n"
 "principalement"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Chemin"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Faire route"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Aperçu"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Ajouter un\n"
 "membre d'équipage"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Ajouter un nouveau membre d'équipage"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "Exporter les données relatives à l'équipage\n"
 "au format : HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Copier vers le quart"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Nom complet"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Prénom uniquement"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Nom uniquement"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "A bord"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Nom"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Nom de\n"
 "jeune fille"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Prénom"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Titre"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Date de\n"
 "naissance"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Lieu de\n"
 "naissance"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nationalité"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Numéro du\n"
 "passeport"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Fait à"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Date\n"
 "d'émission"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Code\n"
 "postal"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Pays"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Ville"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Rue"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Montrer seulement les membres à bord"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Montrer toutes les entrées"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Tri croissant"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Tri décroissant"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Paramétrer les quarts"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Date de début de navigation"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Heure de début de navigation"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Jours"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Durée de votre navigation"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Calculer"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Calculer les quarts avec les équipiers figurant dans les lignes"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Effacer"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Effacer les données pour éditer les niveaux"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Effacer tout"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Effacer tout"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Jour précédent"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Maintenant"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Aller au jour et heure actuel"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Jour suivant"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Jour :"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Montrer/Définir la date de début\n"
 "des données à afficher dans votre editeur/navigateur à la fin"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Afficher"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "Tous"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "Ce jour"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "Utilser dans l'Editeur/Navigateur Web\n"
 "Une ligne par jour + jour sélectionné = Jours à afficher"
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "1. Quart"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Durée\n"
 "du quart :"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Equipier"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Paramétrer en tant que Quart"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Séparer les quarts"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Fusionner les quarts"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Permuter 2 quarts"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Supprimer les équipiers"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Equipage"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Ajouter un\n"
 "équipement"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "Ajouter l'équipement du bateau"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Voir l'équipement"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Montrer/Cacher\n"
 "la grille d'équipement"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "Exporter votre bateau/Equipement\n"
 "au format : HTML, ODT,  ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Editer les mises en page"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Bateau"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Port\n"
 "d'attache"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Indicatif\n"
 "d'appel"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "N° de\n"
 "coque"
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "N° identification\n"
 "de la coque"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "N°\n"
 "de voile"
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Assurance"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Inscription"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "N° police\n"
 "d'assurance"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Nom"
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Détails"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Type"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Constructeur"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Coque"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Date de\n"
 "fabrication"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Place\n"
 "de port"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Architecte"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Fabrication"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "Longueur\n"
 "hors tout"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Longueur hors tout"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "Longueur\n"
 "de coque"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Longueur du pont"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "Longueur\n"
 "de flottaison"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Longueur de flotaison"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Largeur\n"
 "de coque"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Maitre\n"
 "bau"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Tirant\n"
 "d'eau"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Info personnelle"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "Ecrire votre  propre \"étiquette\" "
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Déplacement"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Equipement"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Description"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "N° de série"
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Ajouter une nouvelle ligne"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "Exporter vos données de service au format Html ou Odt"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Sélectionner\n"
 "la mise en page :"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Priorité"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Action à réaliser"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Si"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Valeur d'alarme"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Valeur urgente"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Valeur initiale"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Actif"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Action effectuée"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Acheter des pièces pour cette action"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Action"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Exporter vos données de réparation au format Html ou Odt"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Réparation à faire"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Réparation effectuée"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Acheter des pièces pour cette réparation"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Réparations"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "Exporter vos données d'achat de pièces au format Html ou Odt"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Catégories"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Pièces à acheter"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "A"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Maintenance"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "Rien"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr "- Minuterie par défaut - Interval :"
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr "- Format horaire complet"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr "- Minuterie personnalisée"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr "Aucun evenement\n"
 "Cliquez sur une ou plusieurs bulles pour démarrer"
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Evenement(s) suspendu(s)\n"
 "Cliquer sur le bouton pour redémarrer tous les évenements"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Evenement(s) actif(s)\n"
 "Cliquer sur le bouton ou la bulle pour suspendre ou stoper"
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
@@ -1707,32 +1709,32 @@
 "Rouge = Evenement stopé\n"
 "Jaune  = Evenement en pause. Redémarrer l'évenement avec le bouton Démarrer"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Ouvrir le document (*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr "Afficher les moteurs/Voiles"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "Trace"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Sélectionner une trace"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr "Guid"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "Utiliser les blocs de texte ..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Sauvegarder le livre de bord"
 
@@ -1748,93 +1750,93 @@
 msgstr "Pas de chemin vers l'éditeur HTML\n"
 "dans \"Boite à outils/Compléments/LogbookKonni/Préférences\""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Sauver la liste d'équipage"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Voir les caractéristiques"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Sauver le fichier du bateau"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Sauver le fichier de service"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Sauver le fichier des réparations"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Sauver le fichier des achats de pièces détachées"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Sauver le fichier aperçu"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Trier les mises en page par "
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Renommer les mises en page"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Supprimer la mise en page"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Envoyer la mise en page par mail ?"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Installer une mise en page unique"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Première/dernière entrée"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Fichier"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Ajouter un item"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Supprimer un item"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Renommer l'item"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Ajouter un noeud d'arbre"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Supprimer un noeud d'arbre"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Texte"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Blocs de texte"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1860,17 +1862,17 @@
 "Utilisez \"Glisser déposer\" pour déplacer un item hors ou dans le menu\n\n"
 "Regardez le noeud suivant pour plus d'aide."
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "Le nom de l'item est montré dans le menu contextuel de la colonne suivante\n"
 "en cliquant dans le texte, le texte est inséré\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Texte du menu contextuel"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1878,11 +1880,11 @@
 "Moteur arrté\n\n"
 "Démonstration - Clic droit sur le menu -  Rightclick-Menu Utilisez \"Bloc de texte\"."
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Démonstartion voiles hautes"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1892,76 +1894,76 @@
 "Cliquez sur \"ok\"\n\n"
 "Utilisez le \"glisser déposer\" pour placer l'item dans le menu"
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "Textes en utilisant seulement le dialogue"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Moteur arrêté\n\n"
 "Démonstaration : Clic droit \"Utilisez Tester bloc de texte\" pour l'aide."
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Démonstration moteur arrêté"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Nouveau noeud%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Nouvel item%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Minuterie par défaut"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr "Evenement"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr "Format horaire complet"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "chaque"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "+ Minutes"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Effacer tout"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Minuterie personnalisée"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr "Heure"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minutes"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr "AM/PM"
 
@@ -1977,18 +1979,16 @@
 msgid "Individual"
 msgstr "Personnalisé"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Mois"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Jour"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "Année"
 
@@ -2032,49 +2032,73 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "Chaque 15 degrés +/- 1 heure"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Afficher l'icône Livre de bord"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr "Afficher la position au format"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Montrer les info-bulles"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "Nombre de moteur(s)"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Si la montre a changé"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr "Barre d'État au bas de la page"
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr "Si non coché, la barre d'État sera placé au-dessus des boutons de Navigation/Meteo/moteur-voiles"
+
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr "Générateur à bord"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr "Vérifiez si un générateur est installé bord. \n"
 "Si décoché, les colonnes générateur ne s'afficheront pas dans le journal de bord"
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr "Afficher vitesse du vent min | moy | max"
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr "Cocher pour que le TWS et l'AWS affichent la vitesse min, moyenne et max du vent"
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Si la montre a changé"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Afficher une alerte \"Pas de GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2082,45 +2106,41 @@
 "Si votre GPS est hors service, décochez\n"
 "pour prévenir des messages à répétition."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr "Ecrire le message \"Moteur en marche\" "
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Au lancement du moteur, définir toutes les voiles comme affalées"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Direction du vent fixée à :"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "par défaut"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "Par défaut = par rapport au bateau \n"
 "Cap = direction vent réel"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Au lancement du moteur, définir toutes les voiles comme affalées"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr "Barre d'État au bas de la page"
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr "Si non coché, la barre d'État sera placé au-dessus des boutons de Navigation/Meteo/moteur-voiles"
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Evenements"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Ajouter ce texte dans le livre de bord à chaque évenement."
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2129,41 +2149,41 @@
 "Vous pouvez activer/désactiver la minuterie\n"
 "ou modifier ce choix dans les options"
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "Ligne automatique\n"
 "waypoint d'arrivé :"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Changement de cap"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Livre de bord au premier plan à chaque evenement"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Installer les mises en page"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Désinstaller le complément Logbook"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Installer"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Installer les mises en page possibles (OpenCPN_Logbook_Layouts.zip)"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Désinstaller"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2177,248 +2197,244 @@
 "  Toutes les fichiers de langues associés au complément Logbook\n"
 "Et nettoyage du fichier d'initialisation d'OpenCPN : OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Comportement"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Utilisé seulement si vous entrez 1/2, 1/4 ... dans un champ, ou pour calculer le niveau d'eau\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Capacité réservoir"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Choisir Gal/litre comme abréviations"
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Batterie"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Capacité"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr "Degrés"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Secondes"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Vitesse"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Profondeur en"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Mètre"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Pieds"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Brasse"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Vague/houle en"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Vraie"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnétique"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr "fm"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Vitesse du vent"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Température"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Carburant/Eau"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Heures moteur"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr "Ampère"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Moteur"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr "Arbre d'hélice"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr "Hélice"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Révolutions"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr "RPM"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Jour(s)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Semaine(s)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Semaine(s)"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Mois"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Si le GPS est hors service, entrez les données manuellement"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Vitesse du vent"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr "Direction"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Apparent"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Abréviations"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Chemin vers l'éditeur Odt"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "Pour utiliser MS-Word, ouvrir %s comme ceci :\n"
 "\"C:\\Votre_Chemin_pour_Winword\\WINWORD.EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Chemin vers le navigateur web"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Chemin vers le logiciel clientmail"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Chemin vers l'éditeur HTML\n"
 "(Optionnel)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Supprimer les chemins"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Chemins"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Afficher"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Largeur du trait  à : "
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Définir la transparence à : "
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr "transparence"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr "solide"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Définir la couleur du trait de route à "
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "Blanc"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "Noir"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "Rouge"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "Jaune"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Définir la couleur de la trace à "
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr "Vérifier une des cases à cocher dessous, si vous voulez utiliser la trame ERRPM (voir aide)"
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "vérifier"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2426,116 +2442,116 @@
 "Vous devriez voir la trame ERRPM\n"
 "à gauche du bouton"
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "Le moteur n°. correspond à la colonne Moteur #1"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr "Cochez cette case si le flux de données NMEA contient des messages de tr/min pour ce moteur\n"
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "Le moteur n° correspond à la colonne Moteur #2"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr "Moteur-no correspond à la colonne Générateur"
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr "Cochez cette case si le flux de données NMEA contient des messages de tr/min pour ce generateur\n"
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "Utiliser la trame ERPRM, pour calculer le temps d'utilisation moteur"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Activer la reconnaissance de la trame WIMDA pour renseigner les infos météos"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Pour le baromètre, la température de l'air et l'humidité relative"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr "Zone de cases à cocher >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr "Faciliter l'utilisation pour Tablette-PC"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr "Les abréviations sont affichées dans les cases à cocher.\n"
 "L'intitulé est utilisé pour renseigner la colonne \"Voiles\" pour l'ajout d'une ligne.\n"
 "Vous pouvez modifier les abréviations et les noms des voiles."
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<<  Retour"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr "Retour au nom des cartes"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Ligne +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Ligne -"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Espace colonne +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Espace colonne -"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr "Votre générateur fonctionne toujours .\n\n"
 "Le générateur est  à présent arrêté."
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "Votre moteur #1 s'exécute en mode manuel.\n\n"
 "Moteur arrêté."
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "Votre moteur #2 fonctionne en mode manuel.\n\n"
 "Moteur arrêté."
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr "Votre générateur fonctionne en mode manuel.\n\n"
 "Générateur arrêté."
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr "Votre région utilise un format 24 heures\n"
 "Dans ce cas le systèm n'utilisera pas le texte AM/PM.\n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
@@ -2544,103 +2560,102 @@
 "%s%s%s%s%s\n\n"
 "Veuillez utiliser un format de date défini dans la liste"
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Veuillez remplir en degrés, minutes, secondes"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr "Moteur #2 toujours en marche .\n\n"
 "Stopper le moteur #2."
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Indiquer le chemin de l'éditeur HTML"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Activer le chemin du gestionnaire de données"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Activer le chemin du logiciel Clientmail"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Activer le chemin de l'éditeur Odt"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "de"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "à"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Désolé, aucune mise en page installée"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Désolé, le livre de bord ne contient aucune ligne"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "Pas trouver dans le fichier de mise en page"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Avez-vous oublié d'ajouter cette ligne dans votre mise en page ?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Avez vous oublié d'entourer l'entête avec  [[ et ]]\n"
 "ou les données avec  {{  et  }} ?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Route"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr "Durée de quart par défaut ex. 3.30 / Formats autorisés 3.30, 3,30, 3:30, 0330 pour  3 heures 30 minutes"
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr "Modifier les quarts par Glisser/Déposer des équipiers dans la liste"
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr "*Option* Préfixer un équipier avec un * pour qu'il soit figé au quart / Cliquer sur Calculer"
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr "Tous les changements relatifs à ce jour uniquement"
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Oui"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adresse"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Sélectionner une route"
 
@@ -2664,8 +2679,8 @@
 msgid "Date + Months"
 msgstr "Date + Mois"
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Non"
 
@@ -2673,16 +2688,16 @@
 msgid "Logbook until "
 msgstr "Livre de bord depuis "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Livre de bord Total"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i Année(s) %i Mois %i Jour(s)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E Semaine(s) %D Jour(s) %H:%M"
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/gl.po opencpn-plugin-logbookkonni-1.2024/po/gl.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/gl.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/gl.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:22-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Galician\n"
 "Language: gl_ES\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: gl\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -70,227 +70,226 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr ""
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr ""
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr ""
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -300,264 +299,263 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -565,10 +563,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -577,70 +574,64 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -664,32 +655,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -698,7 +689,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -714,8 +705,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -723,908 +714,917 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1638,93 +1638,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1739,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,75 +1766,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1850,18 +1850,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1905,131 +1903,151 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
-msgstr ""
-
-#: src/LogbookOptions.cpp:312
-msgid "default"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
-msgid "default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,453 +2056,448 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2508,8 +2521,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2517,16 +2530,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/hu.po opencpn-plugin-logbookkonni-1.2024/po/hu.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/hu.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/hu.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:21-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: hu\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -70,227 +70,226 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr ""
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr ""
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr ""
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -300,264 +299,263 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -565,10 +563,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -577,70 +574,64 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -664,32 +655,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -698,7 +689,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -714,8 +705,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -723,908 +714,917 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1638,93 +1638,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1739,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,75 +1766,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1850,18 +1850,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1905,131 +1903,151 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
-msgstr ""
-
-#: src/LogbookOptions.cpp:312
-msgid "default"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
-msgid "default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,453 +2056,448 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2508,8 +2521,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2517,16 +2530,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/it.po opencpn-plugin-logbookkonni-1.2024/po/it.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/it.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/it.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:21-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: it\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -70,227 +70,226 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
-msgstr ""
+msgstr "Ra"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
-msgstr ""
+msgstr "RC"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
-msgstr ""
+msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
-msgstr ""
+msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
-msgstr ""
+msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
-msgstr ""
+msgstr "Fi1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
-msgstr ""
+msgstr "Fi2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
-msgstr ""
+msgstr "Fi3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
-msgstr ""
+msgstr "Fi"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
-msgstr ""
+msgstr "Me"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
-msgstr ""
+msgstr "MC"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
-msgstr ""
+msgstr "Tr"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
-msgstr ""
+msgstr "Sp"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
-msgstr ""
+msgstr "Randa"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
-msgstr ""
+msgstr "Randa di cappa"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
-msgstr ""
+msgstr "Genova 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
-msgstr ""
+msgstr "Genova 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
-msgstr ""
+msgstr "Genova 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
-msgstr ""
+msgstr "Fiocco 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
-msgstr ""
+msgstr "Fiocco 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
-msgstr ""
+msgstr "Fiocco 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
-msgstr ""
+msgstr "Fiocco"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
-msgstr ""
+msgstr "Mezzana"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
-msgstr ""
+msgstr "Mezzana di cappa"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
-msgstr ""
+msgstr "Trinchetta"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
-msgstr ""
+msgstr "Spinnacker"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
-msgstr ""
+msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
-msgstr ""
+msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
-msgstr ""
+msgstr "kts"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
-msgstr ""
+msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
-msgstr ""
+msgstr "ft"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
-msgstr ""
+msgstr "fth"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
-msgstr ""
+msgstr "mb"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
-msgstr ""
+msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
-msgstr ""
+msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
-msgstr ""
+msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
-msgstr ""
+msgstr "gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
-msgstr ""
+msgstr "h"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
-msgstr ""
+msgstr "giorno(i)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
-msgstr ""
+msgstr "settimana (e)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
-msgstr ""
+msgstr "mese"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -300,264 +299,263 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -565,10 +563,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -577,70 +574,64 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -664,32 +655,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -698,7 +689,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -714,8 +705,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -723,908 +714,917 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
-msgstr ""
+msgstr "Vele"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1638,93 +1638,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1739,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,75 +1766,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1850,18 +1850,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1905,131 +1903,151 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
-msgstr ""
-
-#: src/LogbookOptions.cpp:312
-msgid "default"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
-msgid "default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,453 +2056,448 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Varie"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2508,8 +2521,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2517,16 +2530,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/ja.po opencpn-plugin-logbookkonni-1.2024/po/ja.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/ja.po	1970-01-01 00:00:00.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/ja.po	2016-02-25 13:06:29.000000000 +0000
@@ -0,0 +1,2545 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: opencpn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
+"Last-Translator: nohal <pavel@kalian.cz>\n"
+"Language-Team: Japanese\n"
+"Language: ja_JP\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: opencpn\n"
+"X-Crowdin-Language: ja\n"
+"X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
+
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
+msgid "Logbook"
+msgstr ""
+
+#: src/logbook_pi.cpp:185
+msgid "Your engine(s) are still running\n\n"
+"Stop engine(s) ?"
+msgstr ""
+
+#: src/logbook_pi.cpp:265
+msgid "from "
+msgstr ""
+
+#: src/logbook_pi.cpp:267
+msgid "-Plugin"
+msgstr ""
+
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
+msgid "Active Logbook"
+msgstr ""
+
+#: src/logbook_pi.cpp:681
+msgid "Logbook for OpenCPN"
+msgstr ""
+
+#: src/logbook_pi.cpp:686
+msgid "Logbook for OpenCPN\n\n"
+"Thanks to the community for their helpful suggestions.\n\n"
+"If you find a bug post it on\n"
+"http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
+"Helpful videos are at Youtube, search for LogbookKonni."
+msgstr ""
+
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
+msgid "Logbook Preferences"
+msgstr ""
+
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
+msgid "Select zipped Layout-Files"
+msgstr ""
+
+#: src/logbook_pi.cpp:1579
+#, c-format
+msgid "Layouts %sinstalled at\n\n"
+"%s\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+
+#: src/Options.cpp:61
+msgid "Ma"
+msgstr ""
+
+#: src/Options.cpp:62
+msgid "Tr"
+msgstr ""
+
+#: src/Options.cpp:63
+msgid "Ge1"
+msgstr ""
+
+#: src/Options.cpp:64
+msgid "Ge2"
+msgstr ""
+
+#: src/Options.cpp:65
+msgid "Ge3"
+msgstr ""
+
+#: src/Options.cpp:66
+msgid "Fo1"
+msgstr ""
+
+#: src/Options.cpp:67
+msgid "Fo2"
+msgstr ""
+
+#: src/Options.cpp:68
+msgid "Fo3"
+msgstr ""
+
+#: src/Options.cpp:69
+msgid "Ji"
+msgstr ""
+
+#: src/Options.cpp:70
+msgid "Mi"
+msgstr ""
+
+#: src/Options.cpp:71
+msgid "Mt"
+msgstr ""
+
+#: src/Options.cpp:72
+msgid "St"
+msgstr ""
+
+#: src/Options.cpp:73
+msgid "Sp"
+msgstr ""
+
+#: src/Options.cpp:74
+msgid "?"
+msgstr ""
+
+#: src/Options.cpp:76
+msgid "Main"
+msgstr ""
+
+#: src/Options.cpp:77
+msgid "Try"
+msgstr ""
+
+#: src/Options.cpp:78
+msgid "Genoa 1"
+msgstr ""
+
+#: src/Options.cpp:79
+msgid "Genoa 2"
+msgstr ""
+
+#: src/Options.cpp:80
+msgid "Genoa 3"
+msgstr ""
+
+#: src/Options.cpp:81
+msgid "Fock 1"
+msgstr ""
+
+#: src/Options.cpp:82
+msgid "Fock 2"
+msgstr ""
+
+#: src/Options.cpp:83
+msgid "Fock 3"
+msgstr ""
+
+#: src/Options.cpp:84
+msgid "Jib"
+msgstr ""
+
+#: src/Options.cpp:85
+msgid "Mizzen"
+msgstr ""
+
+#: src/Options.cpp:86
+msgid "Mizzen Storm"
+msgstr ""
+
+#: src/Options.cpp:87
+msgid "Staysail"
+msgstr ""
+
+#: src/Options.cpp:88
+msgid "Spinnacker"
+msgstr ""
+
+#: src/Options.cpp:89
+msgid "You can change the abreviations and the names of the sails\n"
+"in Options/Miscellaneous/Sails"
+msgstr ""
+
+#: src/Options.cpp:122
+msgid "automatic line Waypoint arrived"
+msgstr ""
+
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
+msgid "automatic line\n"
+"change of guards"
+msgstr ""
+
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
+msgid "automatic line\n"
+"change of course >"
+msgstr ""
+
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
+msgid "automatic line\n"
+"Distance > "
+msgstr ""
+
+#: src/Options.cpp:146
+msgid "Automatic line by timer\n\n"
+"You can set/unset a timer-interval\n"
+"or change this text in Toolbox/Plugins/Logbook\n\n"
+"Shift+Enter appends a new line"
+msgstr ""
+
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
+msgid "'"
+msgstr "'"
+
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
+msgid "\""
+msgstr "\""
+
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
+msgid "NM"
+msgstr ""
+
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
+msgid "kts"
+msgstr ""
+
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
+msgid "m"
+msgstr "m"
+
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
+msgid "ft"
+msgstr "ft"
+
+#: src/Options.cpp:161
+msgid "fth"
+msgstr ""
+
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
+msgid "mb"
+msgstr "mb"
+
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
+msgid "F"
+msgstr "F"
+
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
+msgid "m/s"
+msgstr "m/s"
+
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
+msgid "km/h"
+msgstr "km/h"
+
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
+msgid "gal"
+msgstr "gal"
+
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
+msgid "h"
+msgstr "h"
+
+#: src/Options.cpp:178
+msgid "day(s)"
+msgstr ""
+
+#: src/Options.cpp:179
+msgid "week(s)"
+msgstr ""
+
+#: src/Options.cpp:180
+msgid "month"
+msgstr ""
+
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
+msgid "Information"
+msgstr ""
+
+#: src/Logbook.h:257
+msgid "Reminder"
+msgstr ""
+
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
+msgid "Search in Logbook"
+msgstr ""
+
+#: src/Logbook.cpp:48
+#, c-format
+msgid "Your Logbook has %i lines\n\n"
+"You should create a new logbook to minimize loadingtime."
+msgstr ""
+
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
+msgid " off"
+msgstr " オフ"
+
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
+msgid " on"
+msgstr " オン"
+
+#: src/Logbook.cpp:766
+msgid "Are you sure ?"
+msgstr "よろしいですか？"
+
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
+msgid "New Logbook"
+msgstr ""
+
+#: src/Logbook.cpp:773
+msgid "Reset all Values to zero ?"
+msgstr ""
+
+#: src/Logbook.cpp:779
+msgid "Your Logbook has no lines ?"
+msgstr ""
+
+#: src/Logbook.cpp:827
+msgid "Last line from Logbook\n"
+msgstr ""
+
+#: src/Logbook.cpp:835
+msgid "Last Logbook is\n"
+msgstr ""
+
+#: src/Logbook.cpp:889
+#, c-format
+msgid "Old Logbook until %s"
+msgstr ""
+
+#: src/Logbook.cpp:949
+#, c-format
+msgid "Start converting to new Date/Time-Format\n"
+"and backup all datafiles from version 1.1 to\n\n"
+"%s"
+msgstr ""
+
+#: src/Logbook.cpp:1555
+#, c-format
+msgid "Your Logbook has %i lines\n\n"
+"\t\t\tYou should create a new logbook to minimize loadingtime."
+msgstr ""
+
+#: src/Logbook.cpp:1595
+msgid "unnamed Route"
+msgstr ""
+
+#: src/Logbook.cpp:1620
+msgid "*** MAN OVERBOARD ***\n"
+msgstr ""
+
+#: src/Logbook.cpp:1637
+msgid "Track "
+msgstr ""
+
+#: src/Logbook.cpp:1682
+msgid "Engine #1 started"
+msgstr ""
+
+#: src/Logbook.cpp:1686
+msgid "Engine #1 running"
+msgstr ""
+
+#: src/Logbook.cpp:1702
+msgid "Engine #1 stopped"
+msgstr ""
+
+#: src/Logbook.cpp:1707
+msgid "Engine #2 started"
+msgstr ""
+
+#: src/Logbook.cpp:1713
+msgid "Engine #2 running"
+msgstr ""
+
+#: src/Logbook.cpp:1715
+msgid "\n"
+"Engine #2 running"
+msgstr ""
+
+#: src/Logbook.cpp:1731
+msgid "Engine #2 stopped"
+msgstr ""
+
+#: src/Logbook.cpp:1733
+msgid "\n"
+"Engine #2 stopped"
+msgstr ""
+
+#: src/Logbook.cpp:1739
+msgid "Generator started"
+msgstr ""
+
+#: src/Logbook.cpp:1745
+msgid "Generator running"
+msgstr ""
+
+#: src/Logbook.cpp:1747
+msgid "\n"
+"Generator running"
+msgstr ""
+
+#: src/Logbook.cpp:1764
+msgid "Generator stopped"
+msgstr ""
+
+#: src/Logbook.cpp:1766
+msgid "\n"
+"Generator stopped"
+msgstr ""
+
+#: src/Logbook.cpp:1788
+msgid "Sails hoisted"
+msgstr ""
+
+#: src/Logbook.cpp:1792
+msgid "Sails changed"
+msgstr ""
+
+#: src/Logbook.cpp:1795
+msgid "Sails down"
+msgstr ""
+
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
+#, c-format
+msgid "Delete Row Nr. %i ?"
+msgstr ""
+
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
+msgid "Confirm"
+msgstr ""
+
+#: src/Logbook.cpp:2440
+#, c-format
+msgid "Please enter the Date in the format:\n"
+"      %s"
+msgstr ""
+
+#: src/Logbook.cpp:2462
+#, c-format
+msgid "Please enter the Time in the format:\n"
+"   %s"
+msgstr ""
+
+#: src/Logbook.cpp:2506
+msgid "Please enter 0544512.15n0301205.15e for\n"
+"054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
+msgstr ""
+
+#: src/Logbook.cpp:2511
+msgid "Please enter 05445.1234n03012.0504e for\n"
+"054Deg 45.1234Min N 030Deg 12.0504Min E"
+msgstr ""
+
+#: src/Logbook.cpp:2851
+msgid "Minutes greater than 59"
+msgstr ""
+
+#: src/Logbook.cpp:3407
+msgid "Wind is set to Heading,\n"
+"but GPS sends no Heading Data.\n"
+"Wind is set now to Relative to boat\n\n"
+msgstr ""
+
+#: src/Logbook.cpp:3447
+msgid "No GPS-Signal !"
+msgstr ""
+
+#: src/Logbook.cpp:3465
+msgid "Next WP Name: "
+msgstr ""
+
+#: src/Logbook.cpp:3469
+msgid "Last waypoint of the Route"
+msgstr ""
+
+#: src/Logbook.cpp:3473
+#, c-format
+msgid "\n"
+"Name of Waypoint: %s\n"
+"%s %s"
+msgstr ""
+
+#: src/Logbook.cpp:3476
+msgid "Waypoint skipped"
+msgstr ""
+
+#: src/Logbook.cpp:3478
+msgid "WayPoint arrived"
+msgstr ""
+
+#: src/Logbook.cpp:3513
+msgid "It's not allowed to append Data to a old Logbook\n\n"
+"\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
+msgstr ""
+
+#: src/Logbook.cpp:3588
+msgid "Search in"
+msgstr ""
+
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
+msgid "Actual Logbook"
+msgstr ""
+
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
+msgid "All Logbooks"
+msgstr ""
+
+#: src/Logbook.cpp:3608
+msgid "Searchstring"
+msgstr ""
+
+#: src/Logbook.cpp:3615
+msgid "In Column"
+msgstr ""
+
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
+msgid "Date"
+msgstr ""
+
+#: src/Logbook.cpp:3642
+msgid "Select"
+msgstr ""
+
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
+msgid "Select Route"
+msgstr ""
+
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
+msgid "Select Logbook"
+msgstr ""
+
+#: src/LogbookDialog.h:967
+msgid "Textblocks Dialog"
+msgstr ""
+
+#: src/LogbookDialog.h:1108
+msgid "Set Timer Interval"
+msgstr ""
+
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
+msgid "Position"
+msgstr ""
+
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
+msgid "Add Line"
+msgstr ""
+
+#: src/LogbookDialog.cpp:99
+msgid "add a line to the end of your logbook"
+msgstr ""
+
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
+msgid "Export"
+msgstr ""
+
+#: src/LogbookDialog.cpp:104
+msgid "export your logbook-data as:\n"
+"HTML, ODT,  ODS, XML, CSV"
+msgstr ""
+
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
+msgid "Show Layout Selection Mode"
+msgstr ""
+
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
+msgid "Select Layout: "
+msgstr ""
+
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
+msgid "Select a layout which is displayed\n"
+"with button \"View\""
+msgstr ""
+
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
+msgid "R"
+msgstr ""
+
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
+msgid "Reload Layouts"
+msgstr ""
+
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
+msgid "E"
+msgstr ""
+
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
+msgid "Edit Layout"
+msgstr ""
+
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
+msgid "HTML"
+msgstr ""
+
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
+msgid "ODT"
+msgstr ""
+
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
+msgid "View"
+msgstr ""
+
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
+msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
+msgstr ""
+
+#: src/LogbookDialog.cpp:192
+msgid "Create a new logbook\n"
+"the active logbook is saved with today's date\n"
+"and can be viewed with Button \"Select Logbook\""
+msgstr ""
+
+#: src/LogbookDialog.cpp:197
+msgid "Select a old logbook\n"
+"Everytime a new logbook is created, you'll \n"
+"find the active logbook as old logbook here"
+msgstr ""
+
+#: src/LogbookDialog.cpp:205
+msgid "Show/Hide Statusbar"
+msgstr ""
+
+#: src/LogbookDialog.cpp:210
+msgid "Help"
+msgstr ""
+
+#: src/LogbookDialog.cpp:225
+msgid "Set Timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:226
+msgid "Set the interval for the timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
+msgid "Timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
+msgid "Watch"
+msgstr ""
+
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
+msgid "Waypoint"
+msgstr ""
+
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
+msgid "Distance"
+msgstr ""
+
+#: src/LogbookDialog.cpp:283
+msgid "Set the desired distance in NM\n"
+" = (Track made good)"
+msgstr ""
+
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
+msgid "Course"
+msgstr ""
+
+#: src/LogbookDialog.cpp:301
+msgid "Set desired Degrees\n"
+"if the course changes by this amount\n"
+"a course-changed-event occurs"
+msgstr ""
+
+#: src/LogbookDialog.cpp:306
+msgid "Set desired delay in minutes\n"
+"It's a good idea to set here a value > 0\n"
+"to find the right wind."
+msgstr ""
+
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
+msgid "Stop"
+msgstr ""
+
+#: src/LogbookDialog.cpp:315
+msgid "Suspend/Resume running event/s"
+msgstr ""
+
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
+msgid "Route"
+msgstr ""
+
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
+msgid "Time"
+msgstr ""
+
+#: src/LogbookDialog.cpp:385
+msgid "Status"
+msgstr ""
+
+#: src/LogbookDialog.cpp:388
+msgid "DistanceTotal"
+msgstr ""
+
+#: src/LogbookDialog.cpp:390
+msgid "COG (T)"
+msgstr ""
+
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
+msgid "Heading"
+msgstr ""
+
+#: src/LogbookDialog.cpp:392
+msgid "SOG"
+msgstr ""
+
+#: src/LogbookDialog.cpp:393
+msgid "STW"
+msgstr ""
+
+#: src/LogbookDialog.cpp:394
+msgid "Depth"
+msgstr ""
+
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
+msgid "Remarks"
+msgstr ""
+
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
+msgid "Delete Row"
+msgstr ""
+
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
+msgid "Show hidden columns"
+msgstr ""
+
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
+msgid "Hide column"
+msgstr ""
+
+#: src/LogbookDialog.cpp:430
+msgid "Shutdown Logbook"
+msgstr ""
+
+#: src/LogbookDialog.cpp:443
+msgid "Delete Rows"
+msgstr ""
+
+#: src/LogbookDialog.cpp:447
+msgid "Flip Day<->Month"
+msgstr ""
+
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
+msgid "Navigation"
+msgstr ""
+
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
+msgid "Barometer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:484
+msgid "Hygrometer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:485
+msgid "Air"
+msgstr ""
+
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
+msgid "Water"
+msgstr ""
+
+#: src/LogbookDialog.cpp:487
+msgid "TWA"
+msgstr ""
+
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
+msgid "AWA"
+msgstr ""
+
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
+msgid "AWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:501
+msgid "Current"
+msgstr ""
+
+#: src/LogbookDialog.cpp:502
+msgid "C/Strength"
+msgstr ""
+
+#: src/LogbookDialog.cpp:503
+msgid "Wave"
+msgstr ""
+
+#: src/LogbookDialog.cpp:504
+msgid "Swell"
+msgstr ""
+
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
+msgid "Weather"
+msgstr "天候"
+
+#: src/LogbookDialog.cpp:506
+msgid "Clouds"
+msgstr ""
+
+#: src/LogbookDialog.cpp:507
+msgid "Visibility"
+msgstr ""
+
+#: src/LogbookDialog.cpp:524
+msgid "Meteo"
+msgstr ""
+
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
+msgid "Engine #1"
+msgstr ""
+
+#: src/LogbookDialog.cpp:567
+msgid "#1 Total"
+msgstr ""
+
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
+msgid "Engine #2"
+msgstr ""
+
+#: src/LogbookDialog.cpp:570
+msgid "#2 Total"
+msgstr ""
+
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
+msgid "Fuel"
+msgstr ""
+
+#: src/LogbookDialog.cpp:573
+msgid "FuelTotal"
+msgstr ""
+
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
+msgid "Sails"
+msgstr ""
+
+#: src/LogbookDialog.cpp:575
+msgid "Reef"
+msgstr ""
+
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
+msgid "Generator"
+msgstr ""
+
+#: src/LogbookDialog.cpp:577
+msgid "Gen. total"
+msgstr ""
+
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
+msgid "Bank #1"
+msgstr ""
+
+#: src/LogbookDialog.cpp:579
+msgid "AH #1 Total"
+msgstr ""
+
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
+msgid "Bank #2"
+msgstr ""
+
+#: src/LogbookDialog.cpp:581
+msgid "AH #2 Total"
+msgstr ""
+
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
+msgid "Watermaker"
+msgstr ""
+
+#: src/LogbookDialog.cpp:583
+msgid "W-Total"
+msgstr ""
+
+#: src/LogbookDialog.cpp:584
+msgid "W-Output"
+msgstr ""
+
+#: src/LogbookDialog.cpp:586
+msgid "WaterTotal"
+msgstr ""
+
+#: src/LogbookDialog.cpp:588
+msgid "RouteID"
+msgstr ""
+
+#: src/LogbookDialog.cpp:589
+msgid "TrackID"
+msgstr ""
+
+#: src/LogbookDialog.cpp:606
+msgid "Motor/Sails"
+msgstr ""
+
+#: src/LogbookDialog.cpp:645
+msgid "export your Overview-data as HTML or ODT"
+msgstr ""
+
+#: src/LogbookDialog.cpp:698
+msgid "Select one of the old logbooks"
+msgstr ""
+
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
+msgid "Start"
+msgstr ""
+
+#: src/LogbookDialog.cpp:757
+msgid "End"
+msgstr ""
+
+#: src/LogbookDialog.cpp:758
+msgid "Total Time"
+msgstr ""
+
+#: src/LogbookDialog.cpp:760
+msgid "Distance p. Day"
+msgstr ""
+
+#: src/LogbookDialog.cpp:761
+msgid "Best Dist. p. Day"
+msgstr ""
+
+#: src/LogbookDialog.cpp:762
+msgid "Speed Avg."
+msgstr ""
+
+#: src/LogbookDialog.cpp:763
+msgid "Speed Max."
+msgstr ""
+
+#: src/LogbookDialog.cpp:768
+msgid "Bank #1 gen."
+msgstr ""
+
+#: src/LogbookDialog.cpp:769
+msgid "Bank #1 used"
+msgstr ""
+
+#: src/LogbookDialog.cpp:770
+msgid "Bank #2 gen."
+msgstr ""
+
+#: src/LogbookDialog.cpp:771
+msgid "Bank #2 used"
+msgstr ""
+
+#: src/LogbookDialog.cpp:773
+msgid "Waterm. Outp"
+msgstr ""
+
+#: src/LogbookDialog.cpp:774
+msgid "Water used"
+msgstr ""
+
+#: src/LogbookDialog.cpp:775
+msgid "TWA Avg."
+msgstr ""
+
+#: src/LogbookDialog.cpp:776
+msgid "TWS Avg."
+msgstr ""
+
+#: src/LogbookDialog.cpp:777
+msgid "TWS Max."
+msgstr ""
+
+#: src/LogbookDialog.cpp:778
+msgid "Currentdirection Avg."
+msgstr ""
+
+#: src/LogbookDialog.cpp:779
+msgid "Current Avg."
+msgstr ""
+
+#: src/LogbookDialog.cpp:780
+msgid "Current Max."
+msgstr ""
+
+#: src/LogbookDialog.cpp:781
+msgid "Wave Avg."
+msgstr ""
+
+#: src/LogbookDialog.cpp:782
+msgid "Wave Max."
+msgstr ""
+
+#: src/LogbookDialog.cpp:783
+msgid "Swell Avg."
+msgstr ""
+
+#: src/LogbookDialog.cpp:784
+msgid "Swell Max."
+msgstr ""
+
+#: src/LogbookDialog.cpp:785
+msgid "Sails used mostly"
+msgstr ""
+
+#: src/LogbookDialog.cpp:786
+msgid "Path"
+msgstr ""
+
+#: src/LogbookDialog.cpp:802
+msgid "Goto Route"
+msgstr ""
+
+#: src/LogbookDialog.cpp:818
+msgid "Overview"
+msgstr ""
+
+#: src/LogbookDialog.cpp:829
+msgid "Add Crew"
+msgstr ""
+
+#: src/LogbookDialog.cpp:830
+msgid "Add a new Crewmember"
+msgstr ""
+
+#: src/LogbookDialog.cpp:835
+msgid "export your crew-data as:\n"
+"HTML, ODT,  ODS, XML, CSV"
+msgstr ""
+
+#: src/LogbookDialog.cpp:878
+msgid "Copy to watch"
+msgstr ""
+
+#: src/LogbookDialog.cpp:882
+msgid "Name in full"
+msgstr ""
+
+#: src/LogbookDialog.cpp:882
+msgid "Firstname only"
+msgstr ""
+
+#: src/LogbookDialog.cpp:882
+msgid "Lastname only"
+msgstr ""
+
+#: src/LogbookDialog.cpp:928
+msgid "Onboard"
+msgstr ""
+
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
+msgid "Name"
+msgstr ""
+
+#: src/LogbookDialog.cpp:930
+msgid "Birthname"
+msgstr ""
+
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
+msgid "Firstname"
+msgstr ""
+
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
+msgid "Title"
+msgstr ""
+
+#: src/LogbookDialog.cpp:933
+msgid "Date of Birth"
+msgstr ""
+
+#: src/LogbookDialog.cpp:934
+msgid "Place of Birth"
+msgstr ""
+
+#: src/LogbookDialog.cpp:935
+msgid "Nationality"
+msgstr ""
+
+#: src/LogbookDialog.cpp:936
+msgid "Passport-Nr"
+msgstr ""
+
+#: src/LogbookDialog.cpp:937
+msgid "Issued in"
+msgstr ""
+
+#: src/LogbookDialog.cpp:938
+msgid "Date of Issue"
+msgstr ""
+
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
+msgid "Zip"
+msgstr ""
+
+#: src/LogbookDialog.cpp:940
+msgid "Country"
+msgstr ""
+
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
+msgid "Town"
+msgstr ""
+
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
+msgid "Street"
+msgstr ""
+
+#: src/LogbookDialog.cpp:966
+msgid "Show onboard only"
+msgstr ""
+
+#: src/LogbookDialog.cpp:971
+msgid "Show all entries"
+msgstr ""
+
+#: src/LogbookDialog.cpp:977
+msgid "Sort ascending"
+msgstr ""
+
+#: src/LogbookDialog.cpp:981
+msgid "Sort descending"
+msgstr ""
+
+#: src/LogbookDialog.cpp:997
+msgid "Set Watchtimes"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1004
+msgid "Set the startdate of the sailing trip"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1010
+msgid "Set the starttime of your sailing trip"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1014
+msgid "Days"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1019
+msgid "Length of your sailing trip"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1023
+msgid "Calculate"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1024
+msgid "Calculate the watches with the members entered in the columns"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
+msgid "Reset"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1030
+msgid "Reset data to edit-level"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1034
+msgid "Clear"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1035
+msgid "Clear all data"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1044
+msgid "Day backward"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1048
+msgid "Now"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1050
+msgid "Go to date/time now"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1056
+msgid "Day forward"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1060
+msgid "Day:"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1065
+msgid "Shows/Sets the day\n"
+"Displays the data in your ODT/Browser-program from this day to end"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1069
+msgid "Display"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1073
+msgid "all"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1073
+msgid "this day"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1077
+msgid "Used for ODT/Browser-program\n"
+"One Row for the day + selected days = Days displayed"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1100
+msgid "1. Watch"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1111
+msgid "Watchtime"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1114
+msgid "Member"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1124
+msgid "Set as Watchbase"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1128
+msgid "Split Watch"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1132
+msgid "Merge Watches"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1136
+msgid "Swap two Watches"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1140
+msgid "Delete Crewmembers"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1171
+msgid "Crewlist"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1189
+msgid "Add Equipment"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1190
+msgid "add the equipment of your boat"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
+msgid "Show Equipment"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1194
+msgid "Show/Hide Equipmentgrid"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1201
+msgid "export your boat/equipment-data as:\n"
+"      HTML, ODT,  ODS, XML, CSV"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1224
+msgid "Edit Layouts"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
+msgid "Boat"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1273
+msgid "Homeport"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1280
+msgid "Callsign"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1287
+msgid "HIN-Nr."
+msgstr ""
+
+#: src/LogbookDialog.cpp:1292
+msgid "Hull Identification No."
+msgstr ""
+
+#: src/LogbookDialog.cpp:1295
+msgid "Sail-Nr."
+msgstr ""
+
+#: src/LogbookDialog.cpp:1308
+msgid "Insurance"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1315
+msgid "Registration"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1322
+msgid "Policy"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1329
+msgid "MMSI"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1340
+msgid "Owner"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1347
+msgid "Name      "
+msgstr ""
+
+#: src/LogbookDialog.cpp:1361
+msgid "Telephone"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1406
+msgid "Details"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
+msgid "Type"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1421
+msgid "Builder"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1428
+msgid "Hull"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1435
+msgid "Date Launched"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1442
+msgid "Yard-Nr."
+msgstr ""
+
+#: src/LogbookDialog.cpp:1449
+msgid "Designer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1456
+msgid "Construction"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1481
+msgid "LOA"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1486
+msgid "Length over all"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1490
+msgid "LOD"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1495
+msgid "Length over Deck"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1499
+msgid "LWL"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1504
+msgid "Length in Waterline"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1508
+msgid "Beam"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1513
+msgid "Greatest Width of Hull"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1517
+msgid "Draft"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
+msgid "UserLabel"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
+msgid "write your own label"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1549
+msgid "Displacement"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1565
+msgid "Equipment"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
+msgid "Description"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1588
+msgid "Serial-Nr."
+msgstr ""
+
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
+msgid "Add a new line"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1643
+msgid "export your Service-data as HTML or ODT"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
+msgid "Select Layout:"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
+msgid "Priority"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1712
+msgid "Service TODO"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1713
+msgid "If"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1714
+msgid "Warnvalue"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1715
+msgid "Urgentvalue"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1716
+msgid "Startvalue"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1717
+msgid "Active"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1733
+msgid "Service done"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1737
+msgid "Buy parts for this service"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
+msgid "Service"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1769
+msgid "export your Repairs-data as HTML or ODT"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1834
+msgid "RepairsTODO"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1850
+msgid "Repair done"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1854
+msgid "Buy parts for this repair"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
+msgid "Repairs"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1886
+msgid "export your BuyParts-data as HTML or ODT"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1955
+msgid "Category"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
+msgid "Buy Parts"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1959
+msgid "At"
+msgstr ""
+
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
+msgid "Maintenance"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
+msgid "none"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3634
+msgid " - Normal Timer - Interval: "
+msgstr ""
+
+#: src/LogbookDialog.cpp:3638
+msgid " - Full Hour Timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3641
+msgid " - Individual Timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3677
+msgid "no Event/s\n"
+"Click one or more bullets to start"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3678
+msgid "Event/s suspended\n"
+"Click the button to restart all events"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3679
+msgid "Event/s running\n"
+"Click the button to suspend or a bullet to stop"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3681
+msgid "green = Event is running\n"
+"red = Event is stopped\n"
+"yellow = Event is suspended. Restart event with Start-Button"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3688
+msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
+msgstr ""
+
+#: src/LogbookDialog.cpp:3820
+msgid "Show Engines/Sails Mode"
+msgstr ""
+
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
+msgid "Track"
+msgstr ""
+
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
+msgid "Select Track"
+msgstr ""
+
+#: src/LogbookDialog.cpp:4398
+msgid "GUID"
+msgstr ""
+
+#: src/LogbookDialog.cpp:4620
+msgid "use Textblocks..."
+msgstr ""
+
+#: src/LogbookDialog.cpp:4726
+msgid "Save Logbook File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:4798
+msgid "Normal Timer has 0 h 0 Min.\n\n"
+"Please change settings (Timer-Interval)"
+msgstr ""
+
+#: src/LogbookDialog.cpp:4960
+msgid "No Path set to HTML-Editor\n"
+"in ToolBox/Plugins/LogbookKonni/Preferences"
+msgstr ""
+
+#: src/LogbookDialog.cpp:5375
+msgid "Save CrewList File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:5720
+msgid "Hide Equipment"
+msgstr ""
+
+#: src/LogbookDialog.cpp:5745
+msgid "Save Boat File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:5922
+msgid "Save Service File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:6180
+msgid "Save Repairs File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:6404
+msgid "Save BuyParts File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:6632
+msgid "Save Overview File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:7358
+msgid "Filter Layout by"
+msgstr ""
+
+#: src/LogbookDialog.cpp:7369
+msgid "Rename Layout"
+msgstr ""
+
+#: src/LogbookDialog.cpp:7378
+msgid "Delete Layout"
+msgstr ""
+
+#: src/LogbookDialog.cpp:7387
+msgid "Send Layout by email"
+msgstr ""
+
+#: src/LogbookDialog.cpp:7396
+msgid "Install single Layout"
+msgstr ""
+
+#: src/LogbookDialog.cpp:7487
+msgid "First/Last Entry"
+msgstr ""
+
+#: src/LogbookDialog.cpp:7489
+msgid "File"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8096
+msgid "Add Item"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8100
+msgid "Delete Item"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8104
+msgid "Rename Item"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
+msgid "Add Treenode"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
+msgid "Delete Treenode"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8127
+msgid "Text"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8249
+msgid "Textblocks"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8250
+msgid "Help\n"
+"-----\n\n"
+"Open treenode\n"
+"  'Texts when using this Dialog only'\n"
+"  and select e.g. 'Remarks'\n\n"
+"Rightclick in TreeView for menu\n\n"
+"Add a item and rename it\n"
+"   USE UNIQUE NAMES FOR ITEMS !\n\n"
+"Insert text\n\n"
+"In 'Texts when using this Dialog only' you can insert/delete treenodes only\n\n"
+"Use Drag 'n Drop to move item from/to menu\n\n"
+"see next treenodes for more help"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8254
+msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
+"By clicking on it the text is inserted\n\n"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8262
+msgid "Texts for Rightclick-Menu"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8268
+msgid "Sails up\n"
+"Engine stopped\n\n"
+"Demo - Rightclick-Menu 'use Testextblocks' for help"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8269
+msgid "Demo Sails up"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8292
+msgid "These texts are inserted into the grid-colmn\n"
+"by calling this dialog\n\n"
+"Select Item\n"
+"Click OK-Button\n\n"
+"Use Drag 'n Drop to place a item in menu"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8293
+msgid "Texts when using this Dialog only"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8299
+msgid "Engine stopped\n\n"
+"Demo - Rightclick-Menu 'use Testextblocks' for help"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8300
+msgid "Demo Engine stopped"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8373
+#, c-format
+msgid "New Node%i"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8410
+#, c-format
+msgid "New Item%i"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8713
+msgid "Normal Timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
+msgid "Event"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8763
+msgid "Full Hour Timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8766
+msgid "every"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8797
+msgid "+ Minutes"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
+msgid "Clear all"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8836
+msgid "Individual Timer"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8859
+msgid "Hour"
+msgstr ""
+
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
+msgid "Minutes"
+msgstr ""
+
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
+msgid "PM"
+msgstr ""
+
+#: src/LogbookDialog.cpp:9245
+msgid "AM"
+msgstr ""
+
+#: src/LogbookDialog.cpp:9353
+msgid "AM/PM"
+msgstr ""
+
+#: src/LogbookOptions.cpp:70
+msgid "Date-Format:"
+msgstr ""
+
+#: src/LogbookOptions.cpp:74
+msgid "Local Format"
+msgstr ""
+
+#: src/LogbookOptions.cpp:74
+msgid "Individual"
+msgstr ""
+
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
+msgid "Month"
+msgstr ""
+
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+msgid "Day"
+msgstr ""
+
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+msgid "Year"
+msgstr ""
+
+#: src/LogbookOptions.cpp:111
+msgid "Separator"
+msgstr ""
+
+#: src/LogbookOptions.cpp:115
+msgid "."
+msgstr ""
+
+#: src/LogbookOptions.cpp:129
+msgid "Time-Format:"
+msgstr ""
+
+#: src/LogbookOptions.cpp:133
+msgid "24 Hour Format"
+msgstr ""
+
+#: src/LogbookOptions.cpp:133
+msgid "12 Hour Format"
+msgstr ""
+
+#: src/LogbookOptions.cpp:139
+msgid "No Seconds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:160
+msgid "UTC"
+msgstr ""
+
+#: src/LogbookOptions.cpp:163
+msgid "Local = UTC"
+msgstr ""
+
+#: src/LogbookOptions.cpp:190
+msgid "GPS Auto"
+msgstr ""
+
+#: src/LogbookOptions.cpp:191
+msgid "every 15 Degrees +/- 1 hour"
+msgstr ""
+
+#: src/LogbookOptions.cpp:208
+msgid "Show Logbook Icon"
+msgstr ""
+
+#: src/LogbookOptions.cpp:212
+msgid "Show Position Format"
+msgstr ""
+
+#: src/LogbookOptions.cpp:227
+msgid "Show ToolTips"
+msgstr ""
+
+#: src/LogbookOptions.cpp:231
+msgid "No. of Inboard Engines"
+msgstr ""
+
+#: src/LogbookOptions.cpp:235
+msgid "1"
+msgstr ""
+
+#: src/LogbookOptions.cpp:235
+msgid "2"
+msgstr ""
+
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
+
+#: src/LogbookOptions.cpp:250
+msgid "Generator On Board"
+msgstr ""
+
+#: src/LogbookOptions.cpp:252
+msgid "Check if there is a Generator onboard.\n"
+"If unchecked the Generator columns will not show in Logbook"
+msgstr ""
+
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
+msgid "Write warning \"No GPS\""
+msgstr ""
+
+#: src/LogbookOptions.cpp:279
+msgid "Uncheck if You have no GPS\n"
+"If GPS is out of order, uncheck to\n"
+"prevent that the message repeats."
+msgstr ""
+
+#: src/LogbookOptions.cpp:285
+msgid "Write message \"Engine running\" "
+msgstr ""
+
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr ""
+
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
+msgstr ""
+
+#: src/LogbookOptions.cpp:301
+msgid "default"
+msgstr ""
+
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
+msgstr ""
+
+#: src/LogbookOptions.cpp:314
+msgid "Events"
+msgstr ""
+
+#: src/LogbookOptions.cpp:323
+msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
+msgstr ""
+
+#: src/LogbookOptions.cpp:338
+msgid "automatic line by timer\n"
+"You can set/unset a timer\n"
+" by clicking the bullet\n"
+"Change this text in options"
+msgstr ""
+
+#: src/LogbookOptions.cpp:348
+msgid "automatic line\n"
+"Waypoint arrived:"
+msgstr ""
+
+#: src/LogbookOptions.cpp:376
+msgid "Course changes"
+msgstr ""
+
+#: src/LogbookOptions.cpp:390
+msgid "Popup logbook on event"
+msgstr ""
+
+#: src/LogbookOptions.cpp:405
+msgid "Install Layouts"
+msgstr ""
+
+#: src/LogbookOptions.cpp:409
+msgid "Uninstall Logbook"
+msgstr ""
+
+#: src/LogbookOptions.cpp:413
+msgid "Install"
+msgstr ""
+
+#: src/LogbookOptions.cpp:414
+msgid "Install OpenCPN_Logbook_Layouts.zip"
+msgstr ""
+
+#: src/LogbookOptions.cpp:418
+msgid "Uninstall"
+msgstr ""
+
+#: src/LogbookOptions.cpp:419
+msgid "Uninstalls\n"
+"Logbook-Plugin,\n"
+"all Logbook-Data,\n"
+"all Logbook-Layouts,\n"
+"all Logbook-Languages\n"
+"and cleans the OpenCPN.ini"
+msgstr ""
+
+#: src/LogbookOptions.cpp:436
+msgid "Behavior"
+msgstr ""
+
+#: src/LogbookOptions.cpp:450
+msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
+msgstr ""
+
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
+msgid "Tank"
+msgstr ""
+
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
+msgid "Set gal/liter in Abbreviations "
+msgstr ""
+
+#: src/LogbookOptions.cpp:539
+msgid "Battery"
+msgstr ""
+
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
+msgid "Capacity"
+msgstr ""
+
+#: src/LogbookOptions.cpp:603
+msgid "Degrees"
+msgstr ""
+
+#: src/LogbookOptions.cpp:621
+msgid "Seconds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:638
+msgid "Speed"
+msgstr ""
+
+#: src/LogbookOptions.cpp:648
+msgid "Show Depth in"
+msgstr ""
+
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
+msgid "Meter"
+msgstr ""
+
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
+msgid "Feet"
+msgstr ""
+
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
+msgid "Fathom"
+msgstr ""
+
+#: src/LogbookOptions.cpp:668
+msgid "Show Wave/Swell in"
+msgstr ""
+
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
+msgid "True"
+msgstr ""
+
+#: src/LogbookOptions.cpp:692
+msgid "Magnetic"
+msgstr ""
+
+#: src/LogbookOptions.cpp:702
+msgid "fm"
+msgstr ""
+
+#: src/LogbookOptions.cpp:720
+msgid "Windspeed"
+msgstr ""
+
+#: src/LogbookOptions.cpp:748
+msgid "Temperature"
+msgstr ""
+
+#: src/LogbookOptions.cpp:759
+msgid "Fuel/Water"
+msgstr ""
+
+#: src/LogbookOptions.cpp:772
+msgid "Motor Hours"
+msgstr ""
+
+#: src/LogbookOptions.cpp:779
+msgid "Ampere"
+msgstr ""
+
+#: src/LogbookOptions.cpp:787
+msgid "Engine"
+msgstr ""
+
+#: src/LogbookOptions.cpp:794
+msgid "PropShaft"
+msgstr ""
+
+#: src/LogbookOptions.cpp:798
+msgid "S"
+msgstr ""
+
+#: src/LogbookOptions.cpp:801
+msgid "Revolutions"
+msgstr ""
+
+#: src/LogbookOptions.cpp:805
+msgid "RPM"
+msgstr ""
+
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
+msgid "Day(s)"
+msgstr ""
+
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
+msgid "Week(s)"
+msgstr ""
+
+#: src/LogbookOptions.cpp:827
+msgid "Month "
+msgstr ""
+
+#: src/LogbookOptions.cpp:839
+msgid "If GPS off use for manual entry"
+msgstr ""
+
+#: src/LogbookOptions.cpp:851
+msgid "Windspeed "
+msgstr ""
+
+#: src/LogbookOptions.cpp:865
+msgid " Direction "
+msgstr ""
+
+#: src/LogbookOptions.cpp:869
+msgid "Relative"
+msgstr ""
+
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
+msgid "Abbreviations"
+msgstr ""
+
+#: src/LogbookOptions.cpp:904
+msgid "Path to ODT-Editor"
+msgstr ""
+
+#: src/LogbookOptions.cpp:909
+#, c-format
+msgid "to use MS-Word, append %s like this:\n"
+"\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
+msgstr ""
+
+#: src/LogbookOptions.cpp:916
+msgid "Path to Datamanager"
+msgstr ""
+
+#: src/LogbookOptions.cpp:930
+msgid "Path to MailClient"
+msgstr ""
+
+#: src/LogbookOptions.cpp:944
+msgid "Path to HTML-Editor\n"
+"(optional)"
+msgstr ""
+
+#: src/LogbookOptions.cpp:956
+msgid "Reset Paths"
+msgstr ""
+
+#: src/LogbookOptions.cpp:962
+msgid "Paths"
+msgstr ""
+
+#: src/LogbookOptions.cpp:992
+msgid "Show"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1013
+msgid "Set Linewidth to"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1017
+msgid "4"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1023
+msgid "Set Transparency to"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1027
+msgid "transparent"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1027
+msgid "solid"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1036
+msgid "Set Route-Linecolor to"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
+msgid "white"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
+msgid "black"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
+msgid "red"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
+msgid "yellow"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1049
+msgid "Set Track-Linecolor to"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1064
+msgid "KML"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1074
+msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1093
+msgid "Check"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1095
+msgid "Start your engine(s) and hit the button.\n"
+"You should see the ERRPM-Sentence\n"
+"left to the button"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1101
+msgid "Engine-No. corresponds with column Engine #1"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
+msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1114
+msgid "Engine-No. corresponds with column Engine #2"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1128
+msgid "Engine-No. corresponds with column Generator"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1130
+msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1143
+msgid "Use ERRPM-Sentence to calculate the engine-hours"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1152
+msgid "Use WIMDA-Sentence from the weatherstation"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1153
+msgid "For Barometer, Air Temperature and rel. Humidity"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1160
+msgid "NMEA"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1173
+msgid "Checkbox Space  >>"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1174
+msgid "Usefull for Tablet-PC's"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1178
+msgid "Abbreviations are shown in the Sails-Checkboxes\n"
+"The Name is used for the column \"Sails\" when added a new entry"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1225
+msgid "<<  Back"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1226
+msgid "Back to Sailnames"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1242
+msgid "Row +"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1245
+msgid "Row -"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1248
+msgid "Column +"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1251
+msgid "Column -"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1276
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1532
+msgid "Your Generator is still running .\n\n"
+"Generator stopped now."
+msgstr ""
+
+#: src/LogbookOptions.cpp:1648
+msgid "Your Engine #1 is running in manual mode.\n\n"
+"Engine stopped now."
+msgstr ""
+
+#: src/LogbookOptions.cpp:1673
+msgid "Your Engine #2 is running in manual mode.\n\n"
+"Engine stopped now."
+msgstr ""
+
+#: src/LogbookOptions.cpp:1698
+msgid "Your Generator is running in manual mode.\n\n"
+"Generator stopped now."
+msgstr ""
+
+#: src/LogbookOptions.cpp:1904
+msgid "Your Country has 24 Hour Format.\n"
+"In this case the OS doen't serve AM/PM-Strings.\n"
+msgstr ""
+
+#: src/LogbookOptions.cpp:1970
+#, c-format
+msgid "You cannot set this dateformat.\n\n"
+"%s%s%s%s%s\n\n"
+"Please use a different Dateformat in all three Choiceboxes."
+msgstr ""
+
+#: src/LogbookOptions.cpp:2002
+msgid "Please fill in one character in Degrees, Minutes and Seconds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:2214
+msgid "Your Engine #2 is still running .\n\n"
+"Engine #2 stopped now."
+msgstr ""
+
+#: src/LogbookOptions.cpp:2410
+msgid "Set Path to HTML-Editor"
+msgstr ""
+
+#: src/LogbookOptions.cpp:2424
+msgid "Set Path to DataManager"
+msgstr ""
+
+#: src/LogbookOptions.cpp:2438
+msgid "Set Path to MailClient"
+msgstr ""
+
+#: src/LogbookOptions.cpp:2452
+msgid "Set Path to ODT-Editor"
+msgstr ""
+
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
+msgid "from"
+msgstr ""
+
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
+msgid "to"
+msgstr ""
+
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
+msgid "Sorry, no Layout installed"
+msgstr ""
+
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
+msgid "Sorry, Logbook has no lines"
+msgstr ""
+
+#: src/LogbookHTML.cpp:677
+msgid "\n"
+"not found in layoutfile "
+msgstr ""
+
+#: src/LogbookHTML.cpp:677
+msgid "!\n\n"
+"Did you forget to add this line in your layout ?"
+msgstr ""
+
+#: src/LogbookHTML.cpp:783
+msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
+" or Data with {{ and }} ?"
+msgstr ""
+
+#: src/LogbookHTML.cpp:1317
+msgid "Routepoints"
+msgstr ""
+
+#: src/CrewList.cpp:114
+msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
+msgstr ""
+
+#: src/CrewList.cpp:115
+msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
+msgstr ""
+
+#: src/CrewList.cpp:116
+msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
+msgstr ""
+
+#: src/CrewList.cpp:117
+msgid "All changes depending to this day only."
+msgstr ""
+
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
+msgid "Yes"
+msgstr ""
+
+#: src/CrewList.cpp:2142
+msgid "Adress"
+msgstr ""
+
+#: src/Maintenance.h:148
+msgid "Select a date"
+msgstr ""
+
+#: src/Maintenance.cpp:92 src/Maintenance.cpp:93
+msgid "Engine "
+msgstr ""
+
+#: src/Maintenance.cpp:99
+msgid "Fix Date"
+msgstr ""
+
+#: src/Maintenance.cpp:100
+msgid "Date + Days"
+msgstr ""
+
+#: src/Maintenance.cpp:101
+msgid "Date + Weeks"
+msgstr ""
+
+#: src/Maintenance.cpp:102
+msgid "Date + Months"
+msgstr ""
+
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
+msgid "No"
+msgstr ""
+
+#: src/OverView.cpp:220
+msgid "Logbook until "
+msgstr ""
+
+#: src/OverView.cpp:1039
+msgid "Logbook Total"
+msgstr ""
+
+#: src/OverView.cpp:1234
+#, c-format
+msgid "%i Year(s) %i Month(s) %i Day(s)"
+msgstr ""
+
+#: src/OverView.cpp:1237
+msgid "%E Week(s) %D Day(s) %H:%M "
+msgstr ""
+
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/logbookkonni_pi.pot opencpn-plugin-logbookkonni-1.2024/po/logbookkonni_pi.pot
--- opencpn-plugin-logbookkonni-1.2018.2/po/logbookkonni_pi.pot	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/logbookkonni_pi.pot	2016-02-25 13:06:29.000000000 +0000
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the logbookkonni_pi package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: logbookkonni_pi 1.2018\n"
+"Project-Id-Version: logbookkonni_pi 1.2024\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,30 +17,30 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid ""
 "Your engine(s) are still running\n"
 "\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -60,15 +60,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid ""
 "Layouts %sinstalled at\n"
@@ -79,143 +79,143 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid ""
 "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid ""
 "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid ""
 "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid ""
 "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid ""
 "Automatic line by timer\n"
 "\n"
@@ -225,88 +225,87 @@
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr ""
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr ""
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr ""
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -318,46 +317,46 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid ""
 "Start converting to new Date/Time-Format\n"
@@ -366,7 +365,7 @@
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid ""
 "Your Logbook has %i lines\n"
@@ -374,130 +373,130 @@
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid ""
 "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid ""
 "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid ""
 "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid ""
 "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid ""
 "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid ""
 "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid ""
 "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid ""
 "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid ""
 "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
@@ -505,19 +504,19 @@
 "\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid ""
 "\n"
@@ -525,74 +524,73 @@
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid ""
 "It's not allowed to append Data to a old Logbook\n"
 "\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -600,10 +598,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -613,71 +610,65 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid ""
 "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -703,32 +694,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -738,7 +729,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -756,8 +747,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -765,918 +756,929 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid ""
+"TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid ""
+"AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid ""
 "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid ""
 "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid ""
 "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid ""
 "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid ""
 "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid ""
 "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid ""
 "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid ""
 "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid ""
 "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV "
 "Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1693,93 +1695,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid ""
 "Help\n"
 "-----\n"
@@ -1802,18 +1804,18 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid ""
 "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n"
 "\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid ""
 "Sails up\n"
 "Engine stopped\n"
@@ -1821,11 +1823,11 @@
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid ""
 "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n"
@@ -1836,77 +1838,77 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid ""
 "Engine stopped\n"
 "\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1922,18 +1924,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1977,97 +1977,118 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:245
+msgid ""
+"If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-"
+"Sails buttons"
+msgstr ""
+
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid ""
 "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid ""
+"If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid ""
 "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:312
-msgid "default"
-msgstr ""
-
-#: src/LogbookOptions.cpp:316
-msgid ""
-"default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
+#: src/LogbookOptions.cpp:305
 msgid ""
-"If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-"
-"Sails buttons"
+"default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid ""
 "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid ""
 "automatic line by timer\n"
 "You can set/unset a timer\n"
@@ -2075,41 +2096,41 @@
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid ""
 "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid ""
 "Uninstalls\n"
 "Logbook-Plugin,\n"
@@ -2119,372 +2140,368 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid ""
 "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the "
 "watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid ""
 "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid ""
 "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid ""
 "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid ""
 "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid ""
 "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid ""
 "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid ""
 "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid ""
 "Your Generator is still running .\n"
 "\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid ""
 "Your Engine #1 is running in manual mode.\n"
 "\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid ""
 "Your Engine #2 is running in manual mode.\n"
 "\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid ""
 "Your Generator is running in manual mode.\n"
 "\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid ""
 "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid ""
 "You cannot set this dateformat.\n"
@@ -2494,109 +2511,108 @@
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid ""
 "Your Engine #2 is still running .\n"
 "\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid ""
 "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid ""
 "!\n"
 "\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid ""
 "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid ""
 "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, "
 "0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid ""
 "*Optional* Prepend a * to a member to make this member static to a watch / "
 "Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2620,8 +2636,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2629,15 +2645,15 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/nb.po opencpn-plugin-logbookkonni-1.2024/po/nb.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/nb.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/nb.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-29 14:06-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:05-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: nb\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Loggbok"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Din(e) motor(er) går enda\n\n"
 "Stoppe motoren(e) ?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "fra "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Utvidelse"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Aktiv loggbok"
 
@@ -54,15 +54,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Egenskaper for loggbok"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Velg pakkede utseende-filer"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -75,143 +75,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr "Ho"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Ho"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr "Ji"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Sp"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Hoved"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Hovedseil"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genoa 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genoa 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genoa 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Fokk 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Fokk 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Fokk 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Jib"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Mesan"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr "Storm mesan"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Stagseil"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Spinnaker"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Du kan endre forkortelsene og navnet til seilene\n"
 "i Alternativer/Diverse/Seil"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "automatisk linjeveipunkt er nådd"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "automatisk linje\n"
 "endring av vakt"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "automatisk linje\n"
 "endring av kurs >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "automatisk linje\n"
 "Distanse > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -221,88 +221,87 @@
 "eller endre denne teksten i Alternativer/Utvidelser/Loggbok\n\n"
 "Skift+Enter legger til en ny linje"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "knop"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "ft"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "fa"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "mb"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/t"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "t"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "uke(r)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "måned"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Informasjon"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Søk i loggbok"
 
@@ -313,46 +312,46 @@
 msgstr "Din loggbok har %i linjer\n\n"
 "Du burde opprette en ny loggbok for å minimere lastetiden."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr " av"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr " på"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Er du sikker?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Ny loggbok"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Nullstille alle verdier til null ?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Din loggbok har ingen linjer ?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Siste linje fra loggbok\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Siste loggbok er\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Gammel loggbok til %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -361,153 +360,153 @@
 "og sikkerhetskopier alle datafiler fra versjon 1.1 til\n\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr "Din loggbok har %i linjer\n\n"
 "\t\t\tDu bør opprette en ny loggbok for å minimere lastetiden."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "navnløs rute"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** MANN OVER BORD ***\n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Slepestrek "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Motor #1 startet"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Motor #1 går"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Motor #1 stoppet"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Motor #2 startet"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Motor #2 går"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Motor #2 går"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Motor #2 stoppet"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Motor #2 stoppet"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Heist seil"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Byttet seil"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Seil låret"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Slette rad Nr. %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Vennligst skriv inn dato i dette format:\n"
 " %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Vennligst skriv inn tid i følgende format:\n"
 " %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Vennligst skriv 0544512.15n0301205.15ø for\n"
 "054Gra 45Min 12.15Sek N 030Gra 12Min 05.15Sek Ø"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Vennligst skriv 05445.1234n03012.0504ø for\n"
 "054Gra 45.1234Min N 030Gra 12.0504Min Ø"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Minutter er større enn 59"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Mangler GPS-signal!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Neste VP. navn: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Siste veipunkt i ruten"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -516,73 +515,72 @@
 "Veipunkt navn: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Hoppet over veipunkt"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Ankommet til veipunkt"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr "Det er ikke tillatt å tilføye data til en gammel loggbok\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN bytter til aktuell loggbok"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Søk i"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Aktuell loggbok"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Alle loggbøker"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Søkestreng"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "I kolonne"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Dato"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Velg"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Velg rute"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Velg loggbok"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Tekstblokk dialogboks"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Sett tidsintervall"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Posisjon"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Ny linje"
 
@@ -590,10 +588,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "tilføy en linje til slutten av din loggbok"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Eksporter"
 
@@ -603,71 +600,65 @@
 msgstr "eksporter loggbok-data som:\n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Velg utseende: "
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Velg et utseende som vises\n"
 "med knappen \"Vis\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Last utseende på nytt"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "R"
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Rediger utseende"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Vis"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Vis data i nettleser (HTML) eller OpenOffice/LibreOffice (ODT)"
 
@@ -691,32 +682,32 @@
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Sett stoppeklokke"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Sett intervall for stoppeklokke"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Tidtaker"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Vakt"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Veipunkt"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Distanse"
 
@@ -725,7 +716,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Kurs"
 
@@ -741,8 +732,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "Stopp"
 
@@ -750,910 +741,919 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Rute"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Tid"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Total distanse"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG (T)"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Kurs"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "SOG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "STW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Dybde"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Merknader"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Slett rad"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Vis skjulte kolonner"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Skjul kolonne"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Avslutt loggbok"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Slett rader"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Bytt Dag <->Måned"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Barometeret"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Hygrometer"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Luft"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Vann"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Strøm"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "S/styrke"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Bølge"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Sjøgang"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Vær"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Skydekke"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Siktbarhet"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Meteo"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "#1 totalt"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "#2 totalt"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Drivstoff"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Drivstoff totalt"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Seil"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Rev"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Generator"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Gen. totalt"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Bank #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "AH #1 totalt"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr "Bank #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "AH #2 Totalt"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Vannmaskin"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Vann totalt"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "RuteID"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr "SlepestrekID"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/seil"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Start"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Slutt"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Total tid"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Distanse p. dag"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Gjennomsnittsfart"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Maksfart"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Bank #1 gen."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Bank #1 brukes"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Bank #2 gen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Bank #2 brukes"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Forbrukt vann"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Strømretning snitt"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Strøm snitt"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Strøm maks"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Bølger snitt"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Maks Bølge"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Gj.snitt dønning"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Maks dønning"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Mest brukte seil"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Sti"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Gå til rute"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Oversikt"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Legg til mannskap"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Legg til nytt mannskapsmedlem"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "eksporter dine mannskapsdata som:\n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Kopier til vakt"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Fullt navn"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Kun fornavn"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Kun etternavn"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "Ombord"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Navn"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Fødselsnavn"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Fornavn"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Tittel"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "fødselsdato"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "fødested"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nasjonalitet"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Passnummer"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Utstedt i"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Utstedelsesdato"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Postnr"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Land"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "By"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Gate"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Vis kun ombord"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Vis alle oppføringer"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Sorter stigende"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Sorter synkende"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Angi vakttider"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Angi startdato for seilas"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Sett starttid for din seilas"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Dager"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Seilasens lengde"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Kalkuler"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Kalkuler vaktene med medlemmene i kolonnen"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Tilbakestill"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Tilbakestill data til redigeringsnivå"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Tøm"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Tøm all data"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "En dag bakover"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Nå"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Gå til dato/tid nå"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Dag fremover"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Dag:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Visning"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "alle"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "denne dag"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Vakt tid"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Sett som vakt database"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Del vakt"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Flett vakter"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Bytt to vakter"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Slett mannskaps medlemmer"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Mannskapsliste"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Legg til utstyr"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "legg til utstyret ombord i din båt"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Vis utsyr"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Vis/skjul Utstyrs-rutenett"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "eksporter din båt/utstyrsdata som:\n"
 " HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Rediger utseende"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Båt"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Hjemmehavn"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Kallesignal"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "HIN-nr."
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Skrogets ID nr."
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Seil-nr."
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Forsikring"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Registrering"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Fremgangsmåte"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Eier"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Navn      "
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Type"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Produsent"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Skrog"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Sjøsatt dato"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Verfts-nr."
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Designer"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Konstruksjon"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Største lengde"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "LOD"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Lengde over dekk"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Vannlinje lengde"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Bredde"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Største skrogbredde"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Dypgående"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Bruker-etikett"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "skriv din egen etikett"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Deplasement"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Serienummer"
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Legg til ny linje"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "eksporter dine servicedata som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Velg utseende:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prioritet"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Service for utførelse"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Hvis"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Advarselsverdi"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Hasteverdi"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Startverdi"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Service utført"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Kjøp deler til denne service"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Service"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "eksporter dine reparasjonsdata som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Planlagte reparasjoner"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparasjon utført"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Kjøp deler for denne reparasjon"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparasjoner"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "eksoprter dine KjøpDeler-data som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Kategori"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Kjøp deler"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "på"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Vedlikehold"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "ingen"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr " - Normal tid - Intervall: "
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr " - Fulltid timer"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr " - Individuelle timer"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "Slepestrek"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Velg slepestrek"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr "GUID"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Lagre loggbok"
 
@@ -1667,93 +1667,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Skjul utstyr"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Lagre båtfil"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Lagre servicefil"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Lagre reperasjonsfil"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Lagre kjøp deler fil"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Lagre oversiktfil"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Filtrer utseende etter"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Gi nytt navn til utseende"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Slett utseende oppsett"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Send utseende oppsett via epost"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Installer ett utseende"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Legg til element"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Slett element"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Døp om element"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Legg til trenode"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Slett trenode"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Tekst"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Tekstblokker"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1768,26 +1768,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1795,75 +1795,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "+ Minutter"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Tøm alt"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Individuell tidtaker"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr "Time"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minutter"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr "AM/PM"
 
@@ -1879,18 +1879,16 @@
 msgid "Individual"
 msgstr "Individuell"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Måned"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Dag"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "År"
 
@@ -1934,48 +1932,72 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "hver 15 grader +/- 1 time"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Vis loggbok ikon"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Vis verktøytips"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "Ant. innenbordsmotorer"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Seil meldinger"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Seil meldinger"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Skriv advarsel \"Ingen GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -1983,85 +2005,81 @@
 "Hvis GPS er defekt, fjern merke for\n"
 "å forhindre at meldingen gjentas."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Ved motorstart, alltid sett alle seil nede"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Vindretning satt til:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "standard"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "standard = Reltiv til båt\n"
 "Kurs = Faktisk vindretning"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Ved motorstart, alltid sett alle seil nede"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Hendelser"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Kursendringer"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Åpne loggbok ved hendelser"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Installer utseender"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Avinstaller loggbok"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Installer"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Installer OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Avinstaller"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2075,454 +2093,449 @@
 "alle loggbok-språkpakker\n"
 "og rydder i OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Oppførsel"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Tank"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Batteri"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Kapasitet"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Sekunder"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Fart"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Vis dybde i"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Meter"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Fot"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Favn"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Sann"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnetisk"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Vindhastighet"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Drivstoff/vann"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dag(er)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Uke(r)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Vindhastighet "
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr " Retning "
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Relativ"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Forkortelser"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<< Tilbake"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr "Tilbake til seilnavn"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Rad +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Rad -"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Kolonne +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Kolonne -"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "fra"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "til"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Beklager, ingen utseender installert"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Beklager, loggbok har ingen linjer"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "ikke funnet i utseendefil "
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Ja"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adresse"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Velg en dato"
 
@@ -2546,8 +2559,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Nei"
 
@@ -2555,16 +2568,16 @@
 msgid "Logbook until "
 msgstr "Loggbok til "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Loggbok totalt"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i År %i Måned(er) %i Dag(er)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E Uke(r) %D Dag(er) %H:%M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/nl.po opencpn-plugin-logbookkonni-1.2024/po/nl.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/nl.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/nl.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-06-02 20:34-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
@@ -16,35 +16,35 @@
 "X-Crowdin-Language: nl\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Journaal"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
-msgstr "Uw motor(en) draaien nog\n\n"
-"Motor(en) stoppen ?"
+msgstr "Uw motor draait nog.\n\n"
+"Motor(en) stoppen?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "van "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-PlugIn"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Actief journaal"
 
 #: src/logbook_pi.cpp:681
 msgid "Logbook for OpenCPN"
-msgstr "Journaal voor OpenCPN"
+msgstr "Journaal PlugIn voor OpenCPN"
 
 #: src/logbook_pi.cpp:686
 msgid "Logbook for OpenCPN\n\n"
@@ -52,260 +52,267 @@
 "If you find a bug post it on\n"
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Helpful videos are at Youtube, search for LogbookKonni."
-msgstr "Logboek voor OpenCPN\n\n"
-"Dank aan de gemeenschap voor hun nuttige suggesties.\n\n"
-"Indien U een bug vindt meld die dan op\n"
-"http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html \n"
-"Gebruikers video's kunnen op Youtube gevonden worden, zoek naar LogbookKonni."
+msgstr "Journaal PlugIn voor OpenCPN\n"
+"Met dank aan de gebruikersgroep voor de nuttige suggesties.\n\n"
+"Indien U een bug vindt, meld die dan via: \n"
+" http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html.\n"
+"Ondersteunende video's gemaakt door gebruikers staan op Youtube (zoek naar LogbookKonni)."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Journaalvoorkeuren"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Selecteer de opmaakbestanden (zip)"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Opmaakstijlen %sgeïnstalleerd\n\n"
+msgstr "Opmaakstijlen %sgeïnstalleerd in: \n\n"
 "%s\n"
 "%s\n"
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr "GrZ"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "StZ"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr "Fo"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr "Bz"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr "Bs"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "KoF"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Spi"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Grootzeil"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Stormzeil"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genua 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genua 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genua 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Fok 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Fok 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Fok 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Fok"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Bezaan"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
-msgstr "Bezaan stormzeil"
+msgstr "Bezaanstormzeil"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Kotterfok"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Spinnaker"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
-msgstr "U kunt de afkortingen en de namen van de zeilen\n"
-"aanpassen via Opties/Diversen/Zeilen"
+msgstr "U kunt de afkortingen en de namen van de zeilen \n"
+"\n"
+"aanpassen via Gereedschap/Opties/PlugIns/Logbook/\n"
+"\n"
+"Voorkeuren/Diversen/Zeilvoering"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "Automatische regelinvoer bij:\n"
 "Aankomst Routepunt"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "Automatische regelinvoer bij:\n"
 "Wisseling Wacht"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "Automatische regelinvoer bij:\n"
 "Koersverandering >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "Automatische regelinvoer bij:\n"
 "Afgelegde Verheid >"
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
-msgstr "Automatische regelinvoer per tijdinterval\n"
-"U kunt dit Aan en Uit zetten en de instellingen ervan aanpassen in Toolbox/Plugins/Logbook. SHIFTt+ENTER voegt een nieuwe regel toe."
+msgstr "Automatische regelinvoer per tijdinterval.\n"
+"\n"
+"U kunt dit Aan en Uit zetten en de instellingen \n"
+"\n"
+"ervan aanpassen via de knop Timerinstellingen linksonder op het Journaaltabblad.\n"
+"\n"
+"Met Shift+Enter voegt u een nieuwe regel toe."
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "knp"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "vt"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "vdm"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
-msgstr "Hp"
+msgstr "Hpa"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "C"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/u"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "ltr"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "u"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "dag(en)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "week(en)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "maand"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Informatie"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
-msgstr "Ontwerper"
+msgstr "Herinnering"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Zoek in journaal ..."
 
@@ -313,211 +320,220 @@
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "You should create a new logbook to minimize loadingtime."
-msgstr "Journaal heeft %i regels.\n\n"
+msgstr "Het journaal heeft %i regels.\n\n"
 "Maak een nieuw journaal om de laadtijd te bekorten."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr " uit"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr " aan"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Bent u hier zeker van?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Nieuw journaal"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Alle waarden instellen op nul?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Journaal bevat geen regels!"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Laatste regel in journaal\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Het voorgaande journaal is:\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Oud journaal tot %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
-msgstr "Start omzetting naar nieuw Datum/Tijd-formaat\n"
-"en backup maken van alle databestanden van versie 1.1 naar\n\n"
+msgstr "Start omzetting naar nieuwe datum/tijd-notatie\n"
+"\n"
+"en maak backup van alle databestanden van \n"
+"\n"
+"versie 1.1 naar\n"
+"\n"
+"\n"
+"\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
-msgstr "Journaal heeft %i regels.\n\n"
+msgstr "Het journaal heeft %i regels.\n\n"
 "\t\t\tMaak een nieuw journaal om de laadtijd te bekorten."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
-msgstr "Hernoem opmaakstijl"
+msgstr "Naamloze route"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
-msgstr "*** MAN overboord *** \n"
+msgstr "*** MAN OVERBOORD *** \n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Track "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Motor #1 gestart"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Motor #1 draait"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Motor #1 gestopt"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Motor #2 gestart"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Motor #2 draait"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Motor #2 draait"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Motor #2 gestopt"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Motor #2 gestopt"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr "Generator gestart"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr "Generator draait"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr "\n"
 "Generator draait"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr "Generator gestopt"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr "\n"
 "Generator gestopt"
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
-msgstr "Zeilvoering\n"
-"(meest gebruikt)"
+msgstr "Zeilen gehesen"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
-msgstr "Regel toevoegen bij wisseling van de wacht"
+msgstr "Zeilvoering gewijzigd"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
-msgstr "Zeilvoering"
+msgstr "Zeilen neergehaald"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Verwijder rij nr. %i?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
-msgstr "Accepteer"
+msgstr "Accepteren"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Voer datum in met notatie:\n"
 "    %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Voer tijd in met format:\n"
 "   %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Voer 0544512.15n0301205.15e in voor\n"
+"\n"
 "054g 45m 12.15s N\n"
+"\n"
 "030g 12m 05.15s E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Voer 05445.1234n03012.0504e in voor\n"
 "054g 45.1234m N\n"
 "030g 12.0504m E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Aantal minuten meer dan 59"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
-msgstr "Windindicatie is ingesteld op Koers,\n"
+msgstr "Windindicatie was ingesteld op Koers (Ware Wind),\n"
+"\n"
 "maar de GPS geeft geen koersinformatie.\n"
+"\n"
 "Windindicatie is nu ingesteld op Schijnbare Wind.\n\n"
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Geen GPS-signaal!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Naam volgend routepunt: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Laatste routepunt van de route"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -526,158 +542,150 @@
 "Naam routepunt: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Routepunt geschrapt"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Routepunt bereikt"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
-msgstr "Het is niet toegestaan gegevens toe te voegen aan een oud journaal\n\n"
-"\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN zal het huidige journaal blijven gebruiken"
+msgstr "Het is niet toegestaan gegevens toe te voegen aan een oud journaal\\.n\n"
+"\t\t\t\t\t OpenCPN zal het huidige journaal blijven gebruiken."
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Zoek in"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Huidig journaal"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Alle journaals"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Zoekstring"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "In kolom"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Datum"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Selecteer datum"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Selecteer route"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Selecteer journaal"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Tekstblokken dialoogvenster"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
-msgstr "- Timer Aan - Tijdinterval:"
+msgstr "Instellingen tijdinterval Timers"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Positie"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Toevoegen regel"
 
 #: src/LogbookDialog.cpp:99
 msgid "add a line to the end of your logbook"
-msgstr "Toevoegen regel aan het einde van het journaal"
+msgstr "Regel toevoegen aan het einde van het journaal"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Exporteren"
 
 #: src/LogbookDialog.cpp:104
 msgid "export your logbook-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
-msgstr "Exporteer het journaal met format:\n"
-"HTML, ODT,  ODS, XML, CSV"
+msgstr "Exporteer het journaal als\n"
+"HTML-, ODT-,  ODS-, XML- of CSV-bestand"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
-msgstr "Toon selectiemodus voor layout"
+msgstr "Toon/Selecteer opmaakstijlmodi"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Selecteer opmaakstijl: "
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Selecteer te gebruiken opmaakstijl\n"
 "met de knop \"Toon\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "H"
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Herlaad opmaakstijlen"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "A"
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Aanpassen opmaakstijl"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Toon"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Bekijk gegevens in browser (HTML) of in OpenOffice/LibreOffice (ODT)"
 
@@ -685,7 +693,7 @@
 msgid "Create a new logbook\n"
 "the active logbook is saved with today's date\n"
 "and can be viewed with Button \"Select Logbook\""
-msgstr "Maak een nieuw journaal\n"
+msgstr "Maak een nieuw journaal.\n"
 "Het actieve journaal wordt opgeslagen met de datum van vandaag\n"
 "en kan dan worden bekeken via de knop \"Selecteer journaal\"."
 
@@ -693,7 +701,7 @@
 msgid "Select a old logbook\n"
 "Everytime a new logbook is created, you'll \n"
 "find the active logbook as old logbook here"
-msgstr "Selecteer een oud journaal\n"
+msgstr "Selecteer een eerder journaal.\n"
 "Elke keer als een nieuw journaal is gemaakt,\n"
 "kunt u voorgaande journaals hier vinden."
 
@@ -705,32 +713,32 @@
 msgid "Help"
 msgstr "Help"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Timerinstellingen"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Timer-interval instellen"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Timer"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
-msgstr "Wacht"
+msgstr "Wachtsman"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
-msgstr "Routepunt geschrapt"
+msgstr "Routepunt"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Verheid"
 
@@ -740,1065 +748,1099 @@
 msgstr "Geef de gewenste verheid in NM\n"
 "(voor Track Made Good)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
-msgstr "Bewolking"
+msgstr "Koers"
 
 #: src/LogbookDialog.cpp:301
 msgid "Set desired Degrees\n"
 "if the course changes by this amount\n"
 "a course-changed-event occurs"
 msgstr "Geef het gewenste koersverschil in graden.\n"
-"Als de koers met dit aantal graden verandert,\n"
-" wordt een koersverandering-gebeurtenis aangemaakt."
+"Als de koers met dit aantal graden verandert, \n"
+"wordt een koersverandering-gebeurtenis aangemaakt."
 
 #: src/LogbookDialog.cpp:306
 msgid "Set desired delay in minutes\n"
 "It's a good idea to set here a value > 0\n"
 "to find the right wind."
 msgstr "Stel de gewenste vertraging in (in minuten).\n"
-"Gebruik een waarde > 0\n"
-"om de juiste wind te vinden."
+"Gebruik een waarde >0 om de juiste wind \n"
+"te kunnen vinden."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
-msgstr "tot"
+msgstr "Stop"
 
 #: src/LogbookDialog.cpp:315
 msgid "Suspend/Resume running event/s"
 msgstr "Stoppen/Doorgaan met uitvoeren van gebeurtenissen"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Route"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Tijd"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr "Status"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Ttl verheid"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
-msgstr "COG"
+msgstr "Grondkoers\n"
+"(W)"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Koers"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
-msgstr "Vaart over grond"
+msgstr "Vaart over\n"
+"grond"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
-msgstr "Vaart door water"
+msgstr "Vaart door\n"
+"water"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Diepte"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Opmerkingen"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Regel verwijderen"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Toon verborgen kolommen"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Kolom verbergen"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
-msgstr "Toon Logbook icoon"
+msgstr "Journaal afsluiten"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
-msgstr "Regel verwijderen"
+msgstr "Regel(s) verwijderen"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Dag en maand verwisselen"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navigatie"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Luchtdruk"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
-msgstr "Luchtvochtigheid"
+msgstr "Luchtvoch-\n"
+"tigheid"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
-msgstr "Lucht"
+msgstr "Lucht-\n"
+"temp"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
-msgstr "water"
+msgstr "Water\n"
+"(verbr óf temp)"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
-msgstr "TWA"
-
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
-msgstr "TWS"
+msgstr "Ware Wind\n"
+"richting"
 
 #: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr "WWS\n"
+"Min|Gem|Max"
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
-msgstr "AWA"
+msgstr "Schijnb. Wind\n"
+"richting"
+
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr "SWS\n"
+"Min|Gem|Max"
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr "Ware Wind\n"
+"snelheid"
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
-msgstr "AWS"
+msgstr "Schijnb. Wind\n"
+"snelheid"
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
-msgstr "Stroom"
+msgstr "Stroom-\n"
+"richting"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Stroom-\n"
 "sterkte"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
-msgstr "Golven"
+msgstr "Zee"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Deining"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Weer"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Bewolking"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Zicht"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Meteo"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
-msgstr "Ttl water"
+msgstr "#1 totaal"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
-msgstr "Ttl water"
+msgstr "#2 totaal"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Brandstof"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Ttl brandstof"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Zeilvoering"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Aantal riffen"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Generator"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
-msgstr "Totaal"
+msgstr "Ttl generator"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
-msgstr "Bank #1"
+msgstr "Batterij #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
-msgstr "AH #1 totaal"
+msgstr "Ttl Ah #1"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
-msgstr "Bank #2"
+msgstr "Batterij #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
-msgstr "AH totaal #2"
+msgstr "Ttl Ah #2"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
-msgstr "Water"
+msgstr "Watermaker"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
-msgstr "Ttl water"
+msgstr "Ttl watermaker"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
-msgstr "W-productie"
+msgstr "Water\n"
+"productie"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Ttl water"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
-msgstr "Route"
+msgstr "Route ID"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
-msgstr "TrackID"
+msgstr "Track ID"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Voortstuwing"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
-msgstr "Exporteer overzichtgegevens met format HTML of ODT."
+msgstr "Exporteer overzichtgegevens als\n"
+"HTML- of ODT-bestand"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
-msgstr "Selecteer één van de oude journaals"
+msgstr "Selecteer één van de eerdere journaals"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Start"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Einde"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Ttl tijd"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Verheid\n"
 "per dag"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Max. verheid\n"
 "per dag"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Vaart\n"
 "(gem.)"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Vaart\n"
 "(max.)"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
-msgstr "Bank #1 gen."
+msgstr "Batterij #1\n"
+"gegen."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
-msgstr "Bank #1 gebruikt"
+msgstr "Batterij #1\n"
+"verbruik"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
-msgstr "Bank #2 gen."
+msgstr "Batterij #2\n"
+"gegen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
-msgstr "Bank #2 gebruikt"
+msgstr "Batterij #2\n"
+"verbruik"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
-msgstr "Waterm.productie"
+msgstr "Water\n"
+"productie"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
-msgstr "Water"
+msgstr "Water\n"
+"verbruik"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
-msgstr "TWA Gem."
+msgstr "Ware Wind\n"
+"richt. (gem.)"
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
-msgstr "TWS Gem."
+msgstr "Ware Wind\n"
+"snelh. (gem.)"
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
-msgstr "TWS Max."
+msgstr "Ware Wind\n"
+"snelh. (max.)"
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
-msgstr "Stroom\n"
+msgstr "Stroomrichting\n"
 "(gem.)"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Stroomsterkte\n"
 "(gem.)"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Stroomsterkte\n"
 "(max.)"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Golfhoogte\n"
 "(gem.)"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Golfhoogte\n"
 "(max.)"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Deining\n"
 "(gem.)"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Deining\n"
 "(max.)"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Zeilvoering\n"
 "(meest gebruikt)"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Pad"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Ga naar route"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Overzicht"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Toevoegen\n"
 "bemanning"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Toevoegen nieuw bemanningslid"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
-msgstr "Exporteer bemanninggegevens met\n"
-"format : HTML, ODT,  ODS, XML, CSV"
+msgstr "Exporteer bemanninggegevens als\n"
+"HTML-, ODT-,  ODS-, XML- of CSV-bestand"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Kopieer naar wacht"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Volledige naam"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Voornaam"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
-msgstr "Alleen achternaam"
+msgstr "Achternaam"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "Aan boord"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Naam"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Meisjesnaam"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Voornaam"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Titel"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Geboortedatum"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Gebooorteplaats"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nationaliteit"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Paspoortnr."
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Uitgegeven in"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Datum van uitgifte"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Postcode"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Land"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Woonplaats"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Straat"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
-msgstr "Toon Logbook icoon"
+msgstr "Toon huidige opvarenden"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
-msgstr "Toon alle opmaakstijlen"
+msgstr "Toon alle invoer"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Oplopend sorteren"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Aflopend sorteren"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
-msgstr "Pas wachtinstelling toe"
+msgstr "Wachtrooster maken"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
-msgstr "Stel de startdatum van de zeilreis in."
+msgstr "Stel startdatum van reis in."
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
-msgstr "Stel de starttijd van de zeilreis in."
+msgstr "Stel starttijd van reis in."
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Dag(en)"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
-msgstr "Lengte van uw zeilreis"
+msgstr "Verwachte duur van uw reis"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
-msgstr "Bereken"
+msgstr "Berekenen"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
-msgstr "Bereken het wachtsysteem met de bemanningsleden die in de kolommen staan."
+msgstr "Bereken de wachten met de ingevoerde bemanningsleden."
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
-msgstr "voet"
+msgstr "Terugstellen"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
-msgstr "Bewerken van gegevens instellen"
+msgstr "Gegevensbewerking terugstellen"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Wissen"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Wis alle gegevens"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Dag achteruit"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
-msgstr "Nee"
+msgstr "Nu"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
-msgstr "Ga naar huidige datum/tijd"
+msgstr "Ga naar huidig tijdstip"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Dag vooruit"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
-msgstr "Dag(en)"
+msgstr "Dag:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Toont en stelt de dag in\n"
-"Toont de gegevens in uw ODT/Browser-programma vanaf deze dag tot einde"
+"Toont de gegevens in uw ODT/browser-applicatie vanaf deze dag tot einde."
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
-msgstr "Waterverplaatsing"
+msgstr "Weergave"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
-msgstr "ltr"
+msgstr "alle"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
-msgstr "vandaag"
+msgstr "deze dag"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
-msgstr "Gebruikt voor ODT/Browser-programma\n"
-"Eén rij voor de dag + geselecteerde dagen = Getoonde dagen"
+msgstr "Gebruikt voor ODT/browser-applicatie.\n"
+"1 rij voor de dag + geselecteerde dagen = getoonde dagen."
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
-msgstr "Wacht"
+msgstr "1e Wacht"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
-msgstr "Wacht"
+msgstr "Wachtduur"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
-msgstr "meter"
+msgstr "Wachtsman"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
-msgstr "Zelfde wacht als"
+msgstr "Instellen als wachtbasis"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
-msgstr "Pas wachtinstelling toe"
+msgstr "Wacht splitsen"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
-msgstr "Pas wachtinstelling toe"
+msgstr "Wachten samenvoegen"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
-msgstr "Pas wachtinstelling toe"
+msgstr "Twee wachten wisselen"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
-msgstr "Regel verwijderen"
+msgstr "Bemanningsleden verwijderen"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Bemanningslijst"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Toevoegen apparatuur"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "Voeg de apparatuur van uw vaartuig toe"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Toon apparatuur"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Toon/Verberg apparatuurgrid"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
-msgstr "Exporteer scheeps- en apparatuurgegevens\n"
-"met format : HTML, ODT,  ODS, XML, CSV"
+msgstr "Exporteer scheeps- en apparatuurgegevens als\n"
+"HTML-, ODT-,  ODS-, XML- of CSV-bestand"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Aanpassen opmaakstijlen"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Vaartuig"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Thuishaven"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Roepnaam"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "Rompnr."
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Rompnr."
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Zeilnr."
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Verzekering"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Registratie"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Polisnr."
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Naam"
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Details"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Type"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Bouwer"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Romp"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Datum te water"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Bouwnr."
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Ontwerper"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Constructie"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Lengte over alles"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "Lengte over dek"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Lengte over dek"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Lengte over waterlijn"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Breedte"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Grootste breedte\n"
 "van romp"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Diepgang"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "ExtraVeld"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "Maak eigen veldnaam"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Waterverplaatsing"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Apparatuur"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Beschrijving"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Serienr."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Toevoegen nieuwe regel"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
-msgstr "Exporteer onderhoudsgegevens met format HTML of ODT"
+msgstr "Exporteer onderhoudsgegevens als\n"
+"HTML- of ODT-bestand"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Selecteer opmaakstijl:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prio"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Uit te voeren onderhoud"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Als"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Alarmwaarde"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Urgentiewaarde"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Startwaarde"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Actief"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Onderhoud uitgevoerd"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Te kopen onderdelen voor dit onderhoud"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Onderhoud"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Exporteer reparatiegegevens met format HTML of ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Uit te voeren reparaties"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparatie uitgevoerd"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Te kopen onderdelen voor deze reparatie"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparaties"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
-msgstr "Exporteer gegevens van te kopen onderdelen met format HTML of ODT"
+msgstr "Exporteer gegevens van te kopen onderdelen als\n"
+"HTML- of ODT-bestand"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Categorie"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Te kopen onderdelen"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "Uitgevoerd op"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Onderhoud"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "niets"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
-msgstr "- Gewone Timer - Tijdinterval:"
+msgstr " - Tijdinterval Gewone Timer: "
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr " - Gehele Uren Timer"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr " - Individuele Timer"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
-msgstr "Geen gebeurtenissen/s\n"
-"Klik op één of meer bullets om te starten"
+msgstr "Geen gebeurtenissen.\n"
+"Klik op één of meer bullets om te starten."
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Gebeurtenissen zijn gepauzeerd\n"
-" Klik op de knop om deze te herstarten"
+"Klik op de knop om deze te herstarten"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Lopende gebeurtenissen\n"
-"Klik op de knop om te pauzeren of op de bullet om te stoppen"
+"Klik op de knop om te pauzeren of op een bullet om te stoppen"
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
-msgstr "groen = Gebeurtenis is gaande\n"
-"rood = Gebeurtenis is gestopt\n"
-"yellow = Gebeurtenis is opgeschort. Start gebeurtenis opnieuw met startknop."
+msgstr "groen = gebeurtenis is gaande\n"
+"rood = gebeurtenis is gestopt\n"
+"geel = gebeurtenis is opgeschort; start gebeurtenis opnieuw met startknop"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "OpenDocument SpreadSheet (*.ods) | *. ods|Excel 2003-formaat (*.xml) | *. xml|CSV-formaat OpenOffice (*.csv) | *. csv|Back-up van Journaal (*.txt) | * .txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
-msgstr "Toon Motoren/Zeilvoering"
+msgstr "Toon/Selecteer voortstuwingmodi"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "Track"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
-msgstr "Selecteer datum"
+msgstr "Selecteer track"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr "GUID"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
-msgstr "gebruik Tekstblokken ..."
+msgstr "Gebruik tekstblokken ..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Journaalbestand opslaan"
 
 #: src/LogbookDialog.cpp:4798
 msgid "Normal Timer has 0 h 0 Min.\n\n"
 "Please change settings (Timer-Interval)"
-msgstr "Timer: 0h 0m 0s\n"
-"Instellingen wijzigen in Toolbox/Plugins/Logbook/Voorkeuren/Instellingen/Timerinstellingen"
+msgstr "Interval Gewone Timer is 0h 0m 0s.\n"
+"Instelling voor timerinterval wijzigen."
 
 #: src/LogbookDialog.cpp:4960
 msgid "No Path set to HTML-Editor\n"
 "in ToolBox/Plugins/LogbookKonni/Preferences"
-msgstr "Geen pad beschikbaar naar HTML-applicatie\n"
-"in Toolbox/Plugins/Logbook/Voorkeuren/Paden"
+msgstr "Geen pad beschikbaar naar HTML-applicatie \n"
+"\n"
+"in Gereedschap/Opties/Plugins/Logbook/Voorkeuren/Paden"
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
-msgstr "Opslaan bemanningslijst-bestand"
+msgstr "Bemanningslijstbestand opslaan"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Verberg apparatuur"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
-msgstr "Opslaan vaartuigbestand"
+msgstr "Vaartuigbestand opslaan"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
-msgstr "Opslaan onderhoudbestand"
+msgstr "Onderhoudbestand opslaan"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
-msgstr "Opslaan reparatiebestand"
+msgstr "Reparatiebestand opslaan"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
-msgstr "Opslaan te_kopen_onderdelen-bestand"
+msgstr "Te kopen onderdelen-bestand opslaan"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
-msgstr "Opslaan overzichtbestand"
+msgstr "Overzichtbestand opslaan"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Filter opmaakstijl door"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Hernoem opmaakstijl"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Verwijder opmaakstijl"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
-msgstr "Verstuur opmaakstijl e-mail "
+msgstr "Verstuur opmaakstijl per e-mail "
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Installeer enkele opmaakstijl"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
-msgstr "Voornaam"
+msgstr "Eerste/Laatste invoer"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Bestand"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
-msgstr "Toevoegen\n"
-"bemanning"
+msgstr "Toevoegen item"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
-msgstr "Verwijder opmaakstijl"
+msgstr "Verwijderen item"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
-msgstr "Hernoem opmaakstijl"
+msgstr "Hernoem item"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
-msgstr "Toevoegen\n"
-"bemanning"
+msgstr "Toevoegen itemmap"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
-msgstr "Regel verwijderen"
+msgstr "Verwijderen itemmap"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Tekst"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Tekstblokken"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1811,123 +1853,155 @@
 "In 'Texts when using this Dialog only' you can insert/delete treenodes only\n\n"
 "Use Drag 'n Drop to move item from/to menu\n\n"
 "see next treenodes for more help"
-msgstr "Help\n"
-"-----\n\n"
-"Open treenode\n"
-" 'Teksten alleen bij gebruik van dit dialoogvenster'\n"
-" en selecteer bijvoorbeeld 'Opmerkingen'\n\n"
-"Rechtsklikken in TreeView voor menu\n\n"
-"Voeg een item toe en hernoem het\n"
-" GEBRUIK UNIEKE NAMEN VOOR ALLE ITEMS!\n\n"
-"Tekst invoegen\n\n"
-"In 'Teksten alleen bij gebruik van dit dialoogvenster' kunt u treenodes invoegen of verwijderen\n\n"
-"Item verslepen van of naar menu\n\n"
-"zie volgende treenodes voor meer hulp"
+msgstr "Help voor tekstblokken\n"
+"\n"
+"-------------------------------\n\n"
+"\n"
+"1. Open de boomstructuur van 'Teksten alleen voor dit dialoogvenster'.\n"
+"\n"
+"2. Selecteer daarin bijvoorbeeld 'Opmerkingen (Navigatie)'.\n"
+"\n"
+"3. Klik dan rechts voor het samenstellen van een rechtsklikmenu.\n"
+"\n"
+"4. Voeg een item toe en hernoem dit (gebruik een unieke naam voor elk item!)\n"
+"\n"
+"5. Voer tekst in voor het nieuwe item.\n\n"
+"\n"
+"6. In 'Teksten alleen via dit dialoogvenster' kunt u onderdelen aan de mappenstructuur toevoegen of eruit verwijderen.\n"
+"\n"
+"7. U kunt items verslepen naar de mappenstructuur van het rechtsklikmenu.\n"
+"\n"
+"8. Zie bij andere onderdelen van de mappenstructuur voor meer hulp."
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
-msgstr "De naam van het item wordt getoond in het rechtsklikmenu van de volgende kolommen\n"
-"Door erop te klikken wordt de tekst ingevoegd.\n\n"
+msgstr "Voor deze mappen geldt dat de naam van een voorbereid item getoond \n"
+"\n"
+"wordt in het  rechtsklikmenu van de volgende met de itemmap \n"
+"\n"
+"overeenkomende journaalkolommen:\n"
+"\n"
+" - Navigatie/Opmerkingen\n"
+"\n"
+" - Meteo/Zee\n"
+"\n"
+" - Meteo/Weer\n"
+"\n"
+" - Voortstuwing/Zeilvoering\n"
+"\n"
+" - Voortstuwing/Aantal riffen\n"
+"\n"
+" - Voorstuwing/Opmerkingen\n"
+"\n"
+"\n"
+"\n"
+"Door in een kolomcel op de betreffende tekst van het rechtsklikmenu te \n"
+"\n"
+"klikken, wordt deze ingevoerd.\n"
+"\n"
+"\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
-msgstr "Teksten voor Rechtsklikmenu"
+msgstr "Teksten voor rechtsklikmenu"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Zeilen gehesen\n"
-"Motor gestopt\n\n"
-"Demo - Rightclick-Menu 'use Testextblocks' for help"
+"Motor gestopt"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
-msgstr "Details"
+msgstr "Demo 'Zeilen gehesen'"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
 "Click OK-Button\n\n"
 "Use Drag 'n Drop to place a item in menu"
-msgstr "Deze teksten worden ingevoegd in de tabel\n"
-"door als volgt te handelen:\n\n"
-"Selecteer een item\n"
-"Klik op OK-knop\n\n"
-"Versleep het item naar een menu"
+msgstr "Voor deze mappen geldt dat de tekst van een\n"
+"item wordt ingevoegd in een geschikte\n"
+" kolomcel van het journaal door:\n"
+"\n"
+" - een item te selecteren\n"
+"\n"
+" - op de OK-knop te drukken.\n"
+"\n"
+"Vanuit deze hoofdmap kunnen itemmappen naar de hoofdmap van het rechtsklikmenu worden versleept."
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
-msgstr "Teksten bij gebruik van dit dialoogvenster alleen"
+msgstr "Teksten alleen bij gebruik dit dialoogvenster"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
-msgstr "Motor gestopt\n\n"
-"Demo - Voor hulp, rechtsklik in menu op 'gebruik Testtekstblok'"
+msgstr "Motor gestopt"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
-msgstr "Demo Motor gestopt"
+msgstr "Demo 'Motor gestopt'"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
-msgstr "Nieuw knooppunt %i"
+msgstr "Nieuwe itemmap%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
-msgstr "Nieuw Item %i"
+msgstr "Nieuw item%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
-msgstr "Normale Timer"
+msgstr "Gewone Timer"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr "Gehele Uren Timer"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
-msgstr "meter"
+msgstr "elke"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
-msgstr "Minuten:"
+msgstr "+ minuten"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
-msgstr "Selecteer datum"
+msgstr "Alles wissen"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Individuele Timer"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
-msgstr "Uur"
+msgstr "uur"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
-msgstr "Minuten:"
+msgstr "minuten"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr "AM/PM"
 
@@ -1943,24 +2017,22 @@
 msgid "Individual"
 msgstr "Individueel"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Maand"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
-msgstr "Dag(en)"
+msgstr "Dag"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "Jaar"
 
 #: src/LogbookOptions.cpp:111
 msgid "Separator"
-msgstr "Temperatuur"
+msgstr "Scheidingsteken"
 
 #: src/LogbookOptions.cpp:115
 msgid "."
@@ -1980,7 +2052,7 @@
 
 #: src/LogbookOptions.cpp:139
 msgid "No Seconds"
-msgstr "Seconden:"
+msgstr "Geen seconden"
 
 #: src/LogbookOptions.cpp:160
 msgid "UTC"
@@ -1996,51 +2068,75 @@
 
 #: src/LogbookOptions.cpp:191
 msgid "every 15 Degrees +/- 1 hour"
-msgstr "Elke 15 graden +/- 1 uur"
+msgstr "elke 15 lengtegraden +/- 1 uur"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
-msgstr "Toon Logbook icoon"
+msgstr "Toon journaalpictogram"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
-msgstr "Toon positie formaat"
+msgstr "Toon positienotatie"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Toon ToolTips"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "Aantal motoren"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
-msgstr "0"
+msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Regel toevoegen bij wisseling van de wacht"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr "Statusbalk onderaan de pagina"
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr "Indien niet aangevinkt, zal de statusbalk boven de Navigatie/Meteo/Voortstuwing-knoppen worden geplaatst."
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr "Generator aan boord"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
-msgstr "Vink indien een Generator aan boord. \n"
-"Indien niet gevinkt zullen de Generator kolommen niet in het logboek weergegeven worden"
+msgstr "Aanvinken als er een generator aan boord is.\n"
+"Indien niet aangevinkt, zullen de generatorkolommen niet in het journaal worden weergegeven."
+
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr "Toon Min| Gem| Max windsnelheden"
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr "Indien geselecteerd tonen WWS en SWS de Min|Gem|Max windsnelheden"
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Zeilberichten"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Noteer waarschuwing \"Geen GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2048,87 +2144,90 @@
 "als uw GPS niet functioneert om te voor-\n"
 "komen dat de melding zich blijft herhalen."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr "Noteer bericht \"Motor draait\" "
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Bij starten motor altijd alle zeilen 'neer' instellen"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
-msgstr "           Windrichting instellen op:"
+msgstr "     Windindicatie ingesteld op:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "standaard"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "standaard = Schijnbare Wind\n"
 "koers = Ware Wind"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Bij starten motor altijd alle zeilen 'neer' instellen"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr "StatusBalk onderaan de pagina"
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr "Indien niet-aangevinkt zal de StatusBalk boven de Navigatie/Meteo/Motor-zeilen knoppen worden geplaatst"
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
-msgstr "Neemt deze tekst in het journaal op bij een gebeurtenis; indien gewenst aanpassen"
+msgstr "Noteert deze tekst in het journaal bij een gebeurtenis; indien gewenst aanpassen"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
-msgstr "Automatische regel per tijdinterval:\n"
-"U kunt dit Aan en Uit zetten en de instellingen ervan aanpasen in Toolbox/Plugins/Logbook"
+msgstr "Automatische regelinvoer per tijdinterval:\n"
+"\n"
+"U kunt hiervoor een Timer gebruiken\n"
+"\n"
+"door op de bullet te klikken. Tekst kan\n"
+"\n"
+"aangepast worden via Gereedschap/Opties/\n"
+"\n"
+"Plugins/Logbook/Voorkeuren/Instellingen."
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
-msgstr "Automatische regelinvoer bij:\n"
-"Aankomst Routepunt"
+msgstr "Automatische regelinvoer:\n"
+"Aankomst routepunt:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
-msgstr "Bij koersverandering > (graden):"
+msgstr "Koersveranderingen"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
-msgstr "Toon logboek bij een gebeurtenis"
+msgstr "Toon journaal bij een gebeurtenis"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Installeer opmaakstijlen"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Verwijder Logbook PlugIn"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
-msgstr "Installeer"
+msgstr "Installeren"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Installeer OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Verwijderen"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2142,248 +2241,245 @@
 "  alle Logbook taalbestanden\n"
 "Opschonen van het bestand OpenCPN.ini."
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
-msgstr "Instellingen"
+msgstr "Gedrag"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Wordt alleen gebruikt als u 1/2, 1/4 ... in een totaalveld invoert, of voor watermakerberekeningen\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Tank"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
-msgstr "Gal/liter instellen in Afkortingen "
+msgstr "gal/ltr instellen in Afkortingen "
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
-msgstr "Categorie"
+msgstr "Batterij"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
-msgstr "Voorraad"
+msgstr "Capaciteit"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr "Graden"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
-msgstr "Seconden:"
+msgstr "Seconden"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Vaart"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
-msgstr "Toon dieptes in:"
+msgstr "Dieptes"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "meter"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "voet"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "vadem"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
-msgstr "Toon golfhoogtes in:"
+msgstr "Golfhoogtes"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "waar"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "magnetisch"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr "fm"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Windsnelheid"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperatuur"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Brandstof/Water"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Draaiuren motor"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr "Ampère"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr "Schroefas"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
-msgstr "Z"
+msgstr "S"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Omwentelingen"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr "Omw/min"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dag(en)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Week(en)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Week(en)"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Maand"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
-msgstr "Als de GPS niet functioneert, onderstaande velden met de hand invullen."
+msgstr "Als GPS niet werkt, onderstaande velden met de hand invullen."
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Windsnelheid"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr "Indicatie"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "relatief"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
-msgstr "Eenheden en afkortingen"
+msgstr "Afkortingen"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Pad naar tekstbewerker (ODT):"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
-msgstr "om MS-Word te gebruiken, voeg %s toe zoals in: \n"
-" \"C:\\UwPadNaarWinword\\WINWORD.EXE\"%s"
+msgstr "Om MS-Word te gebruiken, voeg %s toe zoals in:\n"
+"\n"
+"\\\"C:\\UwPadNaarWinword\\WINWORD.EXE\\\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
-msgstr "Pad naar browser applicatie:"
+msgstr "Pad naar browser-applicatie"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
-msgstr "Pad naar e-mail applicatie:"
+msgstr "Pad naar e-mail applicatie"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Pad naar HTML-appplicatie:\n"
 "(optioneel)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Oorspronkelijke paden"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Paden"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Toon"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
-msgstr "Lijndikte"
+msgstr "Stel lijndikte in op"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Stel transparantie in op"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
-msgstr "Transparant"
+msgstr "doorzichtig"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
-msgstr "Doorgetrokken"
+msgstr "ondoorzichtig"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Routekleur"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "wit"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "zwart"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "rood"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "geel"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Trackkleur"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
-msgstr "Vink een van de onderstaande selectievakjes, als u het ERRPM-bericht wilt gebruiken  (Zie help)"
+msgstr "Vink een van de onderstaande selectievakjes aan, als u het ERRPM-bericht wilt gebruiken (zie help)"
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "Controleer"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2391,115 +2487,115 @@
 "U moet de ERRPM-string\n"
 "links van de knop zien."
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "Motornr. komt overeen met kolom Motor #1"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr "Vink dit selectievakje als de NMEA-stream RPM berichten voor deze motor bevat \n"
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "Motornr. komt overeen met kolom Motor #2"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
-msgstr "Motor-nr. komt overeen met kolom Generator"
+msgstr "Motornr. komt overeen met kolom Generator"
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr "Vink dit selectievakje als de NMEA-stream RPM berichten voor deze generator bevat \n"
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "Gebruik ERRPM-string om draaiuren motor te berekenen"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Gebruik WIMDA-string van het weerstation"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Voor luchtdruk, luchttemperatuur en rel. vochtigheid"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
-msgstr "Afvinken ruimte >>"
+msgstr "Afvinkruimte >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
-msgstr "Handig voor Tablet-PC's"
+msgstr "Handig voor tablets"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr "Afkortingen staan in de zeilkeuzevelden.\n"
-"De naam wordt gebruikt in de kolom \"Zeilen\" wanneer een nieuw item wordt toegevoegd"
+"De naam wordt gebruikt in de journaalkolom \"Zeilvoering\" wanneer een nieuw item wordt toegevoegd"
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<< Terug"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr "Terug naar Zeilnamen"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Rij +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Rij -"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
-msgstr "In kolom"
+msgstr "Kolom +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "In kolom"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Diversen"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
-msgstr "Uw Generator draait nog steeds .\n\n"
+msgstr "Uw Generator draait nog.\n\n"
 "Generator nu gestopt."
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
-msgstr "Uw motor #1 draait in de handmatige mode.\n\n"
+msgstr "Motor #1 draait in de handmatige modus.\n\n"
 "Motor nu gestopt."
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
-msgstr "Uw motor #2 draait in de handmatige mode.\n\n"
+msgstr "Motor #2 draait in de handmatige modus.\n\n"
 "Motor nu gestopt."
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
-msgstr "Uw Generator draait in handmatige mode.\n\n"
+msgstr "Generator draait in handmatige modus.\n\n"
 "Generator nu gestopt."
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr "Uw land gebruikt de 24-uurs tijdnotatie. \n"
 "Het OS gebruikt dan geen AM/PM-aanduidingen.\n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
@@ -2508,105 +2604,104 @@
 "%s%s%s%s%s\n\n"
 "Gebruik een andere datumnotatie in de drie keuzevelden."
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
-msgstr "Voer graden, minuten, seconden in"
+msgstr "Voer 1 teken in voor graden, minuten en seconden"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
-msgstr "Uw motor #2 draait nog steeds .\n\n"
+msgstr "Motor #2 draait nog.\n\n"
 "Motor #2 nu gestopt."
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
-msgstr "Geef pad aan naar HTML-applicatie "
+msgstr "Geef pad aan naar HTML-applicatie"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
-msgstr "Geef pad aan naar browser applicatie"
+msgstr "Geef pad aan naar browser-applicatie"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Geef pad aan naar e-mail applicatie"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Geef pad aan naar tekstbewerker (ODT)"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "van"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "tot"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Fout: geen opmaakstijlen geïnstalleerd!"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Fout: het journaal bevat geen regel(s)!"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "niet in opmaakstijlen-bestand gevonden"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Bent u vergeten deze regel op te nemen in uw opmaakstijl?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Bent u vergeten the 'header' te omsluiten met  [[ en ]],\n"
-"of de gegevens met {{  en  }}?"
+"of de gegevens met {{ en }}?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
-msgstr "Route"
+msgstr "Routepunten"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
-msgstr "Invoeren van standaard wachtduur, zoals 3.30 / mogelijke notaties zijn 3.30, 3,30, 3:30, 0330 voor 3 uur en 30 minuten"
+msgstr "Invoeren van standaard wachtduur. Mogelijke notaties zijn 3.30, 3,30, 3:30, 0330 voor 3 uur en 30 minuten."
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
-msgstr "Wachttijden desgewenst wijzigen / Sleep bemanningsleden vanaf de bemanningslijst"
+msgstr "Wachttijden naar wens wijzigen. Sleep bemanningsleden vanaf de bemanningslijst naar wachtsmanrij."
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
-msgstr "Optioneel: voeg een * aan een bemanningslid toe om deze vast op een wacht te zetten/ klik op Bereken"
+msgstr "Optioneel: laat de naam van een wachtsman vooraf gaan door een * om deze vast op een wacht te zetten, en klik op Berekenen."
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr "Alle aanpassingen betreffen alleen deze dag."
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Ja"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adres"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
-msgstr "Selecteer route"
+msgstr "Selecteer datum"
 
 #: src/Maintenance.cpp:92 src/Maintenance.cpp:93
 msgid "Engine "
@@ -2614,7 +2709,7 @@
 
 #: src/Maintenance.cpp:99
 msgid "Fix Date"
-msgstr "Stel datum in"
+msgstr "Vaste datum"
 
 #: src/Maintenance.cpp:100
 msgid "Date + Days"
@@ -2628,8 +2723,8 @@
 msgid "Date + Months"
 msgstr "Datum + Maanden"
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Nee"
 
@@ -2637,16 +2732,16 @@
 msgid "Logbook until "
 msgstr "Journaal tot "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Totaal Journaal"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i jaar %i maanden %i dagen"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E weken %D dagen %H: %M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/pl.po opencpn-plugin-logbookkonni-1.2024/po/pl.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/pl.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/pl.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-29 14:05-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: pl\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Dziennik"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Twój silnik(i) wciąż pracują\n\n"
 "Odstawić silnik(i)?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "od"
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Wtyczka"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Aktywny Dziennik"
 
@@ -54,15 +54,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Preferencje Dziennika"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Wybierz spakowane pliki Szablonów"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -75,143 +75,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
-msgstr ""
+msgstr "Grot"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
-msgstr "Rzeczywisty"
+msgstr "Trajsel"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "do"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
-msgstr "do"
+msgstr "Spinaker"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
-msgstr ""
+msgstr "Grot"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
-msgstr ""
+msgstr "Trajsel"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genua 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genua 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genua 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Fok 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Fok 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Fok 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
-msgstr ""
+msgstr "Fok"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
-msgstr ""
+msgstr "Bezan"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
-msgstr ""
+msgstr "Bezan sztormowy"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "wpis automatyczny\n"
 "osiągnięto Waypoint"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "wpis automatyczny\n"
 "zmiana wachty"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "wpis automatyczny\n"
 "zmiana kursu >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "wpis automatyczny\n"
 "Odległość > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -221,88 +221,87 @@
 "lub zmienić ten tekst w Narzędzia/Wtyczki/Dziennik Jachtowy\n\n"
 "Shift+Enter dodaje nową linię"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "Mm"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "w."
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "sąż"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "C"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "l"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "g"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "dni"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "tygodni"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "miesięcy"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Informacje"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Projektant"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Wybierz Dziennik"
 
@@ -313,199 +312,198 @@
 msgstr "Twój Dziennik zawiera %i wpisów lub więcej\n\n"
 "Stwórz nowy dziennik aby przyspieszyć ładowanie."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Czy jesteś pewien?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Nowy Dziennik"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Wyzerować wszystkie wartości?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Twój Dziennik nie ma wpisów?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Ostatni wpis w Dzienniku\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Ostatni Dziennik\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Archiwalny dziennik do %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
-msgstr "Zmień nazwę Szablonu"
+msgstr "Route bez nazwy"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** CZŁOWIEK ZA BURTĄ ***\n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
-msgstr "Motogodziny #1 started"
+msgstr "Silnik #1 start"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
-msgstr "Motogodziny #1 running"
+msgstr "Silnik #1 praca"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
-msgstr "Motogodziny #1 stopped"
+msgstr "Silnik #1 stop"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
-msgstr "Motogodziny #2 started"
+msgstr "Silnik #2 start"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
-msgstr "Motogodziny #2 running"
+msgstr "Silnik #2 praca"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
-"Motogodziny #2 running"
+"Silnik #2 praca"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
-msgstr "Motogodziny #2 stopped"
+msgstr "Silnik #2 stop"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
-"Motogodziny #2 stopped"
+"Silnik #2 stop"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
-msgstr "Najczęściej\n"
-"używane żagle"
+msgstr "Postawione żagle"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
-msgstr "Jeśli nastąpiła zmiana wachty"
+msgstr "Zmiana żagli"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
-msgstr "Żagle"
+msgstr "Zrzucone żagle"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Usunąć wiersz nr %i?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Wprowadź Datę w formacie:\n"
 "      %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Wprowadź Datę w formacie:\n"
 "   %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Wprowadź 0544512.15n0301205.15e dla\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Wprowadź 05445.1234n03012.0504e dla\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Liczba minut większa niż 59"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Brak sygnału GPS!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
-msgstr ""
+msgstr "Nazwa następnego WP: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
-msgstr ""
+msgstr "Ostatni WP trasy"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -514,72 +512,73 @@
 "Nazwa Waypointa: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Jeśli ominięto Waypoint"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Jeśli osiągnięto Waypoint"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
-msgstr ""
+msgstr "Nie możesz dołączyć danych do starego dziennika\n\n"
+"\t\t\t\t\t\t\t\t\t\t\t\t\t\t\n"
+"OpenCPN przełącza do aktualnego dziennika"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Wybierz Dziennik"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
-msgstr ""
+msgstr "Aktualny dziennik"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Wszystkie Dzienniki"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
-msgstr "Wybierz Dziennik"
+msgstr "Wyszukaj"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
-msgstr "Ukryj kolumnę"
+msgstr "W kolumnie"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Data"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
-msgstr "Wybierz Trasę"
+msgstr "Wybierz"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Wybierz Trasę"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Wybierz Dziennik"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
-msgstr " - Timer włączony - Interwał: "
+msgstr "Ustaw timer"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Pozycja"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Dodaj Wpis"
 
@@ -587,10 +586,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Dodaj wpis na końcu Dziennika"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Eksport"
 
@@ -600,71 +598,65 @@
 msgstr "eksportuj dane z dziennika jako:\n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
-msgstr ""
+msgstr "Pokaż tryb selekcji szablonu"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Wybierz Szablon"
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Wybierz szablon, który będzie wyświetlany\n"
 "pod przyciskiem \"Widok\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "P"
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Przeładuj Szablony"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Edytuj Szablon"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
-msgstr "Lp"
+msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Podgląd"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Zobacz w przeglądarce (HTML) lub OpenOffice (ODT)"
 
@@ -686,998 +678,1011 @@
 
 #: src/LogbookDialog.cpp:205
 msgid "Show/Hide Statusbar"
-msgstr ""
+msgstr "Pokaż/Ukryj dolny pasek"
 
 #: src/LogbookDialog.cpp:210
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Timer"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
-msgstr ""
+msgstr "Ustawianie interwału dla timera"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
-msgstr ""
+msgstr "Timer"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Wachta"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Jeśli ominięto Waypoint"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Droga"
 
 #: src/LogbookDialog.cpp:283
 msgid "Set the desired distance in NM\n"
 " = (Track made good)"
-msgstr ""
+msgstr "Ustaw żądaną odległość w NM\n"
+" = (Track made good)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
-msgstr "Zachmurzenie"
+msgstr "Kurs"
 
 #: src/LogbookDialog.cpp:301
 msgid "Set desired Degrees\n"
 "if the course changes by this amount\n"
 "a course-changed-event occurs"
-msgstr ""
+msgstr "Ustaw wymaganą liczbę stopni\n"
+" jeśli kurs zmieni się o taką wartość\n"
+"zostanie dodane zdarzenie zmiana kursu"
 
 #: src/LogbookDialog.cpp:306
 msgid "Set desired delay in minutes\n"
 "It's a good idea to set here a value > 0\n"
 "to find the right wind."
-msgstr ""
+msgstr "Ustaw opóźnienie w minutach\n"
+"wartość >0 da czas na ustawienie się na nowym kursie"
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
-msgstr "do"
+msgstr "Stop"
 
 #: src/LogbookDialog.cpp:315
 msgid "Suspend/Resume running event/s"
-msgstr ""
+msgstr "Zatrzymaj/Wznów uruchomione zdarzenia"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Trasa"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Czas"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Całkowita Droga"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "KDd"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Kurs"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "Vd"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "Vw"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Głębokość"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Uwagi"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Usuń Wpis"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Pokaż ukryte kolumny"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Ukryj kolumnę"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Pokazuj ikonę Dziennika"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Usuń Wpis"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Ciśnienie"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Hygrometr"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Temp.\n"
 "powietrza"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Woda"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Prąd"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Prędkość\n"
 "Prądu"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Stan morza"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Martwa\n"
 "fala"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Pogoda"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Zachmurzenie"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Widzialność"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
-msgstr "Metr"
+msgstr "Meteo"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
-msgstr "Motogodziny #1"
+msgstr "Silnik #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
-msgstr "Woda łącznie"
+msgstr "Łącznie"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
-msgstr "Motogodziny #2"
+msgstr "Silnik #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
-msgstr "Woda łącznie"
+msgstr "Łącznie"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Paliwo"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Paliwo\n"
 "łącznie"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Żagle"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Refy"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "generator prądu"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
-msgstr ""
+msgstr "Pojemność akumulatora #1"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
-msgstr ""
+msgstr "Pojemność akumulatora #2"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Woda"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "Woda łącznie"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Woda łącznie"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Trasa"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Silnik/Żagle"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "eksportuj dane Przeglądu jako HTML lub ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Wybierz jeden z dzienników archiwalnych"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Początek"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Koniec"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Łączny czas"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Przebieg\n"
 "dobowy"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Najlepszy\n"
 "Przebieg Dobowy"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Średnia\n"
 "prędkość"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Maksymalna\n"
 "prędkość"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Woda"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Średni\n"
 "kierunek prądu"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Średni\n"
 "prąd"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Maksymalny\n"
 "prąd"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Średni\n"
 "stan morza"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Maksymalny\n"
 "stan morza"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Średnia\n"
 "martwa fala"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Maksymalna\n"
 "martwa fala"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Najczęściej\n"
 "używane żagle"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Idź do Trasy"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Przegląd"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Dodaj załogę"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Dodaj nowego załoganta"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "eksportuj dane załogi jako:\n"
 "HTML, ODT. ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
-msgstr ""
+msgstr "Pełna nazwa"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Imię"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
-msgstr ""
+msgstr "Tylko nazwisko"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
-msgstr ""
+msgstr "Na pokładzie"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
-msgstr "Nazwa"
+msgstr "Nazwisko"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
-msgstr "Nazwisko panieńskie"
+msgstr "Nazwisko rodowe"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Imię"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Data\n"
 "urodzenia"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Miejsce urodzenia"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Narodowość"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Nr paszportu"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Wydany przez"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Data wydania"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Kod pocztowy"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Kraj"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Miasto"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Ulica"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
-msgstr "Pokazuj ikonę Dziennika"
+msgstr "Pokaż tych na jachcie"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
-msgstr "Pokaż wszystkie Szablony"
+msgstr "Pokaż wszystkich"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
-msgstr ""
+msgstr "Sortuj rosnąco"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
-msgstr ""
+msgstr "Sortuj malejąco"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
-msgstr "Początek\n"
+msgstr "Ustal\n"
 "I wachty"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
-msgstr ""
+msgstr "Ustaw datę rozpoczęcia rejsu"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
-msgstr ""
+msgstr "Ustaw czas rozpoczęcia rejsu"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Dni"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
-msgstr ""
+msgstr "Długość rejsu"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
-msgstr ""
+msgstr "Oblicz"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
-msgstr ""
+msgstr "Wyznacz wachty z członkami załogi wprowadzonymi na listę"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
-msgstr "Stopa"
+msgstr "Resetuj"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
-msgstr ""
+msgstr "Wyczyść"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
-msgstr ""
+msgstr "Wyczyść wszystko"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
-msgstr ""
+msgstr "Dzień do tyłu"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
-msgstr "Nie"
+msgstr "Teraz"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
-msgstr ""
+msgstr "Przejdź do daty/czasu"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
-msgstr ""
+msgstr "Dzień do przodu"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Dni"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
-msgstr "Wyporność"
+msgstr "Pokaż"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
-msgstr "l"
+msgstr "wszystko"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
-msgstr ""
+msgstr "ten dzień"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
-msgstr "Wachta"
+msgstr "1. Wachta"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
-msgstr "Wachta"
+msgstr "Długość wachty"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
-msgstr "Metr"
+msgstr "Skład"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Początek\n"
 "I wachty"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
-msgstr "Początek\n"
-"I wachty"
+msgstr "Podziel\n"
+"I wachtę"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
-msgstr "Początek\n"
+msgstr "Połącz\n"
 "I wachty"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
-msgstr "Początek\n"
+msgstr "Zamień\n"
 "I wachty"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Usuń Wpis"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Lista załogi"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Dodaj wyposażenie"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "dodaj wyposażenie jachtu"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Pokaż Wyposażenie"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Pokaż/Ukryj Wyposażenie"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "eksportuj dane jachtu oraz wyposażenia jako:\n"
 "      HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Edytuj Szablony"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Jacht"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Port macierzysty"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Znak wywoławczy"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "Nr HIN"
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Numer Identyfikacyjny Kadłuba"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Żagiel Nr."
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Ubezpieczenie"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Rejestracja"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Nr polisy"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Właściciel"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Nazwa"
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Szczegóły"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Typ"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
-msgstr "Budowniczy"
+msgstr "Producent"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Kadłub"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Data wodowania"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Nr doku"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Projektant"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Konstrukcja"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "Lc"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Długość całkowita"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "Lp"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Długość po pokładzie"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "Lw"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Długość w linii wodnej"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Szerokość"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Największa szerokość kadłuba"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Zanurzenie"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Etykieta użytkownika"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "wpisz własną etykietę"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Wyporność"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Wyposażenie"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Opis"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Numer seryjny"
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Dodaj wpis"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "eksportuj dane Serwisowe jako HTML lub ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Wybierz Szablon:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Priorytet"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Czynność serwisowa"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Jeżeli"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Ostrzeżenie"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Pilnie"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Wartość\n"
 "początkowa"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Aktywne"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Czynność wykonana"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Kup części do tej czynności"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Serwis"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "eksportuj dane napraw jako HTML lub ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
-msgstr "Naprawa"
+msgstr "Naprawy do zrobienia"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Naprawa wykonana"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Kup części do tej naprawy"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Naprawy"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "eksportuj dane Kupna Części jako HTML lub ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Kategoria"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Kup Części"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "W"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Obsługa"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "puste"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr " - Timer włączony - Interwał: "
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Otwórz dokument Arkusz(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Kopia zapasowa Dziennika(*.txt)|*.txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Wybierz Trasę"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Zapisz plik Dziennika"
 
@@ -1693,93 +1698,93 @@
 msgstr "Brak ścieżki do Edytora HTML\n"
 "w Narzędzia/Wtyczki/LogbookKonni/Preferencje"
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Zapisz plik Listy Załogi"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Ukryj Wyposażenie"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Zapisz plik Opisu Jachtu"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Zapisz plik Serwisu"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Zapisz plik Napraw"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Zapisz plik Kupna Części"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Zapisz plik Przeglądu"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Filtruj Szablony"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Zmień nazwę Szablonu"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Usuń Szablon"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Wyślij Szablon emailem"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Zainstaluj pojedynczy Szablon"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Imię"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
-msgstr ""
+msgstr "Plik"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Dodaj załogę"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Usuń Szablon"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Zmień nazwę Szablonu"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Dodaj załogę"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Usuń Wpis"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1794,26 +1799,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Szczegóły"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1821,81 +1826,81 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Łączny czas"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
-msgstr ""
+msgstr "Zdarzenie"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
-msgstr "Metr"
+msgstr "każdy"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "Minuty"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
-msgstr "Wybierz Trasę"
+msgstr "Wyczyść wszystko"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
-msgstr ""
+msgstr "Godzina"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minuty"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
 #: src/LogbookOptions.cpp:70
 msgid "Date-Format:"
-msgstr ""
+msgstr "Format daty:"
 
 #: src/LogbookOptions.cpp:74
 msgid "Local Format"
@@ -1905,18 +1910,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Miesięcy"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Dni"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1960,48 +1963,72 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "co 15 stopni +/- 1 godzina"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Pokazuj ikonę Dziennika"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Pokazuj podpowiedzi-dymki"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "0"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Jeśli nastąpiła zmiana wachty"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
+
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Jeśli nastąpiła zmiana wachty"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Zapisuj ostrzeżenie \"Brak GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2009,45 +2036,41 @@
 "Jeżeli GPS nie działa, odznacz aby\n"
 "uniknąć powtarzających się ostrzeżeń."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr ""
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Kierunek wiatru ustawiony na:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "domyślne"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "domyślne = Względem Jachtu\n"
 "Kurs = Rzeczywisty kierunek wiatru"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr ""
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2056,41 +2079,41 @@
 "możesz włączyć/wyłączyć Timer\n"
 "lub zmienić ten tekst w Preferencjach."
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "wpis automatyczny\n"
 "osiągnięto Waypoint"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Jeśli kurs zmieni się o więcej niż "
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Instaluj Szablony"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Udinstaluj Dziennik"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Instaluj"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Instaluj OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Odinstaluj"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2104,463 +2127,458 @@
 "wszystkie Języki Dziennika\n"
 "i czyści OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Zachowanie"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Zbiornik"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Kategoria"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Pojemność"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
-msgstr ""
+msgstr "Stopnie"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Sekundy"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Prędkość"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Pokazuj Głębokość w"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Metr"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Stopa"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Sążeń"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Pokaż Stan morza/Martwą falę w"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Rzeczywisty"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnetyczny"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr "sąż"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Prędkość wiatru"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Paliwo/Woda"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Motogodziny"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
-msgstr "Motogodziny"
+msgstr "Silnik"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
-msgstr ""
+msgstr "OBR. / MIN"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dni"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Tygodni"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Tygodni"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Miesięcy"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Jeśli GPS jest wyłączony wpisz ręcznie"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Prędkość wiatru"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr "Kierunek"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Względny"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Skróty"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Ścieżka do edytora ODT"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Ścieżka do Menadżera plików"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Ścieżka do klienta poczty"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Ścieżka do edytora HTML\n"
 "(opcjonalnie)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Resetuj ścieżki"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Ścieżki"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
-msgstr ""
+msgstr "Pokaż"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
-msgstr ""
+msgstr "Ustaw przezroczystość"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
-msgstr ""
+msgstr "przezroczysty"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
-msgstr ""
+msgstr "Ustaw kolor trasy"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "biały"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "czarny"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "czerwony"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "żółty"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
-msgstr ""
+msgstr "Ustaw kolor śladu"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
-msgstr ""
+msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
-msgstr ""
+msgstr "Przydatne dla Tablet-PC"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
-msgstr ""
+msgstr "<< Powrót"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
-msgstr ""
+msgstr "Wiersz +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
-msgstr ""
+msgstr "Wiersz-"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Ukryj kolumnę"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Ukryj kolumnę"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Rózne"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Wprowadź jeden znak dla stopni, minut i sekund"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Ustaw ścieżkę do edytora HTML"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Ustaw ścieżkę do Menadżera plików"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Ustaw ścieżkę do klienta poczty"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Ustaw ścieżkę do edytora ODT"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "od"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "do"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Nie zainstalowano Szablonu"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Dziennik nie ma wpisów"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "nie znaleziono w pliku szablonu"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Zapomniałeś dodać tą linię w szablonie?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Zapomniałes zamknąć Nagłówek w [[ i ]]\n"
 "lub Dane w {{ i }}?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Trasa"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Tak"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adres"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Wybierz Trasę"
 
 #: src/Maintenance.cpp:92 src/Maintenance.cpp:93
 msgid "Engine "
-msgstr "Motogodziny"
+msgstr "Silnik"
 
 #: src/Maintenance.cpp:99
 msgid "Fix Date"
@@ -2578,8 +2596,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Nie"
 
@@ -2587,16 +2605,16 @@
 msgid "Logbook until "
 msgstr "Dziennik do"
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Dzienniki Łącznie"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/pt.po opencpn-plugin-logbookkonni-1.2024/po/pt.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/pt.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/pt.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-23 05:02-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:05-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: pt-BR\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Diário de bordo"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Seu(s) motor(es) estão ainda funcionando\n\n"
 "Parar motor(es) ?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "De "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Plugin"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Diário de bordo ativo"
 
@@ -57,15 +57,15 @@
 "Se você encontrar um erro posta-lo em\\ nhttp://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Videos de ajuda estão no Youtube, pesquise por LogbookKonni."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Diário de bordo preferências"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Selecione arquivos-Layout compactados"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -78,143 +78,143 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr "Ma"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "TR"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr "Ji"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr "Mi"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr "Mt"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "St"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Sp"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Principal"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Tentar"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genoa 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genoa 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genoa 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Fock 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Fock 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Fock 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Jib"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Mezena"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr "Mezena de tempestade"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Bujarrona"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Spinnacker"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Você pode alterar as abreviaturas e os nomes da velas\n"
 "em opções/diversos/velas"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "linha automática Waypoint de chegada"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "linha automática\n"
 "troca de turno"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "linha automática\n"
 "mudança de curso >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "linha automática line\n"
 "Distancia > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -224,88 +224,87 @@
 "ou alterar este texto na caixa de ferramentas/Plugins/Logbook\n\n"
 "Shift + Enter acrescenta uma nova linha"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "KTs"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "ft"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "fth"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "mb"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "h"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "dia (s)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "mês"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Informação"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Lembrar"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Pesquisar no diário de bordo"
 
@@ -316,46 +315,46 @@
 msgstr "Seu diário de bordo tem %i linhas\n\n"
 "Você deve criar um novo diário de bordo para minimizar tempo de carregamento."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr " fora"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr " ligado"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Tem certeza?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Novo diário de bordo"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Redefinir todos os valores para zero?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Seu diário de bordo não tem linhas?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Última linha do diário de bordo\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Último diário de bordo é\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Diário de bordo antigo até %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -364,137 +363,137 @@
 "e copiar todos os arquivos de dados da versão 1.1 para\n\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr "Seu diário de bordo tem %i linhas\n\n"
 "\t\t\tVocê deve criar um novo diário de bordo para minimizar tempo de carregamento."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "Rota sem nome"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** HOMEM AO MAR * * * \n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "Acompanhamentos "
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Motor #1 iniciado"
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Motor #1 funcionando"
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Motor #1 parado"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Motor # 2 iniciado"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Motor # 2 funcionando"
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Motor #2 funcionando"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Motor #2 parado"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Motor #2 parado"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr "Gerador iniciado"
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr "Gerador funcionando"
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr "\n"
 "Gerador em execução"
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr "Gerador parado"
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr "\n"
 "Gerador parado"
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Velas içadas"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Velas trocadas"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Velas para baixo"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Excluir linha Nr. %i?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Por favor, digite a data no formato: \n"
 " %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Por favor, introduza a hora no formato:\n"
 " %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Por favor, digite 0544512.15n0301205.15e para\n"
 "054Graus 45Min 12.15Sec N 030Graus 12Min 05.15Seg E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Por favor, digite 05445.1234n03012.0504e para\n"
 "054Deg 45,1234 Min N 030Deg 12,0504 Min E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Minutos maior que 59 "
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
@@ -502,19 +501,19 @@
 "mas o GPS não envia nenhum dados de título . \n"
 "Vento é definido agora como Relativo para o barco\n\n"
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Nenhum sinal do GPS!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Próximo WP nome:  "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Último waypoint da rota"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -523,73 +522,72 @@
 "Nome do Waypoint: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Waypoint ignorado"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "WayPoint de chegada"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr "Não é permitido acrescentar dados a um velho Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN mudou para diário atual"
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Procurar em"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Diário de bordo atual"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Todos os diários de bordo"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "ProcurarString"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "Na coluna"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Data"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Selecione"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Selecione a rota"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Selecione o diário de bordo"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Caixa de diálogo TextBlocks"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Ajuste o intervalo do cronômetro"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Posição"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Adicionar linha"
 
@@ -597,10 +595,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Adicionar uma linha ao final de seu diário de bordo"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Exportar"
 
@@ -610,71 +607,65 @@
 msgstr "exportar seus dados do diário de bordo como: \n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr "Mostrar o modo de seleção de Layout"
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Selecionar Layout:  "
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Selecione um layout mostrado\n"
 "com o botão \"View\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "R"
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Recarregar Layouts"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "E"
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Editar Layout"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Vista"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Exibir dados no browser (HTML) ou Openoffice/LibreOffice (ODT)"
 
@@ -702,32 +693,32 @@
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Ajuste o cronômetro"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Defina o intervalo para o cronômetro"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Cronômetro"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Turno"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Pontos da Rota"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Distância"
 
@@ -737,7 +728,7 @@
 msgstr "Defina a distância desejada em NM\n"
 " = (acompanhamento bem feit0)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Curso"
 
@@ -757,8 +748,8 @@
 "é uma boa idéia definir aqui um valor > 0\n"
 "para encontrar o vento certo."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "Parar"
 
@@ -766,884 +757,895 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Suspender/retomar executando o evento/s"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Rota"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Tempo"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr "Estado"
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "DistânciaTotal"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG (T)"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Cabeçalho"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "SOG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "STW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Profundidade"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Observações"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Excluir linha"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Mostrar colunas ocultas"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Ocultar coluna"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Desligar Diário de bordo"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Excluir linha"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Alerta de Dia  <-> Mês"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navegação"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Barômetro"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Higrômetro"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Ar"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Água"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr "TWA"
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
-msgstr "TWS"
-
 #: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
+msgstr "TWS\n"
+"Mínima| Média| Máxima"
+
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr "AWA"
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr "AWS\n"
+"Mínima| Média| Máxima"
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr "TWS"
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr "AWS"
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Corrente"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "C/força"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Onda"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Swell"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Tempo"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Nuvens"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Visibilidade"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Meteo"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "#1 total"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "#2 total"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Combustível"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Combustível Total"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Velas"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Reef"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Gerador"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Gen. total"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Banco #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "AH #1 Total"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr "Banco #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "AH #2 Total"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Dessanilizador"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "W-Total"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr "W-saída"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Água Total"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "RotaID"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr "FaixaID"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/velas"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "exportar seus dados- visão geral  como HTML ou ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Selecione um dentre os antigos diários de bordo"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Início"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Fim"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Tempo total"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Distância p. dia"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Melhor dist. p. dia"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Velocidade média."
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "Velocidade Max."
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Banco #1 gen."
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Banco #1 usado"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Banco #2 gen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Banco #2 usado"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr "Waterm. Saída"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Água utilizada"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr "TWA Avg."
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr "TWS Avg."
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr "TWS Max."
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Direçãoatual AVG."
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Corrente AVGl."
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Corrente Max."
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Onda média."
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Onda Max."
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Swell Avg."
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Swell Max."
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Usadas principalmente velas"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Caminho"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Ir para Rota"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Visão Geral"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Adicionar equipe"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Adicionar um novo membro da tripulação"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "exportar os seus dados- tripulação como: \n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Copia para turno"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Nome completo"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Primeiro Nome apenas"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Apenas o sobrenome"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "A bordo"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Nome"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Nome real"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Primeiro nome"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Título"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Data de Nascimento"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Local de nascimento"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nacionalidade"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Passaporte-Nr"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Emitido em"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Data de emissão"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Cep"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "País"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Cidade"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Rua"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Mostrar apenas a bordo"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Mostrar todas as entradas"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Ordernar ascendente"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Ordenação descendente"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Definir Horas do turno"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Definir a data de início da viagem à vela"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Definir a hora de inicio da viagem a vela"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Dias"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Comprimento de sua viagem à vela"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Calcular"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Calcular os turnos com os membros inseridos nas colunas"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Redefinir dados para editar-nível"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Limpar todos os dados"
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Ontem"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Agora"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Ir agora para data/hora"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Amanhã"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Dia:"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Mostra/definir o dia\n"
 "Exibir os dados no seu ODT/programa do Navegador de hoje até ao fim"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Apresentação"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "todos"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "Este dia"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "Usado para ODT/programa de Navegador\n"
 "Uma linha para o dia + dias selecionados = dias exibido"
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "1.Turno"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Hora do Turno"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Membro"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Definir como turno basico"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Dividir turno"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Mesclar turnos"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "Trocar dois turnos"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Excluir tripulantes"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Lista tripulantes"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Adicionar equipamento"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "Adicionar o equipamento do seu barco"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Mostrar equipamento"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Mostrar/ocultar Equipmentgrid"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "exportar dados-equipamentos do seu barco como: \n"
 " HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Editar Layout"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Barco"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Homeport"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Indicativo"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "HIN-Nr."
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "N º de identificação do casco."
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Vela-Nr."
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Seguro"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Registo"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Política"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Proprietário"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Nome      "
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefone"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Detalhes"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Tipo"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Construtor"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Casco"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Data de lançamento"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Yard-Nr."
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Designer"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Construção"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Comprimento total"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "LOD"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Comprimento sobre Deck"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Comprimento na linha d'água"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Boca"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Maior largura do casco"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Projecto"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "UserLabel"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "Escreva sua própria etiqueta"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Deslocamento"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Descrição"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Serial-Nr."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Adicionar uma nova linha"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "exportar seus dados de serviço como HTML ou ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Selecionar Layout:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prioridade"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Serviço TODO"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Se"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Avisarvalor"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Urgente valor"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "IniciarValor"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Ativo"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Serviço feito"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Comprar peças para este serviço"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Serviço"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Exportar seus Dadod de reparos como HTML ou ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "RepairsTODO"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparo feito"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Comprar peças para o reparo"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparos"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "Exportar Comprar peças-dado como HTML ou ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Categoria"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Comprar peças"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "No"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Manutenção"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "nenhum"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr " -Cronômetro normal - intervalo: "
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr " -Cronômetro hora completa"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr " -Cronômetro individual"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr "nenhum evento/s\n"
 "Click um ou mais bullets para iniciar"
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Evento/s suspenso\n"
 "Click no botão para reiniciar todos os eventos"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Evento/s funcionando\n"
 "Click no botão para suspender ou um bullet para parar"
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
@@ -1651,32 +1653,32 @@
 "vermelho = Evento esta parado\n"
 "amarelo = Evento está suspenso. Reinicie o evento com botão iniciar"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Planilha OpenDocument (*.ods) | *. ods|Formato de Excel 2003 (*. xml) | *. xml |CSV formato OpenOffice (*. csv) | *. csv Backup diário de bordo (*. txt) | *. txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr "Mostrar modo de motores/velas"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "Acompanhamento"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "Selecione o acompanhamento"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr "GUID"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "Use Textblocks..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Salve o arquivo de diário de bordo"
 
@@ -1692,93 +1694,93 @@
 msgstr "Sem caminho definido para HTML-Editor\n"
 "na ferramentas/Plugins/Diário de bordo/preferências"
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Salvar o arquivo tripulação"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Esconder equipamento"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Salvar arquivo de barco"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Salve o arquivo de serviço"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Salvar arquivo de reparos"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Salve o arquivo Comprar peças"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Salve o arquivo de visão geral"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Layout de filtro por"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Renomear Layout"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Excluir Layout"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Layout enviar por e-mail"
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Instalar Layout único"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Primeira/última entrada"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Arquivo"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Adicionar Item"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Apagar item"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Renomear Item"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Adicionar Treenode"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Excluir Treenode"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Texto"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "TextBlocks"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1804,17 +1806,17 @@
 "Use Arrastar e soltar para mover item de/para/ menu\n\n"
 "veja próximo treenodes para obter mais ajuda"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "O nome do item é mostrado clicando com botão direito do mouse no menu Seguir Colunas\n"
 " clicando sobre ele, o texto é inserido\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Textos para Rightclick-Menu"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1822,11 +1824,11 @@
 "Motores parados\n\n"
 "Demo - 'use Blocos de testos' para ajuda Rightclick-Menu"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Demo Velas acima"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1838,76 +1840,76 @@
 "Click OK-Botão\n\n"
 "Use Arraste e solte para colocar um item no menu"
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "SomenteTextos ao usar esta caixa de diálogo"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Motor parado\n\n"
 "Demo - Rightclick-Menu 'usar Testextblocks' para obter ajuda"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Demo motor parado"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Novo comando%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Novo Item%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Cronometro normal"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr "Evento"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr "Tempo de hora completo"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "cada"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "+ Minutos"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Limpar tudo"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Cronometro individual"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr "Hora"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Minutos"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr "AM/PM"
 
@@ -1923,18 +1925,16 @@
 msgid "Individual"
 msgstr "Indivídual"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Mês"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Dia"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "Ano"
 
@@ -1978,49 +1978,73 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "cada 15 graus + /- 1 hora"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Mostrar ícone do diário de bordo"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr "Mostrar posição Fomatada"
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Mostrar dicas de ferramentas"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "N. º de motores abordo"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "1"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Mensagens de velas"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr "Barra de status na parte inferior da página"
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr "Se não marcada a Barra de Status será colocada acima dos botões de Navegação/Meteorologia/Motor-velas"
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr "Gerador a bordo"
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr "Verifique se há um gerador a bordo.\n"
 "Se desmarcada as colunas do gerador não vão ser mostrada no diário de bordo"
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr "Mostrar Velocidades do vento Min| Média| Máxima"
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr "Se verificado o TWS e AWS será exibida VelocidadeVento Min| Média| Max"
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Mensagens de velas"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Escrever aviso \"Sem GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2028,45 +2052,41 @@
 "Se está fora de ordem, desmarque a opção para\n"
 "prevenir que se repita a mensagem."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr "Escrever mensagem \"Motor funcionando\" "
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Ao Iniciar motor estabelecer sempre todas as velas baixadas"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Direção do Vento definido como:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "padrão"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "padrão = relativo a Barco\n"
 "Cabeçalho = direção Real do vento"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Ao Iniciar motor estabelecer sempre todas as velas baixadas"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Eventos"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Escreve este texto no diário de bordo quando o evento ocorrer, alterar textos como queira"
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2076,41 +2096,41 @@
 " clicando o bullet\n"
 "Altera este texto em opções"
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "linha automática\n"
 "Waypoint chegada:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Mudanças de curso"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Popup no evento Diário de bordo"
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Instalar Layouts"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Desinstalar diário de bordo"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Instalar"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Instalar OpenCPN_Diáriodeborodo_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Desinstalar"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2124,248 +2144,244 @@
 "todos diário de bordo-idiomas\n"
 "e limpar o OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Usado somente quando você insere 1/2, 1/4... em um campo de total total, ou para calcular o dessanilizador\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Tanque"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Set gal/litro em abreviaturas "
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Bateria"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Capacidade"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr "Graus"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Segundos"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Velocidade"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Mostrar a profundidade em"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Metro"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Pés"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Fathom"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Mostrar onda/Swell em"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Verdade"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Magnético"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr "fm"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Velocidade do vento"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Combustível/água"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Horas do motor"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr "Ampere"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr "Cardan"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr "S"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Revoluções"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr "RPM"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Dia (s)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Semana (s)"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Semanas (s)"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Mês "
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "Se GPS fora de uso entrada manual"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Velocidade do vento "
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr " Direção "
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Relativo"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Abreviaturas"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "Caminho para ODT-Editor"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "para usar o MS-Word, acrescentar %s como este: \n"
 " \"C:\\yourPathToWinword\\WINWORD.EXE\"%s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Caminho para Datamanager"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Caminho para MailClient"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "Caminho para HTML-Editor\n"
 "(optional)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Redefinir caminhos"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Caminhos"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Definir Largura da linha para"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Definir transparência para"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr "Tranparente"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr "sólido"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Definir Cor da linha-Rota para"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "Branco"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "preto"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "vermelho"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "amarelo"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Definir Cor da Linha-Acompnanhamento para"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr "Verificar dentre as caixas abaixo de seleção, se você quiser usar ERRPM-sentença (ver ajuda)"
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "Seleçione"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2373,115 +2389,115 @@
 "Você verá a ERRPM-Sentence\n"
 "a esquerda do botão"
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "Motor-n. º corresponde com coluna Motor #1"
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr "Marque esta caixa se o fluxo NMEA contém mensagens RPM para este motor\n"
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "Motor-n. º corresponde com coluna Motor #2"
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr "Motor-n. º corresponde com coluna gerador"
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr "Marque esta caixa se o fluxo NMEA contém mensagens RPM para este gerador\n"
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "Usar ERRPM-sentença para calcular as horas de motor"
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Usar WIMDA-sentença da  Estação Meteorológica"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Para Barômetro, Temperatura do Ar e Umidade relativa"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr "Caixa de seleção espaço >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr "Útil para Tablet-PC"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr "Abreviações são mostradas nas caixas-Velas\n"
 "o nome é usado para a coluna \"Velas\", quando adicionada uma nova entrada"
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<< Voltar"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr "Voltar para Nome das velas"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Linha +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Linha-"
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Coluna +"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Coluna-"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr "Seu gerador ainda está funcionando.\n\n"
 "Gerador agora parado."
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "Seu motor #1 está sendo executado no modo manual.\n\n"
 "Motor parado agora."
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr "Seu motor #2 está sendo executado no modo manual.\n\n"
 "Motor parado agora."
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr "O Gerador está sendo executado no modo manual.\n\n"
 "Gerador parado agora."
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr "Seu país tem formato 24 horas. \n"
 "neste caso o OS não pode usar AM/PM.\n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
@@ -2490,103 +2506,102 @@
 "%s%s%s%s%s\n\n"
 "Por favor use um formato de Data diferente em todos as três caixas de escolha."
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Por favor, preencha um caractere em Graus, Minutos e Segundos"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr "Seu motor #2 ainda está funcionando.\n\n"
 "Motor #2 parado agora."
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Definir o caminho para o Editor de HTML"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Definir caminho para DataManager"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Definir caminho para MailClient"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Definir caminho para ODT-Editor"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "De"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "Para"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Desculpe, sem Layout instalado"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Desculpa, diário de bordo não tem linhas"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "não encontrados em layoutfile "
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "! \n\n"
 "Você se esqueceu de adicionar esta linha no seu layout?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Você se esqueceu de incluir o cabeçalho com [[e]] \n"
 " ou dados com {{e}} ?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Pontos da Rota"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr "Digite Hora do Turno padrão, por exemplo, 3.30 / formatos disponíveis são 3.30, 3,30, 03:30, 0330 para 3 horas e 30 minutos"
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr "Alterae hora do turno conforme desejado / Arraste e solte membros da lista de tripulantes"
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr "*Opcional * Preceder um * para um membro para faze-lo estático para um turno / clique em calcular"
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr "Todas as alterações dependendo somente para este dia."
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Sim"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Endereço"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Selecione uma data"
 
@@ -2610,8 +2625,8 @@
 msgid "Date + Months"
 msgstr "Data + mês"
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Não"
 
@@ -2619,16 +2634,16 @@
 msgid "Logbook until "
 msgstr "Diário de bordo até "
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Total diário de bordo"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i Ano(s) %i Mês(es) %i Dia(s)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E Semana(s) %D Dia(s) %H:%M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/ru.po opencpn-plugin-logbookkonni-1.2024/po/ru.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/ru.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/ru.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:21-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: ru\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -70,227 +70,226 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr ""
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr ""
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr ""
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -300,264 +299,263 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -565,10 +563,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -577,70 +574,64 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -664,32 +655,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -698,7 +689,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -714,8 +705,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -723,908 +714,917 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1638,93 +1638,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1739,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,75 +1766,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1850,18 +1850,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1905,131 +1903,151 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
-msgstr ""
-
-#: src/LogbookOptions.cpp:312
-msgid "default"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
-msgid "default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,453 +2056,448 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2508,8 +2521,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2517,16 +2530,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/sv.po opencpn-plugin-logbookkonni-1.2024/po/sv.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/sv.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/sv.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-29 14:06-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
@@ -16,28 +16,29 @@
 "X-Crowdin-Language: sv-SE\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Loggbok"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
-msgstr ""
+msgstr "Motorn är fortfarande i drift\n\n"
+"Stoppa motorn ?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "från "
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Modul"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Aktiv loggbok"
 
@@ -51,161 +52,169 @@
 "If you find a bug post it on\n"
 "http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n"
 "Helpful videos are at Youtube, search for LogbookKonni."
-msgstr ""
+msgstr "Loggbok för OpenCPN\n\n"
+"Allmänt tack cruiserforum för deras användbara förslag.\n\n"
+"Om du hittar ett fel i programmet vänligen rapportera på\n"
+"http://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html \n"
+"Videos finns på Youtube, Sök efter LogbookKonni."
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Inställningar loggboken"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Välj zippade Layout-filer"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr ""
+msgstr "Layouter %sinstallerade på\n\n"
+"%s\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "automatisk rad/n Anlänt Waypoint"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "automatisk rad\n"
 "Vaktbyte"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "automatisk rad\n"
 "Kursändring >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "automatisk rad\n"
 "Distanse > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -214,88 +223,87 @@
 "Timern kan slås av/på och tiden ändras\\Texten kan ändras här i Verktyg/Moduker/Loggbok\n"
 "Skift-Enter lägger till ny rad"
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "knop"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "fot"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "FTH"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "mb"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/h"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "gal"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "h"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "dag(ar)"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "vecka/veckor"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "månad"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Information"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Sök i loggboken"
 
@@ -305,195 +313,195 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Är du säker?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Ny loggbok"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Återställa alla värden till noll?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Din loggbok har inga rader?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Sista raden från Loggboken\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Senaste loggboken är\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Gammal loggbok till %s"
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Ta bort rad Nr. %i?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Bekräfta"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Ange datum i formatet: \n"
 " %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Ange 0544512.15n0301205.15e för\n"
 "054 Grader 45 Min 12.15 sek N 030 Grader 12 Min 05.15 sek E"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Skriv in 05445.1234n03012.0504e för\n"
 "054 Grader 45.1234 Min N 030 Grader 12.0504 Min E"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "Större än 59 minuter"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "Ingen GPS-Signal!"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Nästa WP namn: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Sista waypoint på rutten"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -502,72 +510,71 @@
 "Waypoint namn: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Waypoint hoppas över"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Anlänt till WayPoint"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Sök i"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Alla loggböcker"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Söktext"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "I kolumnen"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Datum"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Välj"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Välj rutt"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Välj loggbok"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Textblock i dialogrutan"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Ange tidsintervall"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Position"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Lägg till en rad"
 
@@ -575,10 +582,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Exportera"
 
@@ -588,71 +594,65 @@
 msgstr "exportera loggbok-data som: \n"
 "HTML, ODT, ODS, XML, CSV"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Välj utseende: "
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Välj utseende/layout som används\n"
 "av knappen \"Visa\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "R"
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Använd nytt utseende"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "E"
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Ändra utseende"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Visa"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "Visa data i webbläsaren (HTML) eller Openoffice/LibreOffice (ODT)"
 
@@ -680,32 +680,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Vakt"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Distans"
 
@@ -714,7 +714,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -730,8 +730,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -739,909 +739,918 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Rutt"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Tid"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Total distans"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG (T)"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Kurs"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "SOG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "STW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Djup"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Anmärkningar"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Ta bort rad"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Visa dolda kolumner"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Dölj kolumn"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Navigering"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Barometer"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Hygrometer"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Luft"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Vatten"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Ström"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Våg"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "Dyning"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Väder"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Moln"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Sikt"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Motor #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "#1 totalt"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Motor #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "#2 totalt"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Bränsle"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Bränsle totalt"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Segel"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Rev"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Generator"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Gen. totalt"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Bank #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "Ah #1 totalt"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr "Bank #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "Ah #2 totalt"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Watermaker"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Vatten Totalt"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/segel"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "exportera din översikt-data som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Välj en av de gamla loggböckerna"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Start"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr "Slut"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Total tid"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr "Avstånd/dag"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "Bästa Dist./dag"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Bank #2 gen."
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Bank #2 används"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr "Waterm. Kap"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Förbrukat Vatten"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "Snitt-strömriktning"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Snitt-ström"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "Maxström"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr "Snitt-Våghöjd"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr "Max Våghöjd"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "Snitt-Dyning"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "Max dyning"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Huvudsaklig segelföring"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Destinationsrutt"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Översikt"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Lägg till besättning"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Lägg till ny besättning"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "exportera besättningdata som: \n"
 "HTML, ODT, ODS, XML, CSV-"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "Ombord"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Namn"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Födelsenamn"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Förnamn"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Titel"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Födelsedatum"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Födelseort"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Nationalitet"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Passport-Nr"
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Utfärdat i"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Datum för utfärdande"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Zip"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Land"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Stad"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Gatuadress"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Visa endast ombordvarande"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Sortera stigande"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Sortera fallande"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Konstruktör"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Längd över allt"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "LOD"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Längd över däck"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Längd i vattenlinjen"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Bredd"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Största bredd av skrovet"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Djupgående"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Egen märkning"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "Skriv din egen märkning"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Deplacement"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Serie-Nr."
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Lägg till en ny rad"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "exportera service-data som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Välj utseende:"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Prioritet"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Service Att-Göra"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Om"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Värde för varning"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Värde för åtgärd"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Startvärde"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Utförd service"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Köpa delar för detta underhåll"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Service"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "exportera dina reparationsdata som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Underhåll Att-Göra"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Reparation utförd"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Köpa delar för denna reparation"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Reparationer"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "exportera din reparationsdata som HTML eller ODT"
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Kategori"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Köpa delar"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "På"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Underhåll"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "Ingen"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "OpenDocument-kalkylblad (*.ods) | *. ods|Excel 2003-Format (*.xml) | *. xml|CSV-Format OpenOffice (*.csv) | *. csv|Säkerhetskopiera loggbok (*.txt) | * txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1655,93 +1664,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1756,26 +1765,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1783,75 +1792,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1867,18 +1876,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Månad"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1922,48 +1929,72 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "varje 15 grader +/-1 timme"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Visa loggbok ikon"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Visa verktygstips"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
+
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "Skriv varning \"Ingen GPS\""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -1971,86 +2002,82 @@
 "avmarkera också om GPS är trasig\n"
 "för att hindra att meddelandet upprepas."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr ""
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Ange vindriktning till:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "standard"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "standard = Upplevd vindriktning\n"
 "Kurs = verklig vindriktning"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr ""
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "automatisk rad\n"
 "Anlänt Waypoint:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Installera layouter"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Avinstallera loggboken"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Installera"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "Installera OpenCPN_Logbook_Layouts.zip"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Avinstallera"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2064,456 +2091,453 @@
 "alla Loggboksspråk\n"
 "och rensar i OpenCPN.ini"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Beteende"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
-msgstr ""
+msgstr "Batteri"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
-msgstr ""
+msgstr "Kapacitet"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
-msgstr ""
+msgstr "Grader"
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
-msgstr ""
+msgstr "Sekunder"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
-msgstr ""
+msgstr "Fart"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
-msgstr ""
+msgstr "Visa djup i"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
-msgstr ""
+msgstr "Meter"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
-msgstr ""
+msgstr "Fot"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
-msgstr ""
+msgstr "Magnetisk"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
-msgstr ""
+msgstr "Vindhastigheten"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
-msgstr ""
+msgstr "Temperatur"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
-msgstr ""
+msgstr "Bränsle/Vatten"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
-msgstr ""
+msgstr "Motortimmar"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
-msgstr ""
+msgstr "Ampere"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
-msgstr ""
+msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
-msgstr ""
+msgstr "Propelleraxel"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
-msgstr ""
+msgstr "S"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
-msgstr ""
+msgstr "Varvtal"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
-msgstr ""
+msgstr "RPM"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
-msgstr ""
+msgstr "Dag(ar)"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
+msgstr "Vecka (veckor)"
 
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
-msgstr ""
+msgstr "Månad "
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
-msgstr ""
+msgstr "Vindhastighet "
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
-msgstr ""
+msgstr " Riktning "
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
-msgstr ""
+msgstr "Relativ"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
-msgstr ""
+msgstr "Förkortningar"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
-msgstr ""
+msgstr "Sökvägen till ODT-Editor"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
-msgstr ""
+msgstr "för att använda MS-Word, lägg till %s såhär: \n"
+" \"C:\\yourPathToWinword\\WINWORD. \"EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
-msgstr ""
+msgstr "Sökvägen till Datamanager"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
-msgstr ""
+msgstr "Sökväg till MailClient"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
-msgstr ""
+msgstr "Sökväg till HTML-Editor\n"
+"(optional)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
-msgstr ""
+msgstr "Visa"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
-msgstr ""
+msgstr "Ange radlängd till"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
-msgstr ""
+msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
-msgstr ""
+msgstr "Ange genomskinlighet till"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
-msgstr ""
+msgstr "genomskinlig"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
-msgstr ""
+msgstr "solid"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
-msgstr ""
+msgstr "vit"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
-msgstr ""
+msgstr "svart"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
-msgstr ""
+msgstr "röd"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
-msgstr ""
+msgstr "gul"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Vänligen fyll i ett tecken i grader, minuter och sekunder"
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "Ange sökväg till HTML-Editor"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Ange sökväg till DataManager"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "Ange sökväg till Mailprogrammet"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "Ange sökväg till ODT-behandlare"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "från"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "till"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Tyvärr, ingen Layout installerat"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Tyvärr, loggboken har inga rader"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "finns i layout-filen "
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "! \n\n"
 "Glömde du att lägga till denna rad i din layout?"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Har du glömt att omgärda sidhuvudet med [[och]] \n"
 " eller data/text med {{och}}?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "JA"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adress"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Välj ett datum"
 
@@ -2537,8 +2561,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2546,16 +2570,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
-msgstr ""
+msgstr "Loggbok totalt"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
-msgstr ""
+msgstr "%i År %i Månad(er) %i Dag(ar)"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
-msgstr ""
+msgstr "%E Vecka/Veckor %D Dag(ar) % H: %M "
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/tr.po opencpn-plugin-logbookkonni-1.2024/po/tr.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/tr.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/tr.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:22-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
@@ -16,29 +16,29 @@
 "X-Crowdin-Language: tr\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr "Seyir Defteri"
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr "Makineleriniz hala çalışıyor\n\n"
 "Makinelerinizi durduracak mısınız ?"
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr "den"
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr "-Eklenti"
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr "Etkin Seyir Defteri"
 
@@ -54,15 +54,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr "Seyir Defteri Yapılandıması"
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr "Sıkıştırılmış sayfa yapısından birini seçin"
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -75,144 +75,144 @@
 "%s\n"
 "%s"
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr "Ma"
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr "Doğru"
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr "Ge1"
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr "Ge2"
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr "Ge3"
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr "Fo1"
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr "Fo2"
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr "Fo3"
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr "Ji"
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr "Mi"
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr "Mt"
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr "St"
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr "Sp"
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr "?"
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr "Ana"
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr "Dene"
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr "Genoa 1"
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr "Genoa 2"
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr "Genoa 3"
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr "Flok 1"
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr "Flok 2"
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr "Flok 3"
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr "Jib"
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr "Mizana"
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr "Mizana Fırtına"
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr "Staysail"
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr "Balon"
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr "Yelkenlerin adaını ve kısaltmaları aşağıdaki yolla değiştirebilirsiniz\n"
 "Seçenekler/Muhtelif/Yelkenler"
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr "Otomatik satır\n"
 "Seyirnoktasına ulaşıldı:"
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr "Otomatik satır\n"
 "Nöbetçileri değiştir"
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr "Otomatik satır\n"
 "Yönü değiştirin >"
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr "Otomatik satır\n"
 "Uzaklık > "
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
@@ -223,88 +223,87 @@
 "ya da bu metni değiştirebilirsiniz (Araçkutusu/eklentiler/seyirdefteri)\"\n\n"
 "Shift+Entre la yeni bir satır ekleyebilirsiniz."
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr "'"
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr "\""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr "NM"
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr "knot"
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr "m"
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr "fit"
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr "fth"
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr "Hp"
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr "F"
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr "m/s"
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr "km/s"
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr "galon"
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr "s"
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr "gün"
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr "hafta"
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr "Ay"
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr "Bilgilendirme"
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr "Tasarımcı"
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr "Seyir Defterinde ara"
 
@@ -315,46 +314,46 @@
 msgstr "Seyir Defteriniz %i sayfanın üzerinde\n\n"
 "yüklemeyi hızlandırmak için lütfen yeni bir Seyir Defteri açınız."
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr "kapalı"
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr "açık"
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr "Emin misiniz?"
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr "Yeni Seyir Defteri"
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr "Tüm değerleri sıfırlamak mı istiyorsunuz ?"
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr "Seyir Defterinizde satır kalmadı mı?"
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr "Seyir Defterindeki son satırı\n"
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr "Son Seyir Defteri\n"
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr "Belirtilen tarihe kadarki eski Seyir Defterlerinin %s "
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
@@ -363,153 +362,153 @@
 "Sonra 1.1 sürümündeki tüm veri dosyalarını şuraya yedekleyin:\n\n"
 "%s"
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr "Seyir defterinizde %i satır var.\n\n"
 "\t\t\tYükleme süresin en aza indirecek şekilde yeni bir seyirdefteri oluşturun."
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr "(Adlandırılmamış Rota)"
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr "*** DENİZE ADAM DÜŞTÜ ***\n"
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr "İzle"
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr "Makine #1 çalıştırıldı."
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr "Makine #1 çalışıyor."
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr "Makine #1 durdu"
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr "Makine #2 çalıştırıldı"
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr "Makine #2 çalışıyor."
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr "\n"
 "Makine #2 running"
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr "Demo Makine durdu"
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr "\n"
 "Makine #2 durdu"
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr "Genellikle Yelken Kullanıldı"
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr "Yelkenler değiştirildi"
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr "Yelkenler toplandı."
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr "Numaralı satır silinsin mi %i ?"
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr "Onayla"
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr "Lütfen tarih formatını girin :\n"
 "    %s"
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr "Lütfen saati formata göre girin:\n"
 " %s"
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr "Lütfen \"054Derece 45.1234Dakika Kuzey; 030Derece 12.0504Dakika Doğu\" için\n"
 "            \"05445.1234K 03012.0504D\" giirin"
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr "Lütfen \"054Derece 45.1234Dakika Kuzey; 030Derece 12.0504Dakika Doğu\" için\n"
 "            \"05445.1234K 03012.0504D\" giirin"
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr "59'dan daha büyük dakika"
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr "GPS'ten sinyal gelmiyor"
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr "Sonraki seyirnoktasının adı: "
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr "Rotadaki son seyirnoktası"
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
@@ -518,73 +517,72 @@
 "Seyirnoktasının Adı: %s\n"
 "%s %s"
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr "Seyirnoktası değiştirildi"
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr "Seyirnoktasına ulaşıldı"
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr "Önceki Seyir Defterindeki verileri almanıza izin verilmiyor\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN geçerli seyirdefterine geçiyor."
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr "Ara"
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr "Kullanılan Seyir Defteri"
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr "Tüm Seyir Defterleri"
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr "Arama ölçütleri"
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr "Sütunda"
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr "Tarih"
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr "Seç"
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr "Rotayı Seç"
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr "Seyir Defterini seç"
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr "Metin bloğu"
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr "Zamanlama ayar aralığı:"
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr "Mevki"
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr "Satır Ekle"
 
@@ -592,10 +590,9 @@
 msgid "add a line to the end of your logbook"
 msgstr "Seyir Defteri sonuna bir satır ekle"
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr "Sakla"
 
@@ -606,73 +603,67 @@
 "HTML, ODT,  ODS, XML, CSVi\n"
 "     formatlarından biriyle sakla"
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr "Sayfa Düzenleme Seçeneğini göster."
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr "Sayfa Yapısını seç:"
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr "Butonla gösterilen\n"
 "sayfa yapısını seç \"Bak\""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr "Y\n"
 " "
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr "Sayfa yapıslarını yeniden yükleyin"
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr "D\n"
 " "
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr "Sayfa yapısını değiştir"
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr "HTML"
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr "ODT"
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr "Bak"
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr "HTML tarayıcısındaki veriye\n"
 "ya da Openoffice/LibreOffice (ODT)'ye bakın."
@@ -702,32 +693,32 @@
 msgid "Help"
 msgstr "Yardım"
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr "Zamanlayıcı"
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr "Zaman atarı için kesintileri ayarla"
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr "Zamanlayıcı"
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr "Nöbet"
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr "Seyirnoktası değiştirildi"
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr "Alınan\n"
 "  Yol"
@@ -738,7 +729,7 @@
 msgstr "İstenilen mesafeyi NM olarak gir\n"
 " = (İzlemek iyi olur)"
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr "Yön"
 
@@ -758,8 +749,8 @@
 "Doğru rüzgarı bulmak için\n"
 " >0 bir değer belirlemek iyi olur."
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr "Dur"
 
@@ -767,911 +758,920 @@
 msgid "Suspend/Resume running event/s"
 msgstr "Yürütülen işleri Askıya al/Devam et"
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr "Rota"
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr "Saat"
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr "Alınan Toplam Yol"
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr "COG"
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr "Pruva Yönü"
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr "SOG"
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr "STW"
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr "Derinlik"
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr "Görüşler"
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr "Satır sil"
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr "Saklı sütunları göster"
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr "Sütunu sakla"
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr "Seyir Defteri simgesini göster"
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr "Satır sil"
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr "Değişim günü <-> Ay"
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr "Seyir"
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr "Barometre"
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr "Nemölçer"
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr "Hava"
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr "Su"
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr "Akıntı"
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr "Akıntı\n"
 "Gücü"
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr "Dalga"
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr "  Dalga\n"
 "Yüksekliği"
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr "Hava"
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr "Bulutlar"
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr "Görüş\n"
 "uzaklığı"
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr "Metre"
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr "Makine #1"
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr "Toplam Makine #1"
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr "Makine #2"
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr "Toplam Makine #2"
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr "Yakıt"
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr "Tolpam yakıt"
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr "Yelken"
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr "Kayalık"
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr "Jenaratör"
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr "Genel toplam"
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr "Yük (Amper) Akü #1"
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr "Toplam A/S Akü#1"
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr "Yük (Amper) Akü #2"
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr "Toplam A/S Akü#2"
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr "Tatlısu Üreteci"
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr "Toplam W"
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr "W-Çıktı"
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr "Toplam Su"
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr "Rota"
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr "İzlemeID"
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr "Motor/Yelken"
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr "Gözdengeçirme verisini\n"
 "HTML or ODT olarak sakla"
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr "Eski Seyir Defterlerinden birini seçin"
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr "Başlangıç\n"
 " Zamanı"
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr " Bitiş\n"
 "Zamanı"
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr "Toplam\n"
 " Süre"
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr " Bir günde\n"
 " Alınan Yol"
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr "  Bir günde alınan\n"
 "     En iyi yol"
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr "Ortalama\n"
 "    Hız"
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr "En Yüksek\n"
 "    Hız"
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr "Yüklenen Amper \n"
 "     Akü #1"
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr "Kullanılan Amper\n"
 "    Akü #1"
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr "Yüklenen Amper \n"
 "     Akü #2"
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr "Kullanılan Amper\n"
 "    Akü #2"
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr " Üretilen\n"
 "Su miktarı"
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr "Kullanılan su"
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr "  Ortalama\n"
 " Akıntı yönü"
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr "Ortalama\n"
 "  Akıntı"
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr "En yüksek\n"
 "Akıntı hızı"
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr " Ortalama\n"
 "Dalga Boyu"
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr " En Uzun\n"
 "Dalga Boyu"
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr "  Ortalama \n"
 "Dalga Yüksekliği"
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr "  En Büyük\n"
 "Dalga Yüksekliği"
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr "Genellikle Yelken Kullanıldı"
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr "Yol"
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr "Rotaya git"
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr "Öngörünüm"
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr "Tayfa Ekle"
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr "Yeni tayfa ekle"
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr "           Tayfa bilgilerini\n"
 "HTML, ODT,  ODS, XML, CSVi\n"
 "     formatlarından biriyle saklar"
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr "Gözden geçirmek için kopyala"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr "Adı"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr "Adı"
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr "Soyadı"
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr "Güvertede"
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr "Adı"
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr "Göbek Adı"
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr "Adı"
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr "Ünvanı, işi"
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr "Doğum Tarihi"
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr "Doğum Yeri"
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr "Milliyeti"
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr "Pasaport No."
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr "Verildiği Yer"
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr "Verildiği Tarih"
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr "Posta Kodu"
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr "Ülke"
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr "Şehir"
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr "Adres"
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr "Sadece güvertedekini göster"
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr "Tüm tayfa girişlerini göster"
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr "Artarak sırala"
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr "Azalarak sırala"
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr "Nöbetleri düzenle"
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr "Seyirin başlangç tarihini belirt"
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr "Seyirin başlangıç zamanını belirt"
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr "Gün"
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr "Seyirin uzunluğu"
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr "Hesapla"
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr "Sıralayla girilen personele göre nöbet çizelgesi çıkar"
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr "YenidenKur"
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr "Verileri düzenlenmek üzere yeniden kur"
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr "Sil"
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr "Tüm verileri sil."
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr "Önceki günlere"
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr "Şimdi"
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr "Şimdiki tarihe/saate git"
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr "Sonraki günlere"
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr "Gün"
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr "Günü Göster/Belirle \n"
 "Bugünden son güne kadarki ODT/Tarayıcı-programınızdaki veriyi gösterir"
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr "Göster"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr "tümü"
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr "Bu gün"
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr "(O gün + seçili günler = Görüntülenen günler) için\n"
 "ODT/Tarayıcı-programı bir sıra kullandı."
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr "1. Nöbet"
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr "Nöbet saati"
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr "Tayfa"
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr "Nöbet esasına \n"
 "   göre belirle"
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr "Nöbeti böl"
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr "Nöbetleri birleştir"
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr "İki Nöbeti değiştir"
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr "Tayfaları Sil"
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr "Tayfa listesi"
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr "Alet ekle"
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr "Teknenizin donanımını ekleyin"
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr "Donanımı göster"
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr "Donanımı Sakla/Göster"
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr "   Tekne donanım verisini\n"
 "HTML, ODT,  ODS, XML, CSVi\n"
 "  formatlarından biriyle sakla."
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr "Sayfa yapısını değiştir"
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr "Tekne"
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr "Bağlı olduğu liman"
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr "Çağrı işareti"
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr "HIN numarası"
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr "Borda numarası"
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr "Yelken numarası"
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr "Sigorta"
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr "Kayıt"
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr "Poliçe"
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr "MMSI"
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr "Sahibi"
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr "Adı"
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr "Telefon"
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr "Tip"
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr "Yapımcısı"
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr "Gövde"
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr "Suya indiği tarih"
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr "Ponton Numarası"
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr "Tasarımcı"
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr "Yapım"
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr "LOA"
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr "Uzunluk(LOA)"
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr "LOD"
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr "Güverte uzunluğu"
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr "LWL"
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr "Su hattı uzunluğu"
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr "Genişlik"
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr "Teknenin en geniş ölçüsü"
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr "Su kesimi"
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr "Kullanıcı Kimliği"
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr "kendi etiketini yaz"
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr "Ağırlık"
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr "Donanım"
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr "Açıklama"
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr "Seri Numarası"
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr "Yeni satır ekle"
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr "Servis verisini  HTML or ODT olarak sakla"
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr "Sayfa yapısını seç"
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr "Öncelik"
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr "Servisi yapılması gerekenler"
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr "Servis Zamanı"
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr "Uyarı Değeri"
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr "Acil Değer"
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr "Başlangıç Değeri"
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr "Etkin"
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr "Servisi yapılanlar"
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr "Bu servis için parça satın al"
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr "Servis"
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr "Tamir verisini  HTML or ODT olarak sakla"
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr "Tamir Edilmesi Gerekenler"
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr "Tamiredildi"
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr "Bu çit olarak parça al"
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr "Tamirler"
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr "Satın alınacak parçalar verisini\n"
 "HTML or ODT olarak sakla."
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr "Sınıfı"
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr "Satın Alınacak Parçalar"
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr "Parçanın Yeri"
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr "Bakım, tutum"
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr "yok"
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr "- Zamanlama ayar aralığı:"
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr "- Tam saat zaman ayarı"
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr "- Kişisel Zaman Ayarı"
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr "Bir olay yok\n"
 "Başlamak için bir yada daha fazla noktaya basın."
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr "Olaylar askıya alındı\n"
 "Tüm olayları başlatmak için düğmeye basın"
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr "Olaylar sürüyor\n"
 "Askıya almak için düğmeye, durdurmak için noktaya basın"
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
@@ -1679,32 +1679,32 @@
 "Kırmızı = Olay durdu\n"
 "Sarı = Olay askıya alındı. Yeniden bşlatmak için Başla düğmesine basın"
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr "Tabloları açın(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Seyir Defteri(*.txt)|*.txt"
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr "Makine/Yelken durumunu göster"
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr "İzle"
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr "İzlemeyi Seç"
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr "REHBER"
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr "Metinblocklarını kullan..."
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr "Seyir Defteri dosyasını sakla"
 
@@ -1720,93 +1720,93 @@
 msgstr "\"/AraçKutusu/Eklentiler/LogbookKonni/Seçenekler\" de\n"
 " HTML editöre yol belirlenmemiş "
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr "Tayfa listesi dosyasını sakla"
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr "Donanımı sakla"
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr "Tekne dosyasını sakla"
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr "Servis dosyasını sakla"
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr "Tamirler dosyasını sakla"
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr "Parça alım dosyasını sakla"
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr "Gözat dosyasını sakla"
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr "Sayfa yapısıni filtrele"
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr "Sayfa yapısını yeniden adlandır"
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr "Sayfa yapısını sil"
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr "Sayfa yapısını emaille gönder."
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr "Tek sayfa yapısı kur"
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr "Ad/Soyad Girişiı"
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr "Dosya"
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr "Parça ekle"
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr "Parçayı sil"
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr "Parçayı yeniden adlandır"
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr "Treenode ekle"
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr "Treenode'u sil"
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr "Metin"
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr "Metin bloğu"
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1832,17 +1832,17 @@
 "Parçayı 'sürükle bırak' yoluyla menüye taşıyın\n\n"
 "Daha fazla yardım için sonraki treenodes'a bakın"
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr "Parça adı bir sonraki sütuna sağ tuş-menü tıklanarak görülebilir\n"
 "Üstüne tıklanarak metin eklenir\n\n"
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr "Sağ tuş-Menü metinlei"
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
@@ -1850,11 +1850,11 @@
 "Makine durduruldu\n\n"
 "Demo - Sağ tuş-Menu yardım için 'Testextblocks kullan'"
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr "Demo Yelken basıldı"
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1866,77 +1866,77 @@
 "Tamama bas\n\n"
 " "
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr "Sadece bu diyalog için metin kullan"
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr "Makine durdu\n\n"
 "Demo - Yardım için, Menu sağtuş 'Testextblocks'"
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr "Demo Makine durdu"
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr "Yeni Node%i"
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr "Yeni parça%i"
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr "Toplam\n"
 " Süre"
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr "Olay"
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr "Tam Saat Zaman Ayarı"
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr "Metre"
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr "Dakika"
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr "Seç"
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr "Kişisel Zaman"
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr "Saat"
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr "Dakika"
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr "PM"
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr "AM"
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr "AM/PM"
 
@@ -1952,18 +1952,16 @@
 msgid "Individual"
 msgstr "Kişisel"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr "Ay"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr "Gün"
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr "Sene"
 
@@ -2007,48 +2005,72 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr "Her 15 derecede bir +/- 1saat"
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr "Seyir Defteri simgesini göster"
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr "Araç ipuçlarını göster"
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr "Makine sayısı"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr "0"
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr "2"
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
-msgstr "Nöbet değişirse"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr "Nöbet değişirse"
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr "\"GPS yok\" uyarısı ver"
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
@@ -2057,45 +2079,41 @@
 "bu mesajın tekrarlanmaması için\n"
 "işareti kaldırınız."
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
+msgstr ""
+
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
+msgstr "Makineler çalıştığınd tüm yelkenlerin indiğini varsay"
+
+#: src/LogbookOptions.cpp:297
 msgid "     Winddirection set to:"
 msgstr "     Rüzgar yönünü şu yöne ayarla:"
 
-#: src/LogbookOptions.cpp:312
+#: src/LogbookOptions.cpp:301
 msgid "default"
 msgstr "Hissedilen"
 
-#: src/LogbookOptions.cpp:316
+#: src/LogbookOptions.cpp:305
 msgid "default = Relative to Boat\n"
 "Heading = Actual wind direction"
 msgstr "Hissedilen = Tekneden hissedilen \n"
 "Gerçek = Gerçek rüzgar yönü"
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
-msgstr "Makineler çalıştığınd tüm yelkenlerin indiğini varsay"
-
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
-msgstr ""
-
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
-msgstr ""
-
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr "Olaylar"
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr "Bir olay olduğunda seyir defterine yazın, metni istediğiniz gibi değiştirin."
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
@@ -2104,41 +2122,41 @@
 "Zamanlayıcıyı etkinleştirir ya da devre dışı bırakabilir\n"
 "ya da bu metni seçenek olarak değiştirebilirsiniz."
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr "Otomatik satır\n"
 "Seyirnoktasına ulaşıldı:"
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr "Eğer rota daha fazla değişirse"
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr "Olay durumunda seyirdefterini aç."
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr "Sayfa yapısını kur"
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr "Seyir Defterini kaldır"
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr "Kur"
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr "\"OpenCPN_Logbook_Layouts.zip\"i Kur"
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr "Kaldır"
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2152,248 +2170,244 @@
 "tüm Seyir Defteri dilleri\n"
 "ve OpenCPN.ini temizliği"
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr "Davranış"
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr "Sadece toplam bölümünde 1/2, 1/4kullanıldığında ya da, Su işaretini hesaplamakta kullanılır\n"
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr "Tank"
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr "Kısaltmaları Gal/Lit olarak belirle"
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr "Akü"
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr "Kapasite"
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr "Saniyeler"
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr "Hız"
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr "Derinliği göster"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr "Metre"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr "Fit"
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr "Kulaç"
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr "Dalga boyu ve yüksekliğini göster"
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr "Gerçek"
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr "Manyetik"
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr "den"
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr "Rüzgar Hızı"
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr "Sıcaklık"
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr "Yakıt/Su"
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr "Makine saatleri"
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr "Amper"
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr "Motor"
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr "Revane Şaftı"
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr "G"
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr "Devinimler"
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr "RPM"
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr "Gün"
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr "Hafta"
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr "Hafta"
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr "Ay"
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr "GPS devre dışı kaldığında, elle giriş için"
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr "Rüzgar Hızı"
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr "Yön"
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr "Hissedilen"
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr "Kısaltmalar"
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr "ODT editörüne yol"
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr "MS-Word kullanmak için, %s şeklinde değiştirerek kullanabilirsiniz:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr "Veriyöneticisi yolu"
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr "Mail alıcısına yol"
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr "HTML editöre yol\n"
 "(isteğe bağlı)"
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr "Yolu yeniden ayarla"
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr "Yollar"
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr "Göster"
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr "Çizgi genişliği"
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr "4"
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr "Şeffaflık ayarı"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr "geçirgen"
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr "kalın"
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr "Rota çizgi rengi ayarı"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr "Beyaz"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr "siyah"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr "kırmızı"
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr "sarı"
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr "Seyirizi çizg rengi"
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr "KML"
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr "Kontrol et"
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
@@ -2401,111 +2415,111 @@
 "EDüğmenin solunda RRPM-Cümlelerini \n"
 "görüyor olmalısınız."
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr "Makine-No. Makine#1 sütununa karşılık geliyor."
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr "Makine-No. Makine#2 sütununa karşılık geliyor."
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr "Makine saatlerini hesaplarken ERRPM-cümlelerini kullan."
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr "Havaistasyonundan WIMDA cümlelerini kullan"
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr "Barometre, HAva Sıcaklığı ve gerçek nem için"
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr "NMEA"
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr "İşaret kutusu aralığı  >>"
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr "Tablet PC'ler için faydalı"
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr "Kısaltmalar yelken işaret kutularında gösterilmiştir.\n"
 "Yeni bir şey eklendiğinde \"Yelkenler\" satırı kullanılır."
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr "<<  Arka"
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr "Yelken adlarına dön"
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr "Sıra +"
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr "Satır - "
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr "Sütunda"
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr "Sütunda"
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr "Muhtelif"
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr "Ülkeniz 24 Saat formatıyla çalışıyor.\n"
 "Bu durumda OS AM/PM formatonda çalışmıyor.\n"
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
@@ -2514,102 +2528,101 @@
 "%s%s%s%s%s\n\n"
 "Lütfen tüm bu üç tarih format kutusunda başka bir tarih formatı kullanın."
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr "Lütfen derece, dakika ve saniye yi aynı karakterlerle yazın."
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr "HTML editörü için yol belirle"
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr "Veri yöneticisi için yol belirle"
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr "MailClient için yol belirle"
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr "ODT editör için yol belirle"
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr "den"
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr "oraya"
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr "Afedersiniz, sayfa yapısı yüklenmemiş"
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr "Afedersizniz Seyir Defterinde satır yok."
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr "\n"
 "Dosyada bulunamadı"
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr "!\n\n"
 "Bu satırı listeye eklemeyi unuttunuz mu"
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr "Başlığı  [[ ve ]] ile mi, ya da yoksa veriyi {{ ve }} ile mi\n"
 " kapatmayı unuttunuz?"
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr "Rota"
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr "Varsayılan nöbet saatlerini girin e.g. 3.30 /3 saat ve 30 dakika için kullanılabilir formatlar 3.30, 3,30, 3:30, 0330"
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr "Nöbet zamanlarını istediğiniz gibi değiştirmek için / Personel listesinden bni sürükleyip bırakın."
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr "*Seçimlik* Önüne a ekleyin*  Bir personei sürekli nöbette tutmak için / Hesapla butonunu tıklayın"
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr "Tüm değişiklikler sadece bu güne bağlı."
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr "Evet"
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr "Adresi"
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr "Rotayı seç"
 
@@ -2633,8 +2646,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr "Hayır"
 
@@ -2642,16 +2655,16 @@
 msgid "Logbook until "
 msgstr "Seyir Defterinin son işlendiği tarih"
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr "Seyir Defteri Toplam"
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr "%i Yıl %i Ay %i Gün"
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr "%E Hafta %D Gün %S:%A"
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/vi.po opencpn-plugin-logbookkonni-1.2024/po/vi.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/vi.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/vi.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-06-04 16:23-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: vi\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -70,227 +70,226 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr ""
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr ""
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr ""
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -300,264 +299,263 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -565,10 +563,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -577,70 +574,64 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -664,32 +655,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -698,7 +689,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -714,8 +705,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -723,908 +714,917 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1638,93 +1638,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1739,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,75 +1766,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1850,18 +1850,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1905,131 +1903,151 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
-msgstr ""
-
-#: src/LogbookOptions.cpp:312
-msgid "default"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
-msgid "default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,453 +2056,448 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2508,8 +2521,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2517,16 +2530,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/po/zh.po opencpn-plugin-logbookkonni-1.2024/po/zh.po
--- opencpn-plugin-logbookkonni-1.2018.2/po/zh.po	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/po/zh.po	2016-02-25 13:06:29.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: opencpn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 06:19-0500\n"
-"PO-Revision-Date: 2015-05-19 07:22-0400\n"
+"POT-Creation-Date: 2016-02-25 10:01-0300\n"
+"PO-Revision-Date: 2016-02-25 08:04-0500\n"
 "Last-Translator: nohal <pavel@kalian.cz>\n"
 "Language-Team: Chinese Traditional\n"
 "Language: zh_TW\n"
@@ -16,28 +16,28 @@
 "X-Crowdin-Language: zh-TW\n"
 "X-Crowdin-File: /plugins/LogbookKonni_pi/po/logbookkonni_pi.pot\n"
 
-#: src/logbook_pi.cpp:126 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
-#: src/logbook_pi.cpp:776 src/LogbookDialog.cpp:615 src/LogbookDialog.cpp:748
-#: src/LogbookDialog.cpp:7315
+#: src/logbook_pi.cpp:125 src/logbook_pi.cpp:676 src/logbook_pi.cpp:721
+#: src/logbook_pi.cpp:815 src/LogbookDialog.cpp:621 src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:7486
 msgid "Logbook"
 msgstr ""
 
-#: src/logbook_pi.cpp:186
+#: src/logbook_pi.cpp:185
 msgid "Your engine(s) are still running\n\n"
 "Stop engine(s) ?"
 msgstr ""
 
-#: src/logbook_pi.cpp:266
+#: src/logbook_pi.cpp:265
 msgid "from "
 msgstr ""
 
-#: src/logbook_pi.cpp:268
+#: src/logbook_pi.cpp:267
 msgid "-Plugin"
 msgstr ""
 
-#: src/logbook_pi.cpp:505 src/logbook_pi.cpp:805 src/Logbook.cpp:842
-#: src/Logbook.cpp:875 src/Logbook.cpp:1404 src/LogbookDialog.h:629
-#: src/LogbookDialog.cpp:7386 src/LogbookDialog.cpp:7492 src/OverView.cpp:216
+#: src/logbook_pi.cpp:504 src/logbook_pi.cpp:844 src/Logbook.cpp:883
+#: src/Logbook.cpp:916 src/Logbook.cpp:1513 src/LogbookDialog.h:630
+#: src/LogbookDialog.cpp:7557 src/LogbookDialog.cpp:7663 src/OverView.cpp:216
 msgid "Active Logbook"
 msgstr ""
 
@@ -53,15 +53,15 @@
 "Helpful videos are at Youtube, search for LogbookKonni."
 msgstr ""
 
-#: src/logbook_pi.cpp:755 src/logbook_pi.cpp:758 src/logbook_pi.cpp:761
+#: src/logbook_pi.cpp:794 src/logbook_pi.cpp:797 src/logbook_pi.cpp:800
 msgid "Logbook Preferences"
 msgstr ""
 
-#: src/logbook_pi.cpp:1473 src/logbook_pi.cpp:1477
+#: src/logbook_pi.cpp:1493 src/logbook_pi.cpp:1497
 msgid "Select zipped Layout-Files"
 msgstr ""
 
-#: src/logbook_pi.cpp:1554
+#: src/logbook_pi.cpp:1579
 #, c-format
 msgid "Layouts %sinstalled at\n\n"
 "%s\n"
@@ -70,227 +70,226 @@
 "%s"
 msgstr ""
 
-#: src/Options.cpp:60
+#: src/Options.cpp:61
 msgid "Ma"
 msgstr ""
 
-#: src/Options.cpp:61
+#: src/Options.cpp:62
 msgid "Tr"
 msgstr ""
 
-#: src/Options.cpp:62
+#: src/Options.cpp:63
 msgid "Ge1"
 msgstr ""
 
-#: src/Options.cpp:63
+#: src/Options.cpp:64
 msgid "Ge2"
 msgstr ""
 
-#: src/Options.cpp:64
+#: src/Options.cpp:65
 msgid "Ge3"
 msgstr ""
 
-#: src/Options.cpp:65
+#: src/Options.cpp:66
 msgid "Fo1"
 msgstr ""
 
-#: src/Options.cpp:66
+#: src/Options.cpp:67
 msgid "Fo2"
 msgstr ""
 
-#: src/Options.cpp:67
+#: src/Options.cpp:68
 msgid "Fo3"
 msgstr ""
 
-#: src/Options.cpp:68
+#: src/Options.cpp:69
 msgid "Ji"
 msgstr ""
 
-#: src/Options.cpp:69
+#: src/Options.cpp:70
 msgid "Mi"
 msgstr ""
 
-#: src/Options.cpp:70
+#: src/Options.cpp:71
 msgid "Mt"
 msgstr ""
 
-#: src/Options.cpp:71
+#: src/Options.cpp:72
 msgid "St"
 msgstr ""
 
-#: src/Options.cpp:72
+#: src/Options.cpp:73
 msgid "Sp"
 msgstr ""
 
-#: src/Options.cpp:73
+#: src/Options.cpp:74
 msgid "?"
 msgstr ""
 
-#: src/Options.cpp:75
+#: src/Options.cpp:76
 msgid "Main"
 msgstr ""
 
-#: src/Options.cpp:76
+#: src/Options.cpp:77
 msgid "Try"
 msgstr ""
 
-#: src/Options.cpp:77
+#: src/Options.cpp:78
 msgid "Genoa 1"
 msgstr ""
 
-#: src/Options.cpp:78
+#: src/Options.cpp:79
 msgid "Genoa 2"
 msgstr ""
 
-#: src/Options.cpp:79
+#: src/Options.cpp:80
 msgid "Genoa 3"
 msgstr ""
 
-#: src/Options.cpp:80
+#: src/Options.cpp:81
 msgid "Fock 1"
 msgstr ""
 
-#: src/Options.cpp:81
+#: src/Options.cpp:82
 msgid "Fock 2"
 msgstr ""
 
-#: src/Options.cpp:82
+#: src/Options.cpp:83
 msgid "Fock 3"
 msgstr ""
 
-#: src/Options.cpp:83
+#: src/Options.cpp:84
 msgid "Jib"
 msgstr ""
 
-#: src/Options.cpp:84
+#: src/Options.cpp:85
 msgid "Mizzen"
 msgstr ""
 
-#: src/Options.cpp:85
+#: src/Options.cpp:86
 msgid "Mizzen Storm"
 msgstr ""
 
-#: src/Options.cpp:86
+#: src/Options.cpp:87
 msgid "Staysail"
 msgstr ""
 
-#: src/Options.cpp:87
+#: src/Options.cpp:88
 msgid "Spinnacker"
 msgstr ""
 
-#: src/Options.cpp:88
+#: src/Options.cpp:89
 msgid "You can change the abreviations and the names of the sails\n"
 "in Options/Miscellaneous/Sails"
 msgstr ""
 
-#: src/Options.cpp:121
+#: src/Options.cpp:122
 msgid "automatic line Waypoint arrived"
 msgstr ""
 
-#: src/Options.cpp:123 src/LogbookOptions.cpp:382
+#: src/Options.cpp:124 src/LogbookOptions.cpp:358
 msgid "automatic line\n"
 "change of guards"
 msgstr ""
 
-#: src/Options.cpp:126 src/LogbookOptions.cpp:404
+#: src/Options.cpp:127 src/LogbookOptions.cpp:380
 msgid "automatic line\n"
 "change of course >"
 msgstr ""
 
-#: src/Options.cpp:130 src/LogbookOptions.cpp:393
+#: src/Options.cpp:131 src/LogbookOptions.cpp:369
 msgid "automatic line\n"
 "Distance > "
 msgstr ""
 
-#: src/Options.cpp:145
+#: src/Options.cpp:146
 msgid "Automatic line by timer\n\n"
 "You can set/unset a timer-interval\n"
 "or change this text in Toolbox/Plugins/Logbook\n\n"
 "Shift+Enter appends a new line"
 msgstr ""
 
-#: src/Options.cpp:152 src/LogbookOptions.cpp:642
+#: src/Options.cpp:153 src/LogbookOptions.cpp:618
 msgid "'"
 msgstr ""
 
-#: src/Options.cpp:153 src/LogbookOptions.cpp:649
+#: src/Options.cpp:154 src/LogbookOptions.cpp:625
 msgid "\""
 msgstr ""
 
-#: src/Options.cpp:155 src/LogbookOptions.cpp:659
+#: src/Options.cpp:156 src/LogbookOptions.cpp:635
 msgid "NM"
 msgstr ""
 
-#: src/Options.cpp:156 src/Options.cpp:165 src/LogbookOptions.cpp:666
-#: src/LogbookOptions.cpp:748 src/LogbookOptions.cpp:879
+#: src/Options.cpp:157 src/Options.cpp:166 src/LogbookOptions.cpp:642
+#: src/LogbookOptions.cpp:724 src/LogbookOptions.cpp:855
 msgid "kts"
 msgstr ""
 
-#: src/Options.cpp:158 src/LogbookDialog.cpp:8562 src/LogbookOptions.cpp:686
+#: src/Options.cpp:159 src/LogbookDialog.cpp:8731 src/LogbookOptions.cpp:662
 msgid "m"
 msgstr ""
 
-#: src/Options.cpp:159 src/LogbookOptions.cpp:706
+#: src/Options.cpp:160 src/LogbookOptions.cpp:682
 msgid "ft"
 msgstr ""
 
-#: src/Options.cpp:160
+#: src/Options.cpp:161
 msgid "fth"
 msgstr ""
 
-#: src/Options.cpp:163 src/LogbookOptions.cpp:741
+#: src/Options.cpp:164 src/LogbookOptions.cpp:717
 msgid "mb"
 msgstr ""
 
-#: src/Options.cpp:164 src/LogbookOptions.cpp:776
+#: src/Options.cpp:165 src/LogbookOptions.cpp:752
 msgid "F"
 msgstr ""
 
-#: src/Options.cpp:166 src/LogbookOptions.cpp:757 src/LogbookOptions.cpp:879
+#: src/Options.cpp:167 src/LogbookOptions.cpp:733 src/LogbookOptions.cpp:855
 msgid "m/s"
 msgstr ""
 
-#: src/Options.cpp:167 src/LogbookOptions.cpp:766 src/LogbookOptions.cpp:879
+#: src/Options.cpp:168 src/LogbookOptions.cpp:742 src/LogbookOptions.cpp:855
 msgid "km/h"
 msgstr ""
 
-#: src/Options.cpp:170 src/LogbookOptions.cpp:793
+#: src/Options.cpp:171 src/LogbookOptions.cpp:769
 msgid "gal"
 msgstr ""
 
-#: src/Options.cpp:171 src/LogbookDialog.cpp:8555 src/LogbookDialog.cpp:8604
-#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:800
+#: src/Options.cpp:172 src/LogbookDialog.cpp:8724 src/LogbookDialog.cpp:8773
+#: src/LogbookOptions.cpp:186 src/LogbookOptions.cpp:776
 msgid "h"
 msgstr ""
 
-#: src/Options.cpp:177
+#: src/Options.cpp:178
 msgid "day(s)"
 msgstr ""
 
-#: src/Options.cpp:178
+#: src/Options.cpp:179
 msgid "week(s)"
 msgstr ""
 
-#: src/Options.cpp:179
+#: src/Options.cpp:180
 msgid "month"
 msgstr ""
 
-#: src/Logbook.h:228 src/Logbook.cpp:1447 src/Logbook.cpp:2308
-#: src/Logbook.cpp:2374 src/Logbook.cpp:2379 src/LogbookOptions.cpp:1556
-#: src/LogbookOptions.cpp:1672 src/LogbookOptions.cpp:1697
-#: src/LogbookOptions.cpp:1722 src/LogbookOptions.cpp:2239
-#: src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:408 src/LogbookHTML.cpp:636
-#: src/LogbookHTML.cpp:639 src/LogbookHTML.cpp:741 src/CrewList.cpp:1762
-#: src/CrewList.cpp:2148 src/CrewList.cpp:2489 src/boat.cpp:286
-#: src/boat.cpp:546
+#: src/Logbook.h:238 src/Logbook.cpp:1556 src/Logbook.cpp:2440
+#: src/Logbook.cpp:2506 src/Logbook.cpp:2511 src/LogbookOptions.cpp:1532
+#: src/LogbookOptions.cpp:1648 src/LogbookOptions.cpp:1673
+#: src/LogbookOptions.cpp:1698 src/LogbookOptions.cpp:2214
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:400 src/LogbookHTML.cpp:677
+#: src/LogbookHTML.cpp:775 src/CrewList.cpp:1787 src/CrewList.cpp:2195
+#: src/CrewList.cpp:2539 src/boat.cpp:290 src/boat.cpp:550
 msgid "Information"
 msgstr ""
 
-#: src/Logbook.h:247
+#: src/Logbook.h:257
 msgid "Reminder"
 msgstr ""
 
-#: src/Logbook.h:309 src/LogbookDialog.cpp:426
+#: src/Logbook.h:319 src/LogbookDialog.cpp:424
 msgid "Search in Logbook"
 msgstr ""
 
@@ -300,264 +299,263 @@
 "You should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:195 src/Logbook.cpp:1730 src/Logbook.cpp:1787
-#: src/LogbookDialog.cpp:3851
+#: src/Logbook.cpp:195 src/Logbook.cpp:1851 src/Logbook.cpp:1908
+#: src/LogbookDialog.cpp:3834
 msgid " off"
 msgstr ""
 
-#: src/Logbook.cpp:196 src/Logbook.cpp:1731 src/Logbook.cpp:1788
-#: src/LogbookDialog.cpp:3852
+#: src/Logbook.cpp:196 src/Logbook.cpp:1852 src/Logbook.cpp:1909
+#: src/LogbookDialog.cpp:3835
 msgid " on"
 msgstr ""
 
-#: src/Logbook.cpp:731
+#: src/Logbook.cpp:766
 msgid "Are you sure ?"
 msgstr ""
 
-#: src/Logbook.cpp:731 src/Logbook.cpp:741 src/LogbookDialog.cpp:191
+#: src/Logbook.cpp:766 src/Logbook.cpp:779 src/LogbookDialog.cpp:191
 msgid "New Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:735
+#: src/Logbook.cpp:773
 msgid "Reset all Values to zero ?"
 msgstr ""
 
-#: src/Logbook.cpp:741
+#: src/Logbook.cpp:779
 msgid "Your Logbook has no lines ?"
 msgstr ""
 
-#: src/Logbook.cpp:789
+#: src/Logbook.cpp:827
 msgid "Last line from Logbook\n"
 msgstr ""
 
-#: src/Logbook.cpp:797
+#: src/Logbook.cpp:835
 msgid "Last Logbook is\n"
 msgstr ""
 
-#: src/Logbook.cpp:848
+#: src/Logbook.cpp:889
 #, c-format
 msgid "Old Logbook until %s"
 msgstr ""
 
-#: src/Logbook.cpp:908
+#: src/Logbook.cpp:949
 #, c-format
 msgid "Start converting to new Date/Time-Format\n"
 "and backup all datafiles from version 1.1 to\n\n"
 "%s"
 msgstr ""
 
-#: src/Logbook.cpp:1446
+#: src/Logbook.cpp:1555
 #, c-format
 msgid "Your Logbook has %i lines\n\n"
 "\t\t\tYou should create a new logbook to minimize loadingtime."
 msgstr ""
 
-#: src/Logbook.cpp:1486
+#: src/Logbook.cpp:1595
 msgid "unnamed Route"
 msgstr ""
 
-#: src/Logbook.cpp:1511
+#: src/Logbook.cpp:1620
 msgid "*** MAN OVERBOARD ***\n"
 msgstr ""
 
-#: src/Logbook.cpp:1528
+#: src/Logbook.cpp:1637
 msgid "Track "
 msgstr ""
 
-#: src/Logbook.cpp:1562
+#: src/Logbook.cpp:1682
 msgid "Engine #1 started"
 msgstr ""
 
-#: src/Logbook.cpp:1566
+#: src/Logbook.cpp:1686
 msgid "Engine #1 running"
 msgstr ""
 
-#: src/Logbook.cpp:1582
+#: src/Logbook.cpp:1702
 msgid "Engine #1 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1587
+#: src/Logbook.cpp:1707
 msgid "Engine #2 started"
 msgstr ""
 
-#: src/Logbook.cpp:1593
+#: src/Logbook.cpp:1713
 msgid "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1595
+#: src/Logbook.cpp:1715
 msgid "\n"
 "Engine #2 running"
 msgstr ""
 
-#: src/Logbook.cpp:1611
+#: src/Logbook.cpp:1731
 msgid "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1613
+#: src/Logbook.cpp:1733
 msgid "\n"
 "Engine #2 stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1619
+#: src/Logbook.cpp:1739
 msgid "Generator started"
 msgstr ""
 
-#: src/Logbook.cpp:1625
+#: src/Logbook.cpp:1745
 msgid "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1627
+#: src/Logbook.cpp:1747
 msgid "\n"
 "Generator running"
 msgstr ""
 
-#: src/Logbook.cpp:1644
+#: src/Logbook.cpp:1764
 msgid "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1646
+#: src/Logbook.cpp:1766
 msgid "\n"
 "Generator stopped"
 msgstr ""
 
-#: src/Logbook.cpp:1668
+#: src/Logbook.cpp:1788
 msgid "Sails hoisted"
 msgstr ""
 
-#: src/Logbook.cpp:1672
+#: src/Logbook.cpp:1792
 msgid "Sails changed"
 msgstr ""
 
-#: src/Logbook.cpp:1675
+#: src/Logbook.cpp:1795
 msgid "Sails down"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 #, c-format
 msgid "Delete Row Nr. %i ?"
 msgstr ""
 
-#: src/Logbook.cpp:2122 src/CrewList.cpp:2462 src/boat.cpp:823
+#: src/Logbook.cpp:2249 src/CrewList.cpp:2512 src/boat.cpp:827
 msgid "Confirm"
 msgstr ""
 
-#: src/Logbook.cpp:2308
+#: src/Logbook.cpp:2440
 #, c-format
 msgid "Please enter the Date in the format:\n"
 "      %s"
 msgstr ""
 
-#: src/Logbook.cpp:2330
+#: src/Logbook.cpp:2462
 #, c-format
 msgid "Please enter the Time in the format:\n"
 "   %s"
 msgstr ""
 
-#: src/Logbook.cpp:2374
+#: src/Logbook.cpp:2506
 msgid "Please enter 0544512.15n0301205.15e for\n"
 "054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"
 msgstr ""
 
-#: src/Logbook.cpp:2379
+#: src/Logbook.cpp:2511
 msgid "Please enter 05445.1234n03012.0504e for\n"
 "054Deg 45.1234Min N 030Deg 12.0504Min E"
 msgstr ""
 
-#: src/Logbook.cpp:2695
+#: src/Logbook.cpp:2851
 msgid "Minutes greater than 59"
 msgstr ""
 
-#: src/Logbook.cpp:3235
+#: src/Logbook.cpp:3407
 msgid "Wind is set to Heading,\n"
 "but GPS sends no Heading Data.\n"
 "Wind is set now to Relative to boat\n\n"
 msgstr ""
 
-#: src/Logbook.cpp:3274
+#: src/Logbook.cpp:3447
 msgid "No GPS-Signal !"
 msgstr ""
 
-#: src/Logbook.cpp:3291
+#: src/Logbook.cpp:3465
 msgid "Next WP Name: "
 msgstr ""
 
-#: src/Logbook.cpp:3293
+#: src/Logbook.cpp:3469
 msgid "Last waypoint of the Route"
 msgstr ""
 
-#: src/Logbook.cpp:3295
+#: src/Logbook.cpp:3473
 #, c-format
 msgid "\n"
 "Name of Waypoint: %s\n"
 "%s %s"
 msgstr ""
 
-#: src/Logbook.cpp:3298
+#: src/Logbook.cpp:3476
 msgid "Waypoint skipped"
 msgstr ""
 
-#: src/Logbook.cpp:3300
+#: src/Logbook.cpp:3478
 msgid "WayPoint arrived"
 msgstr ""
 
-#: src/Logbook.cpp:3335
+#: src/Logbook.cpp:3513
 msgid "It's not allowed to append Data to a old Logbook\n\n"
 "\t\t\t\t\t\t\t\t\t\t\t\t\t\t OpenCPN switchs to actual logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3410
+#: src/Logbook.cpp:3588
 msgid "Search in"
 msgstr ""
 
-#: src/Logbook.cpp:3414 src/LogbookDialog.cpp:681
+#: src/Logbook.cpp:3592 src/LogbookDialog.cpp:687
 msgid "Actual Logbook"
 msgstr ""
 
-#: src/Logbook.cpp:3417 src/LogbookDialog.cpp:685
+#: src/Logbook.cpp:3595 src/LogbookDialog.cpp:691
 msgid "All Logbooks"
 msgstr ""
 
-#: src/Logbook.cpp:3430
+#: src/Logbook.cpp:3608
 msgid "Searchstring"
 msgstr ""
 
-#: src/Logbook.cpp:3437
+#: src/Logbook.cpp:3615
 msgid "In Column"
 msgstr ""
 
-#: src/Logbook.cpp:3446 src/LogbookDialog.cpp:385 src/LogbookDialog.cpp:1106
-#: src/LogbookDialog.cpp:1952
+#: src/Logbook.cpp:3624 src/LogbookDialog.cpp:383 src/LogbookDialog.cpp:1112
+#: src/LogbookDialog.cpp:1958
 msgid "Date"
 msgstr ""
 
-#: src/Logbook.cpp:3464
+#: src/Logbook.cpp:3642
 msgid "Select"
 msgstr ""
 
-#: src/LogbookDialog.h:782 src/LogbookDialog.cpp:4408
-#: src/LogbookDialog.cpp:4566
+#: src/LogbookDialog.h:783 src/LogbookDialog.cpp:4392 src/LogbookDialog.cpp:4547
 msgid "Select Route"
 msgstr ""
 
-#: src/LogbookDialog.h:853 src/LogbookDialog.h:855 src/LogbookDialog.cpp:196
-#: src/LogbookDialog.cpp:691
+#: src/LogbookDialog.h:854 src/LogbookDialog.h:856 src/LogbookDialog.cpp:196
+#: src/LogbookDialog.cpp:697
 msgid "Select Logbook"
 msgstr ""
 
-#: src/LogbookDialog.h:966
+#: src/LogbookDialog.h:967
 msgid "Textblocks Dialog"
 msgstr ""
 
-#: src/LogbookDialog.h:1102
+#: src/LogbookDialog.h:1108
 msgid "Set Timer Interval"
 msgstr ""
 
-#: src/LogbookDialog.h:1149 src/LogbookDialog.cpp:391
+#: src/LogbookDialog.h:1158 src/LogbookDialog.cpp:389
 msgid "Position"
 msgstr ""
 
-#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1632
-#: src/LogbookDialog.cpp:1758 src/LogbookDialog.cpp:1875
+#: src/LogbookDialog.cpp:98 src/LogbookDialog.cpp:1638
+#: src/LogbookDialog.cpp:1764 src/LogbookDialog.cpp:1881
 msgid "Add Line"
 msgstr ""
 
@@ -565,10 +563,9 @@
 msgid "add a line to the end of your logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:638
-#: src/LogbookDialog.cpp:828 src/LogbookDialog.cpp:1194
-#: src/LogbookDialog.cpp:1636 src/LogbookDialog.cpp:1762
-#: src/LogbookDialog.cpp:1879
+#: src/LogbookDialog.cpp:103 src/LogbookDialog.cpp:644 src/LogbookDialog.cpp:834
+#: src/LogbookDialog.cpp:1200 src/LogbookDialog.cpp:1642
+#: src/LogbookDialog.cpp:1768 src/LogbookDialog.cpp:1885
 msgid "Export"
 msgstr ""
 
@@ -577,70 +574,64 @@
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3838
+#: src/LogbookDialog.cpp:112 src/LogbookDialog.cpp:3821
 msgid "Show Layout Selection Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:645
-#: src/LogbookDialog.cpp:836 src/LogbookDialog.cpp:1202
+#: src/LogbookDialog.cpp:120 src/LogbookDialog.cpp:651 src/LogbookDialog.cpp:842
+#: src/LogbookDialog.cpp:1208
 msgid "Select Layout: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:651
-#: src/LogbookDialog.cpp:843 src/LogbookDialog.cpp:1208
-#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
-#: src/LogbookDialog.cpp:1892
+#: src/LogbookDialog.cpp:127 src/LogbookDialog.cpp:657 src/LogbookDialog.cpp:849
+#: src/LogbookDialog.cpp:1214 src/LogbookDialog.cpp:1655
+#: src/LogbookDialog.cpp:1781 src/LogbookDialog.cpp:1898
 msgid "Select a layout which is displayed\n"
 "with button \"View\""
 msgstr ""
 
-#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:656
-#: src/LogbookDialog.cpp:847 src/LogbookDialog.cpp:1212
-#: src/LogbookDialog.cpp:1653 src/LogbookDialog.cpp:1779
-#: src/LogbookDialog.cpp:1896
+#: src/LogbookDialog.cpp:131 src/LogbookDialog.cpp:662 src/LogbookDialog.cpp:853
+#: src/LogbookDialog.cpp:1218 src/LogbookDialog.cpp:1659
+#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
 msgid "R"
 msgstr ""
 
-#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:657
-#: src/LogbookDialog.cpp:848 src/LogbookDialog.cpp:1213
-#: src/LogbookDialog.cpp:1654 src/LogbookDialog.cpp:1780
-#: src/LogbookDialog.cpp:1897
+#: src/LogbookDialog.cpp:132 src/LogbookDialog.cpp:663 src/LogbookDialog.cpp:854
+#: src/LogbookDialog.cpp:1219 src/LogbookDialog.cpp:1660
+#: src/LogbookDialog.cpp:1786 src/LogbookDialog.cpp:1903
 msgid "Reload Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:661
-#: src/LogbookDialog.cpp:852 src/LogbookDialog.cpp:1217
-#: src/LogbookDialog.cpp:1658 src/LogbookDialog.cpp:1784
-#: src/LogbookDialog.cpp:1901 src/LogbookOptions.cpp:815
+#: src/LogbookDialog.cpp:136 src/LogbookDialog.cpp:667 src/LogbookDialog.cpp:858
+#: src/LogbookDialog.cpp:1223 src/LogbookDialog.cpp:1664
+#: src/LogbookDialog.cpp:1790 src/LogbookDialog.cpp:1907
+#: src/LogbookOptions.cpp:791
 msgid "E"
 msgstr ""
 
-#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:662
-#: src/LogbookDialog.cpp:853 src/LogbookDialog.cpp:1659
-#: src/LogbookDialog.cpp:1785 src/LogbookDialog.cpp:1902
-#: src/LogbookDialog.cpp:7177
+#: src/LogbookDialog.cpp:137 src/LogbookDialog.cpp:668 src/LogbookDialog.cpp:859
+#: src/LogbookDialog.cpp:1665 src/LogbookDialog.cpp:1791
+#: src/LogbookDialog.cpp:1908 src/LogbookDialog.cpp:7348
 msgid "Edit Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:857
+#: src/LogbookDialog.cpp:176 src/LogbookDialog.cpp:863
 msgid "HTML"
 msgstr ""
 
-#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:861
+#: src/LogbookDialog.cpp:180 src/LogbookDialog.cpp:867
 msgid "ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:673
-#: src/LogbookDialog.cpp:864 src/LogbookDialog.cpp:1229
-#: src/LogbookDialog.cpp:1670 src/LogbookDialog.cpp:1796
-#: src/LogbookDialog.cpp:1913
+#: src/LogbookDialog.cpp:183 src/LogbookDialog.cpp:679 src/LogbookDialog.cpp:870
+#: src/LogbookDialog.cpp:1235 src/LogbookDialog.cpp:1676
+#: src/LogbookDialog.cpp:1802 src/LogbookDialog.cpp:1919
 msgid "View"
 msgstr ""
 
-#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:674
-#: src/LogbookDialog.cpp:865 src/LogbookDialog.cpp:1230
-#: src/LogbookDialog.cpp:1671 src/LogbookDialog.cpp:1797
-#: src/LogbookDialog.cpp:1914
+#: src/LogbookDialog.cpp:184 src/LogbookDialog.cpp:680 src/LogbookDialog.cpp:871
+#: src/LogbookDialog.cpp:1236 src/LogbookDialog.cpp:1677
+#: src/LogbookDialog.cpp:1803 src/LogbookDialog.cpp:1920
 msgid "View data in browser (HTML) or Openoffice/LibreOffice (ODT)"
 msgstr ""
 
@@ -664,32 +655,32 @@
 msgid "Help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:227
+#: src/LogbookDialog.cpp:225
 msgid "Set Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:228
+#: src/LogbookDialog.cpp:226
 msgid "Set the interval for the timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:233 src/LogbookDialog.cpp:235
-#: src/LogbookOptions.cpp:358
+#: src/LogbookDialog.cpp:231 src/LogbookDialog.cpp:236
+#: src/LogbookOptions.cpp:334
 msgid "Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:245 src/LogbookDialog.cpp:247
-#: src/LogbookDialog.cpp:388 src/LogbookOptions.cpp:378
+#: src/LogbookDialog.cpp:244 src/LogbookDialog.cpp:249 src/LogbookDialog.cpp:386
+#: src/LogbookOptions.cpp:354
 msgid "Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:259 src/LogbookDialog.cpp:261
-#: src/LogbookOptions.cpp:368
+#: src/LogbookDialog.cpp:258 src/LogbookDialog.cpp:263
+#: src/LogbookOptions.cpp:344
 msgid "Waypoint"
 msgstr ""
 
-#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:274
-#: src/LogbookDialog.cpp:389 src/LogbookDialog.cpp:753
-#: src/LogbookOptions.cpp:389 src/LogbookOptions.cpp:655
+#: src/LogbookDialog.cpp:272 src/LogbookDialog.cpp:277 src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:759 src/LogbookOptions.cpp:365
+#: src/LogbookOptions.cpp:631
 msgid "Distance"
 msgstr ""
 
@@ -698,7 +689,7 @@
 " = (Track made good)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:293
+#: src/LogbookDialog.cpp:291 src/LogbookDialog.cpp:296
 msgid "Course"
 msgstr ""
 
@@ -714,8 +705,8 @@
 "to find the right wind."
 msgstr ""
 
-#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2916
-#: src/LogbookDialog.cpp:3049
+#: src/LogbookDialog.cpp:313 src/LogbookDialog.cpp:2922
+#: src/LogbookDialog.cpp:3076
 msgid "Stop"
 msgstr ""
 
@@ -723,908 +714,917 @@
 msgid "Suspend/Resume running event/s"
 msgstr ""
 
-#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:749
-#: src/LogbookDialog.cpp:4409 src/LogbookOptions.cpp:1025
+#: src/LogbookDialog.cpp:382 src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:4393 src/LogbookOptions.cpp:1001
 msgid "Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:386 src/LogbookDialog.cpp:1107
+#: src/LogbookDialog.cpp:384 src/LogbookDialog.cpp:1113
 msgid "Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:387
+#: src/LogbookDialog.cpp:385
 msgid "Status"
 msgstr ""
 
-#: src/LogbookDialog.cpp:390
+#: src/LogbookDialog.cpp:388
 msgid "DistanceTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:392
+#: src/LogbookDialog.cpp:390
 msgid "COG (T)"
 msgstr ""
 
-#: src/LogbookDialog.cpp:393 src/LogbookOptions.cpp:312
-#: src/LogbookOptions.cpp:712
+#: src/LogbookDialog.cpp:391 src/LogbookOptions.cpp:301
+#: src/LogbookOptions.cpp:688
 msgid "Heading"
 msgstr ""
 
-#: src/LogbookDialog.cpp:394
+#: src/LogbookDialog.cpp:392
 msgid "SOG"
 msgstr ""
 
-#: src/LogbookDialog.cpp:395
+#: src/LogbookDialog.cpp:393
 msgid "STW"
 msgstr ""
 
-#: src/LogbookDialog.cpp:396
+#: src/LogbookDialog.cpp:394
 msgid "Depth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:397 src/LogbookDialog.cpp:579
-#: src/LogbookDialog.cpp:1583
+#: src/LogbookDialog.cpp:395 src/LogbookDialog.cpp:587
+#: src/LogbookDialog.cpp:1589
 msgid "Remarks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:412 src/LogbookDialog.cpp:950
-#: src/LogbookDialog.cpp:1597 src/LogbookDialog.cpp:1735
-#: src/LogbookDialog.cpp:1852 src/LogbookDialog.cpp:1969
-#: src/LogbookDialog.cpp:8643 src/LogbookDialog.cpp:8706
+#: src/LogbookDialog.cpp:410 src/LogbookDialog.cpp:956
+#: src/LogbookDialog.cpp:1603 src/LogbookDialog.cpp:1741
+#: src/LogbookDialog.cpp:1858 src/LogbookDialog.cpp:1975
+#: src/LogbookDialog.cpp:8812 src/LogbookDialog.cpp:8875
 msgid "Delete Row"
 msgstr ""
 
-#: src/LogbookDialog.cpp:418 src/LogbookDialog.cpp:800
-#: src/LogbookDialog.cpp:954
+#: src/LogbookDialog.cpp:416 src/LogbookDialog.cpp:806 src/LogbookDialog.cpp:960
 msgid "Show hidden columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:422 src/LogbookDialog.cpp:804
+#: src/LogbookDialog.cpp:420 src/LogbookDialog.cpp:810
 msgid "Hide column"
 msgstr ""
 
-#: src/LogbookDialog.cpp:432
+#: src/LogbookDialog.cpp:430
 msgid "Shutdown Logbook"
 msgstr ""
 
-#: src/LogbookDialog.cpp:445
+#: src/LogbookDialog.cpp:443
 msgid "Delete Rows"
 msgstr ""
 
-#: src/LogbookDialog.cpp:449
+#: src/LogbookDialog.cpp:447
 msgid "Flip Day<->Month"
 msgstr ""
 
-#: src/LogbookDialog.cpp:452 src/LogbookOptions.cpp:621
+#: src/LogbookDialog.cpp:450 src/LogbookOptions.cpp:597
 msgid "Navigation"
 msgstr ""
 
-#: src/LogbookDialog.cpp:485 src/LogbookOptions.cpp:737
+#: src/LogbookDialog.cpp:483 src/LogbookOptions.cpp:713
 msgid "Barometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:486
+#: src/LogbookDialog.cpp:484
 msgid "Hygrometer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:487
+#: src/LogbookDialog.cpp:485
 msgid "Air"
 msgstr ""
 
-#: src/LogbookDialog.cpp:488 src/LogbookDialog.cpp:577
-#: src/LogbookOptions.cpp:489
+#: src/LogbookDialog.cpp:486 src/LogbookDialog.cpp:585
+#: src/LogbookOptions.cpp:465
 msgid "Water"
 msgstr ""
 
-#: src/LogbookDialog.cpp:489
+#: src/LogbookDialog.cpp:487
 msgid "TWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:490
-msgid "TWS"
+#: src/LogbookDialog.cpp:491
+msgid "TWS\n"
+"Min|Avg|Max"
 msgstr ""
 
-#: src/LogbookDialog.cpp:491
+#: src/LogbookDialog.cpp:492 src/LogbookDialog.cpp:498
 msgid "AWA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:492
+#: src/LogbookDialog.cpp:493
+msgid "AWS\n"
+"Min|Avg|Max"
+msgstr ""
+
+#: src/LogbookDialog.cpp:497
+msgid "TWS"
+msgstr ""
+
+#: src/LogbookDialog.cpp:499
 msgid "AWS"
 msgstr ""
 
-#: src/LogbookDialog.cpp:493
+#: src/LogbookDialog.cpp:501
 msgid "Current"
 msgstr ""
 
-#: src/LogbookDialog.cpp:494
+#: src/LogbookDialog.cpp:502
 msgid "C/Strength"
 msgstr ""
 
-#: src/LogbookDialog.cpp:495
+#: src/LogbookDialog.cpp:503
 msgid "Wave"
 msgstr ""
 
-#: src/LogbookDialog.cpp:496
+#: src/LogbookDialog.cpp:504
 msgid "Swell"
 msgstr ""
 
-#: src/LogbookDialog.cpp:497 src/LogbookOptions.cpp:731
+#: src/LogbookDialog.cpp:505 src/LogbookOptions.cpp:707
 msgid "Weather"
 msgstr ""
 
-#: src/LogbookDialog.cpp:498
+#: src/LogbookDialog.cpp:506
 msgid "Clouds"
 msgstr ""
 
-#: src/LogbookDialog.cpp:499
+#: src/LogbookDialog.cpp:507
 msgid "Visibility"
 msgstr ""
 
-#: src/LogbookDialog.cpp:516
+#: src/LogbookDialog.cpp:524
 msgid "Meteo"
 msgstr ""
 
-#: src/LogbookDialog.cpp:558 src/LogbookDialog.cpp:758
+#: src/LogbookDialog.cpp:566 src/LogbookDialog.cpp:764
 msgid "Engine #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:559
+#: src/LogbookDialog.cpp:567
 msgid "#1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:561 src/LogbookDialog.cpp:759
+#: src/LogbookDialog.cpp:569 src/LogbookDialog.cpp:765
 msgid "Engine #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:562
+#: src/LogbookDialog.cpp:570
 msgid "#2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:564 src/LogbookDialog.cpp:760
-#: src/LogbookOptions.cpp:533
+#: src/LogbookDialog.cpp:572 src/LogbookDialog.cpp:766
+#: src/LogbookOptions.cpp:509
 msgid "Fuel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:565
+#: src/LogbookDialog.cpp:573
 msgid "FuelTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:566 src/LogbookOptions.cpp:1292
+#: src/LogbookDialog.cpp:574 src/LogbookOptions.cpp:1268
 msgid "Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:567
+#: src/LogbookDialog.cpp:575
 msgid "Reef"
 msgstr ""
 
-#: src/LogbookDialog.cpp:568 src/LogbookDialog.cpp:761
+#: src/LogbookDialog.cpp:576 src/LogbookDialog.cpp:767
 msgid "Generator"
 msgstr ""
 
-#: src/LogbookDialog.cpp:569
+#: src/LogbookDialog.cpp:577
 msgid "Gen. total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:570 src/LogbookOptions.cpp:572
+#: src/LogbookDialog.cpp:578 src/LogbookOptions.cpp:548
 msgid "Bank #1"
 msgstr ""
 
-#: src/LogbookDialog.cpp:571
+#: src/LogbookDialog.cpp:579
 msgid "AH #1 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:572 src/LogbookOptions.cpp:584
+#: src/LogbookDialog.cpp:580 src/LogbookOptions.cpp:560
 msgid "Bank #2"
 msgstr ""
 
-#: src/LogbookDialog.cpp:573
+#: src/LogbookDialog.cpp:581
 msgid "AH #2 Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:574 src/LogbookDialog.cpp:766
-#: src/LogbookOptions.cpp:511
+#: src/LogbookDialog.cpp:582 src/LogbookDialog.cpp:772
+#: src/LogbookOptions.cpp:487
 msgid "Watermaker"
 msgstr ""
 
-#: src/LogbookDialog.cpp:575
+#: src/LogbookDialog.cpp:583
 msgid "W-Total"
 msgstr ""
 
-#: src/LogbookDialog.cpp:576
+#: src/LogbookDialog.cpp:584
 msgid "W-Output"
 msgstr ""
 
-#: src/LogbookDialog.cpp:578
+#: src/LogbookDialog.cpp:586
 msgid "WaterTotal"
 msgstr ""
 
-#: src/LogbookDialog.cpp:580
+#: src/LogbookDialog.cpp:588
 msgid "RouteID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:581
+#: src/LogbookDialog.cpp:589
 msgid "TrackID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:598
+#: src/LogbookDialog.cpp:606
 msgid "Motor/Sails"
 msgstr ""
 
-#: src/LogbookDialog.cpp:639
+#: src/LogbookDialog.cpp:645
 msgid "export your Overview-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:692
+#: src/LogbookDialog.cpp:698
 msgid "Select one of the old logbooks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:750 src/LogbookDialog.cpp:993
-#: src/LogbookDialog.cpp:2930 src/LogbookDialog.cpp:3028
+#: src/LogbookDialog.cpp:756 src/LogbookDialog.cpp:999
+#: src/LogbookDialog.cpp:2928 src/LogbookDialog.cpp:3063
 msgid "Start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:751
+#: src/LogbookDialog.cpp:757
 msgid "End"
 msgstr ""
 
-#: src/LogbookDialog.cpp:752
+#: src/LogbookDialog.cpp:758
 msgid "Total Time"
 msgstr ""
 
-#: src/LogbookDialog.cpp:754
+#: src/LogbookDialog.cpp:760
 msgid "Distance p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:755
+#: src/LogbookDialog.cpp:761
 msgid "Best Dist. p. Day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:756
+#: src/LogbookDialog.cpp:762
 msgid "Speed Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:757
+#: src/LogbookDialog.cpp:763
 msgid "Speed Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:762
+#: src/LogbookDialog.cpp:768
 msgid "Bank #1 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:763
+#: src/LogbookDialog.cpp:769
 msgid "Bank #1 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:764
+#: src/LogbookDialog.cpp:770
 msgid "Bank #2 gen."
 msgstr ""
 
-#: src/LogbookDialog.cpp:765
+#: src/LogbookDialog.cpp:771
 msgid "Bank #2 used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:767
+#: src/LogbookDialog.cpp:773
 msgid "Waterm. Outp"
 msgstr ""
 
-#: src/LogbookDialog.cpp:768
+#: src/LogbookDialog.cpp:774
 msgid "Water used"
 msgstr ""
 
-#: src/LogbookDialog.cpp:769
+#: src/LogbookDialog.cpp:775
 msgid "TWA Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:770
+#: src/LogbookDialog.cpp:776
 msgid "TWS Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:771
+#: src/LogbookDialog.cpp:777
 msgid "TWS Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:772
+#: src/LogbookDialog.cpp:778
 msgid "Currentdirection Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:773
+#: src/LogbookDialog.cpp:779
 msgid "Current Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:774
+#: src/LogbookDialog.cpp:780
 msgid "Current Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:775
+#: src/LogbookDialog.cpp:781
 msgid "Wave Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:776
+#: src/LogbookDialog.cpp:782
 msgid "Wave Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:777
+#: src/LogbookDialog.cpp:783
 msgid "Swell Avg."
 msgstr ""
 
-#: src/LogbookDialog.cpp:778
+#: src/LogbookDialog.cpp:784
 msgid "Swell Max."
 msgstr ""
 
-#: src/LogbookDialog.cpp:779
+#: src/LogbookDialog.cpp:785
 msgid "Sails used mostly"
 msgstr ""
 
-#: src/LogbookDialog.cpp:780
+#: src/LogbookDialog.cpp:786
 msgid "Path"
 msgstr ""
 
-#: src/LogbookDialog.cpp:796
+#: src/LogbookDialog.cpp:802
 msgid "Goto Route"
 msgstr ""
 
-#: src/LogbookDialog.cpp:812
+#: src/LogbookDialog.cpp:818
 msgid "Overview"
 msgstr ""
 
-#: src/LogbookDialog.cpp:823
+#: src/LogbookDialog.cpp:829
 msgid "Add Crew"
 msgstr ""
 
-#: src/LogbookDialog.cpp:824
+#: src/LogbookDialog.cpp:830
 msgid "Add a new Crewmember"
 msgstr ""
 
-#: src/LogbookDialog.cpp:829
+#: src/LogbookDialog.cpp:835
 msgid "export your crew-data as:\n"
 "HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:872
+#: src/LogbookDialog.cpp:878
 msgid "Copy to watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Name in full"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Firstname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:876
+#: src/LogbookDialog.cpp:882
 msgid "Lastname only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:922
+#: src/LogbookDialog.cpp:928
 msgid "Onboard"
 msgstr ""
 
-#: src/LogbookDialog.cpp:923 src/LogbookDialog.cpp:1260
-#: src/LogbookOptions.cpp:1222
+#: src/LogbookDialog.cpp:929 src/LogbookDialog.cpp:1266
+#: src/LogbookOptions.cpp:1198
 msgid "Name"
 msgstr ""
 
-#: src/LogbookDialog.cpp:924
+#: src/LogbookDialog.cpp:930
 msgid "Birthname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:925 src/LogbookDialog.cpp:1348
+#: src/LogbookDialog.cpp:931 src/LogbookDialog.cpp:1354
 msgid "Firstname"
 msgstr ""
 
-#: src/LogbookDialog.cpp:926 src/LogbookDialog.cpp:1950
+#: src/LogbookDialog.cpp:932 src/LogbookDialog.cpp:1956
 msgid "Title"
 msgstr ""
 
-#: src/LogbookDialog.cpp:927
+#: src/LogbookDialog.cpp:933
 msgid "Date of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:928
+#: src/LogbookDialog.cpp:934
 msgid "Place of Birth"
 msgstr ""
 
-#: src/LogbookDialog.cpp:929
+#: src/LogbookDialog.cpp:935
 msgid "Nationality"
 msgstr ""
 
-#: src/LogbookDialog.cpp:930
+#: src/LogbookDialog.cpp:936
 msgid "Passport-Nr"
 msgstr ""
 
-#: src/LogbookDialog.cpp:931
+#: src/LogbookDialog.cpp:937
 msgid "Issued in"
 msgstr ""
 
-#: src/LogbookDialog.cpp:932
+#: src/LogbookDialog.cpp:938
 msgid "Date of Issue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:933 src/LogbookDialog.cpp:1381
+#: src/LogbookDialog.cpp:939 src/LogbookDialog.cpp:1387
 msgid "Zip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:934
+#: src/LogbookDialog.cpp:940
 msgid "Country"
 msgstr ""
 
-#: src/LogbookDialog.cpp:935 src/LogbookDialog.cpp:1388
+#: src/LogbookDialog.cpp:941 src/LogbookDialog.cpp:1394
 msgid "Town"
 msgstr ""
 
-#: src/LogbookDialog.cpp:936 src/LogbookDialog.cpp:1374
+#: src/LogbookDialog.cpp:942 src/LogbookDialog.cpp:1380
 msgid "Street"
 msgstr ""
 
-#: src/LogbookDialog.cpp:960
+#: src/LogbookDialog.cpp:966
 msgid "Show onboard only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:965
+#: src/LogbookDialog.cpp:971
 msgid "Show all entries"
 msgstr ""
 
-#: src/LogbookDialog.cpp:971
+#: src/LogbookDialog.cpp:977
 msgid "Sort ascending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:975
+#: src/LogbookDialog.cpp:981
 msgid "Sort descending"
 msgstr ""
 
-#: src/LogbookDialog.cpp:991
+#: src/LogbookDialog.cpp:997
 msgid "Set Watchtimes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:998
+#: src/LogbookDialog.cpp:1004
 msgid "Set the startdate of the sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1004
+#: src/LogbookDialog.cpp:1010
 msgid "Set the starttime of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1008
+#: src/LogbookDialog.cpp:1014
 msgid "Days"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1013
+#: src/LogbookDialog.cpp:1019
 msgid "Length of your sailing trip"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1017
+#: src/LogbookDialog.cpp:1023
 msgid "Calculate"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1018
+#: src/LogbookDialog.cpp:1024
 msgid "Calculate the watches with the members entered in the columns"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1022 src/LogbookDialog.cpp:3920
-#: src/LogbookOptions.cpp:1278 src/LogbookOptions.cpp:1600
+#: src/LogbookDialog.cpp:1028 src/LogbookDialog.cpp:3903
+#: src/LogbookOptions.cpp:1254 src/LogbookOptions.cpp:1576
 msgid "Reset"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1024
+#: src/LogbookDialog.cpp:1030
 msgid "Reset data to edit-level"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1028
+#: src/LogbookDialog.cpp:1034
 msgid "Clear"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1029
+#: src/LogbookDialog.cpp:1035
 msgid "Clear all data"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1038
+#: src/LogbookDialog.cpp:1044
 msgid "Day backward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1042
+#: src/LogbookDialog.cpp:1048
 msgid "Now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1044
+#: src/LogbookDialog.cpp:1050
 msgid "Go to date/time now"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1050
+#: src/LogbookDialog.cpp:1056
 msgid "Day forward"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1054
+#: src/LogbookDialog.cpp:1060
 msgid "Day:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1059
+#: src/LogbookDialog.cpp:1065
 msgid "Shows/Sets the day\n"
 "Displays the data in your ODT/Browser-program from this day to end"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1063
+#: src/LogbookDialog.cpp:1069
 msgid "Display"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1067
+#: src/LogbookDialog.cpp:1073
 msgid "this day"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1071
+#: src/LogbookDialog.cpp:1077
 msgid "Used for ODT/Browser-program\n"
 "One Row for the day + selected days = Days displayed"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1094
+#: src/LogbookDialog.cpp:1100
 msgid "1. Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1105
+#: src/LogbookDialog.cpp:1111
 msgid "Watchtime"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1108
+#: src/LogbookDialog.cpp:1114
 msgid "Member"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1118
+#: src/LogbookDialog.cpp:1124
 msgid "Set as Watchbase"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1122
+#: src/LogbookDialog.cpp:1128
 msgid "Split Watch"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1126
+#: src/LogbookDialog.cpp:1132
 msgid "Merge Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1130
+#: src/LogbookDialog.cpp:1136
 msgid "Swap two Watches"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1134
+#: src/LogbookDialog.cpp:1140
 msgid "Delete Crewmembers"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1165
+#: src/LogbookDialog.cpp:1171
 msgid "Crewlist"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1183
+#: src/LogbookDialog.cpp:1189
 msgid "Add Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1184
+#: src/LogbookDialog.cpp:1190
 msgid "add the equipment of your boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1187 src/LogbookDialog.cpp:5694
+#: src/LogbookDialog.cpp:1193 src/LogbookDialog.cpp:5728
 msgid "Show Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1188
+#: src/LogbookDialog.cpp:1194
 msgid "Show/Hide Equipmentgrid"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1195
+#: src/LogbookDialog.cpp:1201
 msgid "export your boat/equipment-data as:\n"
 "      HTML, ODT,  ODS, XML, CSV"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1218
+#: src/LogbookDialog.cpp:1224
 msgid "Edit Layouts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1252 src/LogbookDialog.cpp:1614
+#: src/LogbookDialog.cpp:1258 src/LogbookDialog.cpp:1620
 msgid "Boat"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1267
+#: src/LogbookDialog.cpp:1273
 msgid "Homeport"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1274
+#: src/LogbookDialog.cpp:1280
 msgid "Callsign"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1281
+#: src/LogbookDialog.cpp:1287
 msgid "HIN-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1286
+#: src/LogbookDialog.cpp:1292
 msgid "Hull Identification No."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1289
+#: src/LogbookDialog.cpp:1295
 msgid "Sail-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1302
+#: src/LogbookDialog.cpp:1308
 msgid "Insurance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1309
+#: src/LogbookDialog.cpp:1315
 msgid "Registration"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1316
+#: src/LogbookDialog.cpp:1322
 msgid "Policy"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1323
+#: src/LogbookDialog.cpp:1329
 msgid "MMSI"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1334
+#: src/LogbookDialog.cpp:1340
 msgid "Owner"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1341
+#: src/LogbookDialog.cpp:1347
 msgid "Name      "
 msgstr ""
 
-#: src/LogbookDialog.cpp:1355
+#: src/LogbookDialog.cpp:1361
 msgid "Telephone"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1400
+#: src/LogbookDialog.cpp:1406
 msgid "Details"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1408 src/LogbookDialog.cpp:1580
+#: src/LogbookDialog.cpp:1414 src/LogbookDialog.cpp:1586
 msgid "Type"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1415
+#: src/LogbookDialog.cpp:1421
 msgid "Builder"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1422
+#: src/LogbookDialog.cpp:1428
 msgid "Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1429
+#: src/LogbookDialog.cpp:1435
 msgid "Date Launched"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1436
+#: src/LogbookDialog.cpp:1442
 msgid "Yard-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1443
+#: src/LogbookDialog.cpp:1449
 msgid "Designer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1450
+#: src/LogbookDialog.cpp:1456
 msgid "Construction"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1475
+#: src/LogbookDialog.cpp:1481
 msgid "LOA"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1480
+#: src/LogbookDialog.cpp:1486
 msgid "Length over all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1484
+#: src/LogbookDialog.cpp:1490
 msgid "LOD"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1489
+#: src/LogbookDialog.cpp:1495
 msgid "Length over Deck"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1493
+#: src/LogbookDialog.cpp:1499
 msgid "LWL"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1498
+#: src/LogbookDialog.cpp:1504
 msgid "Length in Waterline"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1502
+#: src/LogbookDialog.cpp:1508
 msgid "Beam"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1507
+#: src/LogbookDialog.cpp:1513
 msgid "Greatest Width of Hull"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1511
+#: src/LogbookDialog.cpp:1517
 msgid "Draft"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1518 src/LogbookDialog.cpp:1526
-#: src/LogbookDialog.cpp:1534
+#: src/LogbookDialog.cpp:1524 src/LogbookDialog.cpp:1532
+#: src/LogbookDialog.cpp:1540
 msgid "UserLabel"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1519 src/LogbookDialog.cpp:1527
-#: src/LogbookDialog.cpp:1535
+#: src/LogbookDialog.cpp:1525 src/LogbookDialog.cpp:1533
+#: src/LogbookDialog.cpp:1541
 msgid "write your own label"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1543
+#: src/LogbookDialog.cpp:1549
 msgid "Displacement"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1559
+#: src/LogbookDialog.cpp:1565
 msgid "Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1581 src/LogbookDialog.cpp:7317
+#: src/LogbookDialog.cpp:1587 src/LogbookDialog.cpp:7488
 msgid "Description"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1582
+#: src/LogbookDialog.cpp:1588
 msgid "Serial-Nr."
 msgstr ""
 
-#: src/LogbookDialog.cpp:1633 src/LogbookDialog.cpp:1759
-#: src/LogbookDialog.cpp:1876
+#: src/LogbookDialog.cpp:1639 src/LogbookDialog.cpp:1765
+#: src/LogbookDialog.cpp:1882
 msgid "Add a new line"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1637
+#: src/LogbookDialog.cpp:1643
 msgid "export your Service-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1643 src/LogbookDialog.cpp:1769
-#: src/LogbookDialog.cpp:1886
+#: src/LogbookDialog.cpp:1649 src/LogbookDialog.cpp:1775
+#: src/LogbookDialog.cpp:1892
 msgid "Select Layout:"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1705 src/LogbookDialog.cpp:1827
-#: src/LogbookDialog.cpp:1948
+#: src/LogbookDialog.cpp:1711 src/LogbookDialog.cpp:1833
+#: src/LogbookDialog.cpp:1954
 msgid "Priority"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1706
+#: src/LogbookDialog.cpp:1712
 msgid "Service TODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1707
+#: src/LogbookDialog.cpp:1713
 msgid "If"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1708
+#: src/LogbookDialog.cpp:1714
 msgid "Warnvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1709
+#: src/LogbookDialog.cpp:1715
 msgid "Urgentvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1710
+#: src/LogbookDialog.cpp:1716
 msgid "Startvalue"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1711
+#: src/LogbookDialog.cpp:1717
 msgid "Active"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1727
+#: src/LogbookDialog.cpp:1733
 msgid "Service done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1731
+#: src/LogbookDialog.cpp:1737
 msgid "Buy parts for this service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1746 src/Maintenance.cpp:441
+#: src/LogbookDialog.cpp:1752 src/Maintenance.cpp:458
 msgid "Service"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1763
+#: src/LogbookDialog.cpp:1769
 msgid "export your Repairs-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1828
+#: src/LogbookDialog.cpp:1834
 msgid "RepairsTODO"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1844
+#: src/LogbookDialog.cpp:1850
 msgid "Repair done"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1848
+#: src/LogbookDialog.cpp:1854
 msgid "Buy parts for this repair"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1863 src/Maintenance.cpp:448
+#: src/LogbookDialog.cpp:1869 src/Maintenance.cpp:465
 msgid "Repairs"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1880
+#: src/LogbookDialog.cpp:1886
 msgid "export your BuyParts-data as HTML or ODT"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1949
+#: src/LogbookDialog.cpp:1955
 msgid "Category"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1951 src/LogbookDialog.cpp:1980
+#: src/LogbookDialog.cpp:1957 src/LogbookDialog.cpp:1986
 msgid "Buy Parts"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1953
+#: src/LogbookDialog.cpp:1959
 msgid "At"
 msgstr ""
 
-#: src/LogbookDialog.cpp:1987 src/LogbookOptions.cpp:831
+#: src/LogbookDialog.cpp:1993 src/LogbookOptions.cpp:807
 msgid "Maintenance"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3385 src/LogbookDialog.cpp:3919
-#: src/LogbookOptions.cpp:1599
+#: src/LogbookDialog.cpp:3394 src/LogbookDialog.cpp:3902
+#: src/LogbookOptions.cpp:1575
 msgid "none"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3625
+#: src/LogbookDialog.cpp:3634
 msgid " - Normal Timer - Interval: "
 msgstr ""
 
-#: src/LogbookDialog.cpp:3629
+#: src/LogbookDialog.cpp:3638
 msgid " - Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3632
+#: src/LogbookDialog.cpp:3641
 msgid " - Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3668
+#: src/LogbookDialog.cpp:3677
 msgid "no Event/s\n"
 "Click one or more bullets to start"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3669
+#: src/LogbookDialog.cpp:3678
 msgid "Event/s suspended\n"
 "Click the button to restart all events"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3670
+#: src/LogbookDialog.cpp:3679
 msgid "Event/s running\n"
 "Click the button to suspend or a bullet to stop"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3672
+#: src/LogbookDialog.cpp:3681
 msgid "green = Event is running\n"
 "red = Event is stopped\n"
 "yellow = Event is suspended. Restart event with Start-Button"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3679
+#: src/LogbookDialog.cpp:3688
 msgid "Opendocument SpreadSheet(*.ods)|*.ods|Excel 2003 Format(*.xml)|*.xml|CSV Format OpenOffice(*.csv)|*.csv|Backup Logbook(*.txt)|*.txt"
 msgstr ""
 
-#: src/LogbookDialog.cpp:3837
+#: src/LogbookDialog.cpp:3820
 msgid "Show Engines/Sails Mode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4353 src/LogbookDialog.cpp:4404
-#: src/LogbookOptions.cpp:1029
+#: src/LogbookDialog.cpp:4337 src/LogbookDialog.cpp:4388
+#: src/LogbookOptions.cpp:1005
 msgid "Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4403 src/LogbookDialog.cpp:4560
+#: src/LogbookDialog.cpp:4387 src/LogbookDialog.cpp:4541
 msgid "Select Track"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4414
+#: src/LogbookDialog.cpp:4398
 msgid "GUID"
 msgstr ""
 
-#: src/LogbookDialog.cpp:4633
+#: src/LogbookDialog.cpp:4620
 msgid "use Textblocks..."
 msgstr ""
 
-#: src/LogbookDialog.cpp:4739
+#: src/LogbookDialog.cpp:4726
 msgid "Save Logbook File"
 msgstr ""
 
@@ -1638,93 +1638,93 @@
 "in ToolBox/Plugins/LogbookKonni/Preferences"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5366
+#: src/LogbookDialog.cpp:5375
 msgid "Save CrewList File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5686
+#: src/LogbookDialog.cpp:5720
 msgid "Hide Equipment"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5711
+#: src/LogbookDialog.cpp:5745
 msgid "Save Boat File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:5873
+#: src/LogbookDialog.cpp:5922
 msgid "Save Service File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6124
+#: src/LogbookDialog.cpp:6180
 msgid "Save Repairs File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6341
+#: src/LogbookDialog.cpp:6404
 msgid "Save BuyParts File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:6563
+#: src/LogbookDialog.cpp:6632
 msgid "Save Overview File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7187
+#: src/LogbookDialog.cpp:7358
 msgid "Filter Layout by"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7198
+#: src/LogbookDialog.cpp:7369
 msgid "Rename Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7207
+#: src/LogbookDialog.cpp:7378
 msgid "Delete Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7216
+#: src/LogbookDialog.cpp:7387
 msgid "Send Layout by email"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7225
+#: src/LogbookDialog.cpp:7396
 msgid "Install single Layout"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7316
+#: src/LogbookDialog.cpp:7487
 msgid "First/Last Entry"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7318
+#: src/LogbookDialog.cpp:7489
 msgid "File"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7925
+#: src/LogbookDialog.cpp:8096
 msgid "Add Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7929
+#: src/LogbookDialog.cpp:8100
 msgid "Delete Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7933
+#: src/LogbookDialog.cpp:8104
 msgid "Rename Item"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7939 src/LogbookDialog.cpp:8265
-#: src/LogbookDialog.cpp:8267
+#: src/LogbookDialog.cpp:8110 src/LogbookDialog.cpp:8434
+#: src/LogbookDialog.cpp:8436
 msgid "Add Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7943 src/LogbookDialog.cpp:8260
-#: src/LogbookDialog.cpp:8262
+#: src/LogbookDialog.cpp:8114 src/LogbookDialog.cpp:8429
+#: src/LogbookDialog.cpp:8431
 msgid "Delete Treenode"
 msgstr ""
 
-#: src/LogbookDialog.cpp:7956
+#: src/LogbookDialog.cpp:8127
 msgid "Text"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8080
+#: src/LogbookDialog.cpp:8249
 msgid "Textblocks"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8081
+#: src/LogbookDialog.cpp:8250
 msgid "Help\n"
 "-----\n\n"
 "Open treenode\n"
@@ -1739,26 +1739,26 @@
 "see next treenodes for more help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8085
+#: src/LogbookDialog.cpp:8254
 msgid "The itemname is shown in the rightcklick-menu of the following Columns\n"
 "By clicking on it the text is inserted\n\n"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8093
+#: src/LogbookDialog.cpp:8262
 msgid "Texts for Rightclick-Menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8099
+#: src/LogbookDialog.cpp:8268
 msgid "Sails up\n"
 "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8100
+#: src/LogbookDialog.cpp:8269
 msgid "Demo Sails up"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8123
+#: src/LogbookDialog.cpp:8292
 msgid "These texts are inserted into the grid-colmn\n"
 "by calling this dialog\n\n"
 "Select Item\n"
@@ -1766,75 +1766,75 @@
 "Use Drag 'n Drop to place a item in menu"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8124
+#: src/LogbookDialog.cpp:8293
 msgid "Texts when using this Dialog only"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8130
+#: src/LogbookDialog.cpp:8299
 msgid "Engine stopped\n\n"
 "Demo - Rightclick-Menu 'use Testextblocks' for help"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8131
+#: src/LogbookDialog.cpp:8300
 msgid "Demo Engine stopped"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8204
+#: src/LogbookDialog.cpp:8373
 #, c-format
 msgid "New Node%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8241
+#: src/LogbookDialog.cpp:8410
 #, c-format
 msgid "New Item%i"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8544
+#: src/LogbookDialog.cpp:8713
 msgid "Normal Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8580 src/LogbookDialog.cpp:8658
-#: src/LogbookDialog.cpp:8722
+#: src/LogbookDialog.cpp:8749 src/LogbookDialog.cpp:8827
+#: src/LogbookDialog.cpp:8891
 msgid "Event"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8594
+#: src/LogbookDialog.cpp:8763
 msgid "Full Hour Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8597
+#: src/LogbookDialog.cpp:8766
 msgid "every"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8628
+#: src/LogbookDialog.cpp:8797
 msgid "+ Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8647 src/LogbookDialog.cpp:8710
+#: src/LogbookDialog.cpp:8816 src/LogbookDialog.cpp:8879
 msgid "Clear all"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8667
+#: src/LogbookDialog.cpp:8836
 msgid "Individual Timer"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8690
+#: src/LogbookDialog.cpp:8859
 msgid "Hour"
 msgstr ""
 
-#: src/LogbookDialog.cpp:8691 src/LogbookOptions.cpp:638
+#: src/LogbookDialog.cpp:8860 src/LogbookOptions.cpp:614
 msgid "Minutes"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9063 src/LogbookDialog.cpp:9068
+#: src/LogbookDialog.cpp:9238 src/LogbookDialog.cpp:9243
 msgid "PM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9070
+#: src/LogbookDialog.cpp:9245
 msgid "AM"
 msgstr ""
 
-#: src/LogbookDialog.cpp:9171
+#: src/LogbookDialog.cpp:9353
 msgid "AM/PM"
 msgstr ""
 
@@ -1850,18 +1850,16 @@
 msgid "Individual"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97 src/LogbookOptions.cpp:855
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:831
 msgid "Month"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Day"
 msgstr ""
 
-#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91
-#: src/LogbookOptions.cpp:97
+#: src/LogbookOptions.cpp:85 src/LogbookOptions.cpp:91 src/LogbookOptions.cpp:97
 msgid "Year"
 msgstr ""
 
@@ -1905,131 +1903,151 @@
 msgid "every 15 Degrees +/- 1 hour"
 msgstr ""
 
-#: src/LogbookOptions.cpp:221
+#: src/LogbookOptions.cpp:208
 msgid "Show Logbook Icon"
 msgstr ""
 
-#: src/LogbookOptions.cpp:225
+#: src/LogbookOptions.cpp:212
 msgid "Show Position Format"
 msgstr ""
 
-#: src/LogbookOptions.cpp:239
+#: src/LogbookOptions.cpp:227
 msgid "Show ToolTips"
 msgstr ""
 
-#: src/LogbookOptions.cpp:243
+#: src/LogbookOptions.cpp:231
 msgid "No. of Inboard Engines"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:247
+#: src/LogbookOptions.cpp:235
 msgid "2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:268
-msgid "Sails Messages"
+#: src/LogbookOptions.cpp:243
+msgid "StatusBar at bottom of the page"
+msgstr ""
+
+#: src/LogbookOptions.cpp:245
+msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
 msgstr ""
 
-#: src/LogbookOptions.cpp:275
+#: src/LogbookOptions.cpp:250
 msgid "Generator On Board"
 msgstr ""
 
-#: src/LogbookOptions.cpp:277
+#: src/LogbookOptions.cpp:252
 msgid "Check if there is a Generator onboard.\n"
 "If unchecked the Generator columns will not show in Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:282
+#: src/LogbookOptions.cpp:257
+msgid "Show Min|Avg|Max wind speeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:259
+msgid "If checked the TWS and AWS will display Min|Avg|Max windspeeds"
+msgstr ""
+
+#: src/LogbookOptions.cpp:264
+msgid "Sails Messages"
+msgstr ""
+
+#: src/LogbookOptions.cpp:270
+msgid "Show daily entries in Overview"
+msgstr ""
+
+#: src/LogbookOptions.cpp:272
+msgid "If checked the Overview for Active or Selected logbook will show daily lines-"
+msgstr ""
+
+#: src/LogbookOptions.cpp:277
 msgid "Write warning \"No GPS\""
 msgstr ""
 
-#: src/LogbookOptions.cpp:284
+#: src/LogbookOptions.cpp:279
 msgid "Uncheck if You have no GPS\n"
 "If GPS is out of order, uncheck to\n"
 "prevent that the message repeats."
 msgstr ""
 
-#: src/LogbookOptions.cpp:290
+#: src/LogbookOptions.cpp:285
 msgid "Write message \"Engine running\" "
 msgstr ""
 
-#: src/LogbookOptions.cpp:308
-msgid "     Winddirection set to:"
-msgstr ""
-
-#: src/LogbookOptions.cpp:312
-msgid "default"
+#: src/LogbookOptions.cpp:287
+msgid "If checked the message will be in Remarks when engine is started."
 msgstr ""
 
-#: src/LogbookOptions.cpp:316
-msgid "default = Relative to Boat\n"
-"Heading = Actual wind direction"
+#: src/LogbookOptions.cpp:292
+msgid "On engine start set always all sails down"
 msgstr ""
 
-#: src/LogbookOptions.cpp:321
-msgid "On engine start set always all sails down"
+#: src/LogbookOptions.cpp:297
+msgid "     Winddirection set to:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:326
-msgid "StatusBar at bottom of the page"
+#: src/LogbookOptions.cpp:301
+msgid "default"
 msgstr ""
 
-#: src/LogbookOptions.cpp:328
-msgid "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons"
+#: src/LogbookOptions.cpp:305
+msgid "default = Relative to Boat\n"
+"Heading = Actual wind direction"
 msgstr ""
 
-#: src/LogbookOptions.cpp:338
+#: src/LogbookOptions.cpp:314
 msgid "Events"
 msgstr ""
 
-#: src/LogbookOptions.cpp:347
+#: src/LogbookOptions.cpp:323
 msgid "Writes this text to the logbook when the event occurs, alter texts as desired"
 msgstr ""
 
-#: src/LogbookOptions.cpp:362
+#: src/LogbookOptions.cpp:338
 msgid "automatic line by timer\n"
 "You can set/unset a timer\n"
 " by clicking the bullet\n"
 "Change this text in options"
 msgstr ""
 
-#: src/LogbookOptions.cpp:372
+#: src/LogbookOptions.cpp:348
 msgid "automatic line\n"
 "Waypoint arrived:"
 msgstr ""
 
-#: src/LogbookOptions.cpp:400
+#: src/LogbookOptions.cpp:376
 msgid "Course changes"
 msgstr ""
 
-#: src/LogbookOptions.cpp:414
+#: src/LogbookOptions.cpp:390
 msgid "Popup logbook on event"
 msgstr ""
 
-#: src/LogbookOptions.cpp:429
+#: src/LogbookOptions.cpp:405
 msgid "Install Layouts"
 msgstr ""
 
-#: src/LogbookOptions.cpp:433
+#: src/LogbookOptions.cpp:409
 msgid "Uninstall Logbook"
 msgstr ""
 
-#: src/LogbookOptions.cpp:437
+#: src/LogbookOptions.cpp:413
 msgid "Install"
 msgstr ""
 
-#: src/LogbookOptions.cpp:438
+#: src/LogbookOptions.cpp:414
 msgid "Install OpenCPN_Logbook_Layouts.zip"
 msgstr ""
 
-#: src/LogbookOptions.cpp:442
+#: src/LogbookOptions.cpp:418
 msgid "Uninstall"
 msgstr ""
 
-#: src/LogbookOptions.cpp:443
+#: src/LogbookOptions.cpp:419
 msgid "Uninstalls\n"
 "Logbook-Plugin,\n"
 "all Logbook-Data,\n"
@@ -2038,453 +2056,448 @@
 "and cleans the OpenCPN.ini"
 msgstr ""
 
-#: src/LogbookOptions.cpp:460
+#: src/LogbookOptions.cpp:436
 msgid "Behavior"
 msgstr ""
 
-#: src/LogbookOptions.cpp:474
+#: src/LogbookOptions.cpp:450
 msgid "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:498 src/LogbookOptions.cpp:542
+#: src/LogbookOptions.cpp:474 src/LogbookOptions.cpp:518
 msgid "Tank"
 msgstr ""
 
-#: src/LogbookOptions.cpp:505 src/LogbookOptions.cpp:518
-#: src/LogbookOptions.cpp:549
+#: src/LogbookOptions.cpp:481 src/LogbookOptions.cpp:494
+#: src/LogbookOptions.cpp:525
 msgid "Set gal/liter in Abbreviations "
 msgstr ""
 
-#: src/LogbookOptions.cpp:563
+#: src/LogbookOptions.cpp:539
 msgid "Battery"
 msgstr ""
 
-#: src/LogbookOptions.cpp:600 src/LogbookOptions.cpp:789
+#: src/LogbookOptions.cpp:576 src/LogbookOptions.cpp:765
 msgid "Capacity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:627
+#: src/LogbookOptions.cpp:603
 msgid "Degrees"
 msgstr ""
 
-#: src/LogbookOptions.cpp:645
+#: src/LogbookOptions.cpp:621
 msgid "Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:662
+#: src/LogbookOptions.cpp:638
 msgid "Speed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:648
 msgid "Show Depth in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:682
-#: src/LogbookOptions.cpp:696
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:658
+#: src/LogbookOptions.cpp:672
 msgid "Meter"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:702
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:678
 msgid "Feet"
 msgstr ""
 
-#: src/LogbookOptions.cpp:676 src/LogbookOptions.cpp:696
-#: src/LogbookOptions.cpp:722
+#: src/LogbookOptions.cpp:652 src/LogbookOptions.cpp:672
+#: src/LogbookOptions.cpp:698
 msgid "Fathom"
 msgstr ""
 
-#: src/LogbookOptions.cpp:692
+#: src/LogbookOptions.cpp:668
 msgid "Show Wave/Swell in"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716 src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:692 src/LogbookOptions.cpp:869
 msgid "True"
 msgstr ""
 
-#: src/LogbookOptions.cpp:716
+#: src/LogbookOptions.cpp:692
 msgid "Magnetic"
 msgstr ""
 
-#: src/LogbookOptions.cpp:726
+#: src/LogbookOptions.cpp:702
 msgid "fm"
 msgstr ""
 
-#: src/LogbookOptions.cpp:744
+#: src/LogbookOptions.cpp:720
 msgid "Windspeed"
 msgstr ""
 
-#: src/LogbookOptions.cpp:772
+#: src/LogbookOptions.cpp:748
 msgid "Temperature"
 msgstr ""
 
-#: src/LogbookOptions.cpp:783
+#: src/LogbookOptions.cpp:759
 msgid "Fuel/Water"
 msgstr ""
 
-#: src/LogbookOptions.cpp:796
+#: src/LogbookOptions.cpp:772
 msgid "Motor Hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:803
+#: src/LogbookOptions.cpp:779
 msgid "Ampere"
 msgstr ""
 
-#: src/LogbookOptions.cpp:811
+#: src/LogbookOptions.cpp:787
 msgid "Engine"
 msgstr ""
 
-#: src/LogbookOptions.cpp:818
+#: src/LogbookOptions.cpp:794
 msgid "PropShaft"
 msgstr ""
 
-#: src/LogbookOptions.cpp:822
+#: src/LogbookOptions.cpp:798
 msgid "S"
 msgstr ""
 
-#: src/LogbookOptions.cpp:825
+#: src/LogbookOptions.cpp:801
 msgid "Revolutions"
 msgstr ""
 
-#: src/LogbookOptions.cpp:829
+#: src/LogbookOptions.cpp:805
 msgid "RPM"
 msgstr ""
 
-#: src/LogbookOptions.cpp:837 src/LogbookOptions.cpp:841
+#: src/LogbookOptions.cpp:813 src/LogbookOptions.cpp:817
 msgid "Day(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:844
+#: src/LogbookOptions.cpp:820 src/LogbookOptions.cpp:824
 msgid "Week(s)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:848
-msgid "Weeks(s)"
-msgstr ""
-
-#: src/LogbookOptions.cpp:851
+#: src/LogbookOptions.cpp:827
 msgid "Month "
 msgstr ""
 
-#: src/LogbookOptions.cpp:863
+#: src/LogbookOptions.cpp:839
 msgid "If GPS off use for manual entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:875
+#: src/LogbookOptions.cpp:851
 msgid "Windspeed "
 msgstr ""
 
-#: src/LogbookOptions.cpp:889
+#: src/LogbookOptions.cpp:865
 msgid " Direction "
 msgstr ""
 
-#: src/LogbookOptions.cpp:893
+#: src/LogbookOptions.cpp:869
 msgid "Relative"
 msgstr ""
 
-#: src/LogbookOptions.cpp:908 src/LogbookOptions.cpp:1221
+#: src/LogbookOptions.cpp:884 src/LogbookOptions.cpp:1197
 msgid "Abbreviations"
 msgstr ""
 
-#: src/LogbookOptions.cpp:928
+#: src/LogbookOptions.cpp:904
 msgid "Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:933
+#: src/LogbookOptions.cpp:909
 #, c-format
 msgid "to use MS-Word, append %s like this:\n"
 "\"C:\\yourPathToWinword\\WINWORD.EXE\" %s"
 msgstr ""
 
-#: src/LogbookOptions.cpp:940
+#: src/LogbookOptions.cpp:916
 msgid "Path to Datamanager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:954
+#: src/LogbookOptions.cpp:930
 msgid "Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:968
+#: src/LogbookOptions.cpp:944
 msgid "Path to HTML-Editor\n"
 "(optional)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:980
+#: src/LogbookOptions.cpp:956
 msgid "Reset Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:986
+#: src/LogbookOptions.cpp:962
 msgid "Paths"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1016
+#: src/LogbookOptions.cpp:992
 msgid "Show"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1037
+#: src/LogbookOptions.cpp:1013
 msgid "Set Linewidth to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1041
+#: src/LogbookOptions.cpp:1017
 msgid "4"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1047
+#: src/LogbookOptions.cpp:1023
 msgid "Set Transparency to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "transparent"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1051
+#: src/LogbookOptions.cpp:1027
 msgid "solid"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1060
+#: src/LogbookOptions.cpp:1036
 msgid "Set Route-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "white"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "black"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "red"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1064 src/LogbookOptions.cpp:1077
+#: src/LogbookOptions.cpp:1040 src/LogbookOptions.cpp:1053
 msgid "yellow"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1073
+#: src/LogbookOptions.cpp:1049
 msgid "Set Track-Linecolor to"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1088
+#: src/LogbookOptions.cpp:1064
 msgid "KML"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1098
+#: src/LogbookOptions.cpp:1074
 msgid "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1117
+#: src/LogbookOptions.cpp:1093
 msgid "Check"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1119
+#: src/LogbookOptions.cpp:1095
 msgid "Start your engine(s) and hit the button.\n"
 "You should see the ERRPM-Sentence\n"
 "left to the button"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1125
+#: src/LogbookOptions.cpp:1101
 msgid "Engine-No. corresponds with column Engine #1"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1127 src/LogbookOptions.cpp:1140
+#: src/LogbookOptions.cpp:1103 src/LogbookOptions.cpp:1116
 msgid "Check this box if the NMEA stream contains RPM messages for this engine\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1138
+#: src/LogbookOptions.cpp:1114
 msgid "Engine-No. corresponds with column Engine #2"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1152
+#: src/LogbookOptions.cpp:1128
 msgid "Engine-No. corresponds with column Generator"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1154
+#: src/LogbookOptions.cpp:1130
 msgid "Check this box if the NMEA stream contains RPM messages for this generator\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1167
+#: src/LogbookOptions.cpp:1143
 msgid "Use ERRPM-Sentence to calculate the engine-hours"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1176
+#: src/LogbookOptions.cpp:1152
 msgid "Use WIMDA-Sentence from the weatherstation"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1177
+#: src/LogbookOptions.cpp:1153
 msgid "For Barometer, Air Temperature and rel. Humidity"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1184
+#: src/LogbookOptions.cpp:1160
 msgid "NMEA"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1197
+#: src/LogbookOptions.cpp:1173
 msgid "Checkbox Space  >>"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1198
+#: src/LogbookOptions.cpp:1174
 msgid "Usefull for Tablet-PC's"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1202
+#: src/LogbookOptions.cpp:1178
 msgid "Abbreviations are shown in the Sails-Checkboxes\n"
 "The Name is used for the column \"Sails\" when added a new entry"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1249
+#: src/LogbookOptions.cpp:1225
 msgid "<<  Back"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1250
+#: src/LogbookOptions.cpp:1226
 msgid "Back to Sailnames"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1266
+#: src/LogbookOptions.cpp:1242
 msgid "Row +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1269
+#: src/LogbookOptions.cpp:1245
 msgid "Row -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1272
+#: src/LogbookOptions.cpp:1248
 msgid "Column +"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1275
+#: src/LogbookOptions.cpp:1251
 msgid "Column -"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1300
+#: src/LogbookOptions.cpp:1276
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1556
+#: src/LogbookOptions.cpp:1532
 msgid "Your Generator is still running .\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1672
+#: src/LogbookOptions.cpp:1648
 msgid "Your Engine #1 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1697
+#: src/LogbookOptions.cpp:1673
 msgid "Your Engine #2 is running in manual mode.\n\n"
 "Engine stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1722
+#: src/LogbookOptions.cpp:1698
 msgid "Your Generator is running in manual mode.\n\n"
 "Generator stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:1928
+#: src/LogbookOptions.cpp:1904
 msgid "Your Country has 24 Hour Format.\n"
 "In this case the OS doen't serve AM/PM-Strings.\n"
 msgstr ""
 
-#: src/LogbookOptions.cpp:1994
+#: src/LogbookOptions.cpp:1970
 #, c-format
 msgid "You cannot set this dateformat.\n\n"
 "%s%s%s%s%s\n\n"
 "Please use a different Dateformat in all three Choiceboxes."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2027 src/LogbookOptions.cpp:2030
+#: src/LogbookOptions.cpp:2002
 msgid "Please fill in one character in Degrees, Minutes and Seconds"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2239
+#: src/LogbookOptions.cpp:2214
 msgid "Your Engine #2 is still running .\n\n"
 "Engine #2 stopped now."
 msgstr ""
 
-#: src/LogbookOptions.cpp:2433
+#: src/LogbookOptions.cpp:2410
 msgid "Set Path to HTML-Editor"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2447
+#: src/LogbookOptions.cpp:2424
 msgid "Set Path to DataManager"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2461
+#: src/LogbookOptions.cpp:2438
 msgid "Set Path to MailClient"
 msgstr ""
 
-#: src/LogbookOptions.cpp:2475
+#: src/LogbookOptions.cpp:2452
 msgid "Set Path to ODT-Editor"
 msgstr ""
 
-#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:352 src/LogbookHTML.cpp:771
-#: src/CrewList.cpp:1851 src/CrewList.cpp:1867 src/CrewList.cpp:2210
-#: src/CrewList.cpp:2247
+#: src/LogbookHTML.cpp:191 src/LogbookHTML.cpp:347 src/LogbookHTML.cpp:800
+#: src/CrewList.cpp:1876 src/CrewList.cpp:1892 src/CrewList.cpp:2257
+#: src/CrewList.cpp:2294
 msgid "from"
 msgstr ""
 
-#: src/LogbookHTML.cpp:193 src/LogbookHTML.cpp:353 src/LogbookHTML.cpp:772
-#: src/CrewList.cpp:1852 src/CrewList.cpp:1868 src/CrewList.cpp:2211
-#: src/CrewList.cpp:2248
+#: src/LogbookHTML.cpp:192 src/LogbookHTML.cpp:348 src/LogbookHTML.cpp:801
+#: src/CrewList.cpp:1877 src/CrewList.cpp:1893 src/CrewList.cpp:2258
+#: src/CrewList.cpp:2295
 msgid "to"
 msgstr ""
 
-#: src/LogbookHTML.cpp:297 src/LogbookHTML.cpp:299 src/LogbookHTML.cpp:739
-#: src/LogbookHTML.cpp:741 src/CrewList.cpp:1762 src/CrewList.cpp:2148
-#: src/boat.cpp:286 src/boat.cpp:546
+#: src/LogbookHTML.cpp:295 src/LogbookHTML.cpp:775 src/CrewList.cpp:1787
+#: src/CrewList.cpp:2195 src/boat.cpp:290 src/boat.cpp:550
 msgid "Sorry, no Layout installed"
 msgstr ""
 
-#: src/LogbookHTML.cpp:406 src/LogbookHTML.cpp:408 src/CrewList.cpp:2489
+#: src/LogbookHTML.cpp:400 src/CrewList.cpp:2539
 msgid "Sorry, Logbook has no lines"
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "\n"
 "not found in layoutfile "
 msgstr ""
 
-#: src/LogbookHTML.cpp:636 src/LogbookHTML.cpp:639
+#: src/LogbookHTML.cpp:677
 msgid "!\n\n"
 "Did you forget to add this line in your layout ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:751 src/LogbookHTML.cpp:753
+#: src/LogbookHTML.cpp:783
 msgid "Have You forgotten to enclose the Header with [[ and ]]\n"
 " or Data with {{ and }} ?"
 msgstr ""
 
-#: src/LogbookHTML.cpp:1288
+#: src/LogbookHTML.cpp:1317
 msgid "Routepoints"
 msgstr ""
 
-#: src/CrewList.cpp:113
+#: src/CrewList.cpp:114
 msgid "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes"
 msgstr ""
 
-#: src/CrewList.cpp:114
+#: src/CrewList.cpp:115
 msgid "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist"
 msgstr ""
 
-#: src/CrewList.cpp:115
+#: src/CrewList.cpp:116
 msgid "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate"
 msgstr ""
 
-#: src/CrewList.cpp:116
+#: src/CrewList.cpp:117
 msgid "All changes depending to this day only."
 msgstr ""
 
-#: src/CrewList.cpp:184 src/CrewList.cpp:216 src/CrewList.cpp:339
-#: src/CrewList.cpp:348 src/Maintenance.cpp:105 src/Maintenance.cpp:202
-#: src/Maintenance.cpp:214 src/Maintenance.cpp:577
+#: src/CrewList.cpp:189 src/CrewList.cpp:227 src/CrewList.cpp:355
+#: src/CrewList.cpp:364 src/Maintenance.cpp:105 src/Maintenance.cpp:202
+#: src/Maintenance.cpp:214 src/Maintenance.cpp:594
 msgid "Yes"
 msgstr ""
 
-#: src/CrewList.cpp:2095
+#: src/CrewList.cpp:2142
 msgid "Adress"
 msgstr ""
 
-#: src/Maintenance.h:145
+#: src/Maintenance.h:148
 msgid "Select a date"
 msgstr ""
 
@@ -2508,8 +2521,8 @@
 msgid "Date + Months"
 msgstr ""
 
-#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1051
-#: src/Maintenance.cpp:1055
+#: src/Maintenance.cpp:106 src/Maintenance.cpp:202 src/Maintenance.cpp:1068
+#: src/Maintenance.cpp:1072
 msgid "No"
 msgstr ""
 
@@ -2517,16 +2530,16 @@
 msgid "Logbook until "
 msgstr ""
 
-#: src/OverView.cpp:906
+#: src/OverView.cpp:1039
 msgid "Logbook Total"
 msgstr ""
 
-#: src/OverView.cpp:1101
+#: src/OverView.cpp:1234
 #, c-format
 msgid "%i Year(s) %i Month(s) %i Day(s)"
 msgstr ""
 
-#: src/OverView.cpp:1104
+#: src/OverView.cpp:1237
 msgid "%E Week(s) %D Day(s) %H:%M "
 msgstr ""
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/boat.cpp opencpn-plugin-logbookkonni-1.2024/src/boat.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/boat.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/boat.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -1,6 +1,6 @@
 //#pragma once
 #ifndef WX_PRECOMP
-      #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 
 #include "boat.h"
@@ -11,1149 +11,1153 @@
 
 #include <wx/textctrl.h>
 #include <wx/filefn.h>
-#include <wx/dir.h> 
+#include <wx/dir.h>
 #include <wx/event.h>
 #include <wx/object.h>
 #include <wx/tokenzr.h>
 #include <wx/filename.h>
-#include <wx/wfstream.h> 
-#include <wx/txtstrm.h> 
-#include <wx/zipstrm.h> 
+#include <wx/wfstream.h>
+#include <wx/txtstrm.h>
+#include <wx/zipstrm.h>
 #include <memory>
 using namespace std;
 
 
-Boat::Boat(LogbookDialog* d, wxString data, wxString lay, wxString layoutODT)
+Boat::Boat( LogbookDialog* d, wxString data, wxString lay, wxString layoutODT )
 {
-	parent = d;
-	modified = false;
-	this->layout = lay;
-	this->ODTLayout = layoutODT;
+    parent = d;
+    modified = false;
+    this->layout = lay;
+    this->ODTLayout = layoutODT;
 
-	createFiles(data,lay);
-	createTextCtrlConnections();
-	createStaticTextList();
+    createFiles( data,lay );
+    createTextCtrlConnections();
+    createStaticTextList();
 }
 
-Boat::~Boat(void)
+Boat::~Boat( void )
 {
-	saveData();
-	for(unsigned int i = 0; i < ctrl.GetCount(); i++)
-	{
-		if(ctrl[i]->IsKindOf(CLASSINFO(wxTextCtrl)))
-		{
-			ctrl[i]->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, 
-				wxCommandEventHandler(LogbookDialog::boatNameOnTextEnter),NULL,parent );
-		}
-	}
+    saveData();
+    for ( unsigned int i = 0; i < ctrl.GetCount(); i++ )
+    {
+        if ( ctrl[i]->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+        {
+            ctrl[i]->Disconnect( wxEVT_COMMAND_TEXT_UPDATED,
+                                 wxCommandEventHandler( LogbookDialog::boatNameOnTextEnter ),NULL,parent );
+        }
+    }
 
 }
 
-void Boat::setLayoutLocation(wxString loc)
+void Boat::setLayoutLocation( wxString loc )
 {
-	bool radio = parent->m_radioBtnHTMLBoat->GetValue();
-	if(radio)
-		layout_locn = layout;
-	else
-		layout_locn = ODTLayout;
-	wxString boatLay = layout_locn;
+    bool radio = parent->m_radioBtnHTMLBoat->GetValue();
+    if ( radio )
+        layout_locn = layout;
+    else
+        layout_locn = ODTLayout;
+    wxString boatLay = layout_locn;
 
-	layout_locn.Append(_T("boat"));
-	parent->appendOSDirSlash(&layout_locn);
+    layout_locn.Append( _T( "boat" ) );
+    parent->appendOSDirSlash( &layout_locn );
 
-	parent->loadLayoutChoice(LogbookDialog::BOAT,layout_locn,parent->boatChoice,parent->logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT]);
-	if(radio)
-		parent->boatChoice->SetSelection(parent->logbookPlugIn->opt->boatGridLayoutChoice);
-	else
-		parent->boatChoice->SetSelection(parent->logbookPlugIn->opt->boatGridLayoutChoiceODT);
+    parent->loadLayoutChoice( LogbookDialog::BOAT,layout_locn,parent->boatChoice,parent->logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT] );
+    if ( radio )
+        parent->boatChoice->SetSelection( parent->logbookPlugIn->opt->boatGridLayoutChoice );
+    else
+        parent->boatChoice->SetSelection( parent->logbookPlugIn->opt->boatGridLayoutChoiceODT );
 }
 
-void Boat::createFiles(wxString data, wxString lay)
+void Boat::createFiles( wxString data, wxString lay )
 {
-	data_locn = data;
-	data_locn.Append(_T("boat.txt"));
-	boatFile = new wxTextFile(data_locn);
-	wxFileName wxHomeFiledir = data_locn ;
+    data_locn = data;
+    data_locn.Append( _T( "boat.txt" ) );
+    boatFile = new wxTextFile( data_locn );
+    wxFileName wxHomeFiledir = data_locn ;
 
-	if(true != wxHomeFiledir.FileExists())
-	{				
-		boatFile->Create();
-	}
+    if ( true != wxHomeFiledir.FileExists() )
+    {
+        boatFile->Create();
+    }
 
-	equip_locn = data;
-	equip_locn.Append(_T("equipment.txt"));
-	equipFile = new wxTextFile(equip_locn);
-	wxHomeFiledir = equip_locn ;
+    equip_locn = data;
+    equip_locn.Append( _T( "equipment.txt" ) );
+    equipFile = new wxTextFile( equip_locn );
+    wxHomeFiledir = equip_locn ;
 
-	if(true != wxHomeFiledir.FileExists())
-	{				
-		equipFile->Create();
-	}
+    if ( true != wxHomeFiledir.FileExists() )
+    {
+        equipFile->Create();
+    }
 
-	setLayoutLocation(lay);
+    setLayoutLocation( lay );
 }
 
 void Boat::createTextCtrlConnections()
 {
-	wxWindowList l = parent->m_panel72->GetWindowChildren();
+    wxWindowList l = parent->m_panel72->GetWindowChildren();
 
-	for(unsigned int i = 0; i < l.GetCount(); i++)
-	{
-		if(l[i]->IsKindOf(CLASSINFO(wxTextCtrl)))
-		{
-			l[i]->Connect( wxEVT_COMMAND_TEXT_UPDATED, 
-				wxCommandEventHandler(LogbookDialog::boatNameOnTextEnter),NULL,parent);		
-			ctrl.Append(l[i]);
-		}
-	}
+    for ( unsigned int i = 0; i < l.GetCount(); i++ )
+    {
+        if ( l[i]->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+        {
+            l[i]->Connect( wxEVT_COMMAND_TEXT_UPDATED,
+                           wxCommandEventHandler( LogbookDialog::boatNameOnTextEnter ),NULL,parent );
+            ctrl.Append( l[i] );
+        }
+    }
 }
 
 void Boat::createStaticTextList()
 {
-	wxWindowList l = parent->m_panel72->GetWindowChildren();
+    wxWindowList l = parent->m_panel72->GetWindowChildren();
 
-	for(unsigned int i = 0; i < l.GetCount(); i++)
-	{
-		if(l[i]->IsKindOf(CLASSINFO(wxStaticText)))
-			ctrlStaticText.Append(l[i]);
-	}
+    for ( unsigned int i = 0; i < l.GetCount(); i++ )
+    {
+        if ( l[i]->IsKindOf( CLASSINFO( wxStaticText ) ) )
+            ctrlStaticText.Append( l[i] );
+    }
 }
 
 void Boat::loadData()
 {
-	wxString line;
-	
-	boatFile->Open();
-
-	if(boatFile->GetLineCount() > 0) 
-	{
-		line = boatFile->GetLine(0);
-		if(line.Contains(_T("#1.2#")))
-			line = boatFile->GetLine(1);
-
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY );
-		
-		int c = 0;
-
-		while ( tkz.HasMoreTokens() )
-		{
-			wxString s;
-			s += tkz.GetNextToken().RemoveLast();
-			s = parent->restoreDangerChar(s);
-			if(c == 18)
-				s = parent->maintenance->getDateString(s);
-			wxTextCtrl* t = wxDynamicCast(ctrl[c++], wxTextCtrl);
-			t->ChangeValue(s);	
-		}
-	}
-	boatFile->Close();
-
-	equipFile->Open();
-	if(equipFile->GetLineCount() <= 0) { equipFile->Close(); return; }
-	if(parent->m_gridEquipment->GetNumberRows() > 0)
-		parent->m_gridEquipment->DeleteRows(0,parent->m_gridEquipment->GetNumberRows()-1);
-
-	for(unsigned int i = 0; i <  equipFile->GetLineCount(); i++)
-	{
-		line = 	equipFile->GetLine(i);
-
-		parent->m_gridEquipment->AppendRows();
-
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY );
-		int c = 0;
-
-		while ( tkz.HasMoreTokens() )
-		{
-			wxString s;
-			s = tkz.GetNextToken().RemoveLast();
-			s = parent->restoreDangerChar(s);
-			parent->m_gridEquipment->SetCellValue(i,c++,s);
-		}
-	}
-	equipFile->Close();
+    wxString line;
+
+    boatFile->Open();
+
+    if ( boatFile->GetLineCount() > 0 )
+    {
+        line = boatFile->GetLine( 0 );
+        if ( line.Contains( _T( "#1.2#" ) ) )
+            line = boatFile->GetLine( 1 );
+
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+
+        int c = 0;
+
+        while ( tkz.HasMoreTokens() )
+        {
+            wxString s;
+            s += tkz.GetNextToken().RemoveLast();
+            s = parent->restoreDangerChar( s );
+            if ( c == 18 )
+                s = parent->maintenance->getDateString( s );
+            wxTextCtrl* t = wxDynamicCast( ctrl[c++], wxTextCtrl );
+            t->ChangeValue( s );
+        }
+    }
+    boatFile->Close();
+
+    equipFile->Open();
+    if ( equipFile->GetLineCount() <= 0 )
+    {
+        equipFile->Close();
+        return;
+    }
+    if ( parent->m_gridEquipment->GetNumberRows() > 0 )
+        parent->m_gridEquipment->DeleteRows( 0,parent->m_gridEquipment->GetNumberRows()-1 );
+
+    for ( unsigned int i = 0; i <  equipFile->GetLineCount(); i++ )
+    {
+        line = 	equipFile->GetLine( i );
+
+        parent->m_gridEquipment->AppendRows();
+
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        int c = 0;
+
+        while ( tkz.HasMoreTokens() )
+        {
+            wxString s;
+            s = tkz.GetNextToken().RemoveLast();
+            s = parent->restoreDangerChar( s );
+            parent->m_gridEquipment->SetCellValue( i,c++,s );
+        }
+    }
+    equipFile->Close();
 }
 
 void Boat::saveData()
 {
-	if(!modified) return;
-	modified = false;
+    if ( !modified ) return;
+    modified = false;
+
+    wxString t,s;
 
-	wxString t,s;
+    boatFile->Open();
+    boatFile->Clear();
 
-	boatFile->Open();
-	boatFile->Clear();
+    for ( unsigned int i = 0; i < ctrl.GetCount(); i++ )
+    {
+        if ( ctrl[i]->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+        {
+            wxTextCtrl* te = wxDynamicCast( ctrl[i], wxTextCtrl );
+            wxString temp = te->GetValue();
+            temp = parent->replaceDangerChar( temp );
+            if ( i == 18 && ( !temp.IsEmpty() && temp.GetChar( 0 ) != ' ' ) )
+            {
+                wxDateTime dt;
+                parent->myParseDate( temp,dt );
+                t += wxString::Format( _T( "%i/%i/%i \t" ),dt.GetMonth(), dt.GetDay(), dt.GetYear() );
+            }
+            else
+                t += temp+wxT( " \t" );
+        }
+    }
+    t.RemoveLast();
 
-	for(unsigned int i = 0; i < ctrl.GetCount(); i++)
-	{
-		if(ctrl[i]->IsKindOf(CLASSINFO(wxTextCtrl)))
-		{
-			wxTextCtrl* te = wxDynamicCast(ctrl[i], wxTextCtrl);
-			wxString temp = te->GetValue();
-			temp = parent->replaceDangerChar(temp);	
-			if(i == 18 && (!temp.IsEmpty() && temp.GetChar(0) != ' '))
-			{
-				wxDateTime dt;
-				parent->myParseDate(temp,dt);
-				t += wxString::Format(_T("%i/%i/%i \t"),dt.GetMonth(), dt.GetDay(), dt.GetYear());
-			}
-			else
-				t += temp+wxT(" \t");
-		}
-	}
-	t.RemoveLast();
-
-	boatFile->AddLine(t);
-	boatFile->Write();
-	boatFile->Close();
-
-	equipFile->Open();
-	equipFile->Clear();
-
-	int count = parent->m_gridEquipment->GetNumberRows();
-	for(int r = 0; r < count; r++)
-	{
-		s = _T("");
-		for(int i= 0; i < parent->m_gridEquipment->GetNumberCols(); i++)
-		{
-			s += parent->replaceDangerChar(
-						 parent->m_gridEquipment->GetCellValue(r,i))
-				+wxT(" \t");
-		}
-		equipFile->AddLine(s);
-	}
-
-	equipFile->Write();
-	equipFile->Close();
+    boatFile->AddLine( t );
+    boatFile->Write();
+    boatFile->Close();
+
+    equipFile->Open();
+    equipFile->Clear();
+
+    int count = parent->m_gridEquipment->GetNumberRows();
+    for ( int r = 0; r < count; r++ )
+    {
+        s = _T( "" );
+        for ( int i= 0; i < parent->m_gridEquipment->GetNumberCols(); i++ )
+        {
+            s += parent->replaceDangerChar(
+                     parent->m_gridEquipment->GetCellValue( r,i ) )
+                 +wxT( " \t" );
+        }
+        equipFile->AddLine( s );
+    }
+
+    equipFile->Write();
+    equipFile->Close();
 }
 
-wxString Boat::readLayoutFileODT(wxString layout)
+wxString Boat::readLayoutFileODT( wxString layout )
 {
-	wxString odt = _T("");
+    wxString odt = _T( "" );
 
-	wxString filename = layout_locn + layout + _T(".odt");
+    wxString filename = layout_locn + layout + _T( ".odt" );
 
-	if(wxFileExists(filename))
-	{
+    if ( wxFileExists( filename ) )
+    {
 //#ifdef __WXOSX__
         auto_ptr<wxZipEntry> entry;
-        static const wxString fn = _T("content.xml");
-        wxString name = wxZipEntry::GetInternalName(fn);
-        wxFFileInputStream in(filename);
-        wxZipInputStream zip(in);
+        static const wxString fn = _T( "content.xml" );
+        wxString name = wxZipEntry::GetInternalName( fn );
+        wxFFileInputStream in( filename );
+        wxZipInputStream zip( in );
         do
         {
-            entry.reset(zip.GetNextEntry());
+            entry.reset( zip.GetNextEntry() );
         }
-        while (entry.get() != NULL && entry->GetInternalName() != name);
-        if (entry.get() != NULL)
+        while ( entry.get() != NULL && entry->GetInternalName() != name );
+        if ( entry.get() != NULL )
         {
-            wxTextInputStream txt(zip,_T("\n"),wxConvUTF8);
-            while(!zip.Eof())
-	            odt += txt.ReadLine();
+            wxTextInputStream txt( zip,_T( "\n" ),wxConvUTF8 );
+            while ( !zip.Eof() )
+                odt += txt.ReadLine();
         }
 //#else
-	/*	static const wxString fn = _T("content.xml");
-		wxFileInputStream in(filename);
-		wxZipInputStream zip(in);
-		wxTextInputStream txt(zip);
-		while(!zip.Eof())
-			odt += txt.ReadLine();*/
+        /*	static const wxString fn = _T("content.xml");
+        	wxFileInputStream in(filename);
+        	wxZipInputStream zip(in);
+        	wxTextInputStream txt(zip);
+        	while(!zip.Eof())
+        		odt += txt.ReadLine();*/
 //#endif
-	}
-	return odt;
+    }
+    return odt;
+}
+
+void Boat::viewODT( wxString path,wxString layout,bool mode )
+{
+    if ( parent->logbookPlugIn->opt->filterLayout[LogbookDialog::BOAT] )
+        layout.Prepend( parent->logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT] );
+
+    toODT( path, layout, mode );
+    if ( layout != _T( "" ) )
+    {
+        wxString fn = data_locn;
+        fn.Replace( _T( "txt" ),_T( "odt" ) );
+        parent->startApplication( fn,_T( ".odt" ) );
+    }
 }
 
-void Boat::viewODT(wxString path,wxString layout,bool mode)
+wxString Boat::toODT( wxString path,wxString layout,bool mode )
 {
-	if(parent->logbookPlugIn->opt->filterLayout[LogbookDialog::BOAT])
-        layout.Prepend(parent->logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT]);
+    wxString s, odt;
+
+    if ( layout == _T( "" ) )
+    {
+        wxMessageBox( _( "Sorry, no Layout installed" ),_( "Information" ),wxOK );
+        return _T( "" );
+    }
+
+    saveData();
+
+    odt = readLayoutFileODT( layout );
+
+    for ( unsigned int i = 0; i < ctrl.GetCount(); i++ )
+    {
+        if ( ctrl[i]->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+        {
+            wxTextCtrl* te = wxDynamicCast( ctrl[i], wxTextCtrl );
+
+            switch ( i )
+            {
+            case 0:
+                odt.Replace( wxT( "#BOATNAME#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LBOATNAME#" ),Export::replaceNewLine( true,parent->bname->GetLabel(),true ) );
+                break;
+            case 1:
+                odt.Replace( wxT( "#HOMEPORT#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LHOMEPORT#" ),Export::replaceNewLine( true,parent->m_staticText114->GetLabel(),true ) );
+                break;
+            case 2:
+                odt.Replace( wxT( "#CALLSIGN#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LCALLSIGN#" ),Export::replaceNewLine( true,parent->m_staticText115->GetLabel(),true ) );
+                break;
+            case 3:
+                odt.Replace( wxT( "#HIN#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LHIN#" ),Export::replaceNewLine( true,parent->m_staticText116->GetLabel(),true ) );
+                break;
+            case 4:
+                odt.Replace( wxT( "#SAILNO#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LSAILNO#" ),Export::replaceNewLine( true,parent->m_staticText117->GetLabel(),true ) );
+                break;
+            case 6:
+                odt.Replace( wxT( "#REGISTRATION#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LREGISTRATION#" ),Export::replaceNewLine( true,parent->m_staticText118->GetLabel(),true ) );
+                break;
+            case 5:
+                odt.Replace( wxT( "#INSURANCE#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LINSURANCE#" ),Export::replaceNewLine( true,parent->m_staticText119->GetLabel(),true ) );
+                break;
+            case 7:
+                odt.Replace( wxT( "#POLICY#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LPOLICY#" ),Export::replaceNewLine( true,parent->m_staticText120->GetLabel(),true ) );
+                break;
+            case 8:
+                odt.Replace( wxT( "#MMSI#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LMMSI#" ),Export::replaceNewLine( true,parent->m_staticText53->GetLabel(),true ) );
+                break;
+            case 9:
+                odt.Replace( wxT( "#ONAME#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LONAME#" ),Export::replaceNewLine( true,parent->m_staticText90->GetLabel(),true ) );
+                break;
+            case 10:
+                odt.Replace( wxT( "#OFIRST#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LOFIRST#" ),Export::replaceNewLine( true,parent->m_staticText91->GetLabel(),true ) );
+                break;
+            case 11:
+                odt.Replace( wxT( "#TELEPHONE#" ),Export::replaceNewLine( true,te->GetValue(), false ) );
+                odt.Replace( wxT( "#LTELEPHONE#" ),Export::replaceNewLine( true,parent->m_staticText95->GetLabel(),true ) );
+                break;
+            case 12:
+                odt.Replace( wxT( "#STREET#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LSTREET#" ),Export::replaceNewLine( true,parent->m_staticText92->GetLabel(),true ) );
+                break;
+            case 13:
+                odt.Replace( wxT( "#ZIP#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LZIP#" ),Export::replaceNewLine( true,parent->m_staticText93->GetLabel(),true ) );
+                break;
+            case 14:
+                odt.Replace( wxT( "#TOWN#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LTOWN#" ),Export::replaceNewLine( true,parent->m_staticText94->GetLabel(),true ) );
+                break;
+            case 15:
+                odt.Replace( wxT( "#TYPE#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LTYPE#" ),Export::replaceNewLine( true,parent->m_staticText128->GetLabel(),true ) );
+                break;
+            case 16:
+                odt.Replace( wxT( "#BUILDER#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LBUILDER#" ),Export::replaceNewLine( true,parent->m_staticText125->GetLabel(),true ) );
+                break;
+            case 17:
+                odt.Replace( wxT( "#HULL#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LHULL#" ),Export::replaceNewLine( true,parent->m_staticText124->GetLabel(),true ) );
+                break;
+            case 18:
+                odt.Replace( wxT( "#LAUNCHED#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LLAUNCHED#" ),Export::replaceNewLine( true,parent->m_staticText126->GetLabel(),true ) );
+                break;
+            case 19:
+                odt.Replace( wxT( "#YARDNO#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LYARDNO#" ),Export::replaceNewLine( true,parent->m_staticText127->GetLabel(),true ) );
+                break;
+            case 20:
+                odt.Replace( wxT( "#DESIGNER#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LDESIGNER#" ),Export::replaceNewLine( true,parent->m_staticText123->GetLabel(),true ) );
+                break;
+            case 21:
+                odt.Replace( wxT( "#CONSTRUCT#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LCONSTRUCT#" ),Export::replaceNewLine( true,parent->m_staticText129->GetLabel(),true ) );
+                break;
+            case 22:
+                odt.Replace( wxT( "#LOA#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LLOA#" ),Export::replaceNewLine( true,parent->m_staticText106->GetLabel(),true ) );
+                break;
+            case 23:
+                odt.Replace( wxT( "#LOD#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LLOD#" ),Export::replaceNewLine( true,parent->m_staticText107->GetLabel(),true ) );
+                break;
+            case 24:
+                odt.Replace( wxT( "#LWL#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LLWL#" ),Export::replaceNewLine( true,parent->m_staticText108->GetLabel(),true ) );
+                break;
+            case 25:
+                odt.Replace( wxT( "#BEAM#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LBEAM#" ),Export::replaceNewLine( true,parent->m_staticText109->GetLabel(),true ) );
+                break;
+            case 26:
+                odt.Replace( wxT( "#DRAFT#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LDRAFT#" ),Export::replaceNewLine( true,parent->m_staticText110->GetLabel(),true ) );
+                break;
+            case 27:
+                odt.Replace( wxT( "#LUSER1#" ),Export::replaceNewLine( true,parent->UserLabel1->GetValue(),true ) );
+                break;
+            case 28:
+                odt.Replace( wxT( "#USER1#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                break;
+            case 29:
+                odt.Replace( wxT( "#LUSER2#" ),Export::replaceNewLine( true,parent->UserLabel2->GetValue(),true ) );
+                break;
+            case 30:
+                odt.Replace( wxT( "#USER2#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                break;
+            case 31:
+                odt.Replace( wxT( "#LUSER3#" ),Export::replaceNewLine( true,parent->UserLabel3->GetValue(),true ) );
+                break;
+            case 32:
+                odt.Replace( wxT( "#USER3#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                break;
+            case 33:
+                odt.Replace( wxT( "#DISPL#" ),Export::replaceNewLine( true,te->GetValue(),false ) );
+                odt.Replace( wxT( "#LDISPL#" ),Export::replaceNewLine( true,parent->m_staticText122->GetLabel(),true ) );
+                break;
+            }
+        }
+    }
 
-    toODT(path, layout, mode);
-	if(layout != _T(""))
-	{
-	    wxString fn = data_locn;
-	    fn.Replace(_T("txt"),_T("odt"));
-		parent->startApplication(fn,_T(".odt"));
-	}
-}
-
-wxString Boat::toODT(wxString path,wxString layout,bool mode)
-{
-	wxString s, odt;
-
-	if(layout == _T(""))
-	{
-		wxMessageBox(_("Sorry, no Layout installed"),_("Information"),wxOK);
-		return _T("");
-	}
-
-	saveData();
-
-	odt = readLayoutFileODT(layout);
-
-	for(unsigned int i = 0; i < ctrl.GetCount(); i++)
-	{
-		if(ctrl[i]->IsKindOf(CLASSINFO(wxTextCtrl)))
-		{
-			wxTextCtrl* te = wxDynamicCast(ctrl[i], wxTextCtrl);
-
-			switch(i)
-			{
-			case 0: 
-				odt.Replace(wxT("#BOATNAME#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LBOATNAME#"),Export::replaceNewLine(true,parent->bname->GetLabel(),true));
-				break;
-			case 1: 
-				odt.Replace(wxT("#HOMEPORT#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LHOMEPORT#"),Export::replaceNewLine(true,parent->m_staticText114->GetLabel(),true));
-				break;
-			case 2: 
-				odt.Replace(wxT("#CALLSIGN#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LCALLSIGN#"),Export::replaceNewLine(true,parent->m_staticText115->GetLabel(),true));
-				break;
-			case 3: 
-				odt.Replace(wxT("#HIN#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LHIN#"),Export::replaceNewLine(true,parent->m_staticText116->GetLabel(),true));
-				break;
-			case 4: 
-				odt.Replace(wxT("#SAILNO#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LSAILNO#"),Export::replaceNewLine(true,parent->m_staticText117->GetLabel(),true));
-				break;
-			case 6: 
-				odt.Replace(wxT("#REGISTRATION#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LREGISTRATION#"),Export::replaceNewLine(true,parent->m_staticText118->GetLabel(),true));
-				break;
-			case 5: 
-				odt.Replace(wxT("#INSURANCE#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LINSURANCE#"),Export::replaceNewLine(true,parent->m_staticText119->GetLabel(),true));
-				break;
-			case 7: 
-				odt.Replace(wxT("#POLICY#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LPOLICY#"),Export::replaceNewLine(true,parent->m_staticText120->GetLabel(),true));
-				break;
-			case 8: 
-				odt.Replace(wxT("#MMSI#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LMMSI#"),Export::replaceNewLine(true,parent->m_staticText53->GetLabel(),true));
-				break;
-			case 9: 
-				odt.Replace(wxT("#ONAME#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LONAME#"),Export::replaceNewLine(true,parent->m_staticText90->GetLabel(),true));
-				break;
-			case 10: 
-				odt.Replace(wxT("#OFIRST#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LOFIRST#"),Export::replaceNewLine(true,parent->m_staticText91->GetLabel(),true));
-				break;
-			case 11: 
-				odt.Replace(wxT("#TELEPHONE#"),Export::replaceNewLine(true,te->GetValue(), false));
-				odt.Replace(wxT("#LTELEPHONE#"),Export::replaceNewLine(true,parent->m_staticText95->GetLabel(),true));
-				break;
-			case 12: 
-				odt.Replace(wxT("#STREET#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LSTREET#"),Export::replaceNewLine(true,parent->m_staticText92->GetLabel(),true));
-				break;
-			case 13: 
-				odt.Replace(wxT("#ZIP#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LZIP#"),Export::replaceNewLine(true,parent->m_staticText93->GetLabel(),true));
-				break;
-			case 14: 
-				odt.Replace(wxT("#TOWN#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LTOWN#"),Export::replaceNewLine(true,parent->m_staticText94->GetLabel(),true));
-				break;
-			case 15: 
-				odt.Replace(wxT("#TYPE#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LTYPE#"),Export::replaceNewLine(true,parent->m_staticText128->GetLabel(),true));
-				break;
-			case 16: 
-				odt.Replace(wxT("#BUILDER#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LBUILDER#"),Export::replaceNewLine(true,parent->m_staticText125->GetLabel(),true));
-				break;
-			case 17: 
-				odt.Replace(wxT("#HULL#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LHULL#"),Export::replaceNewLine(true,parent->m_staticText124->GetLabel(),true));
-				break;
-			case 18: 
-				odt.Replace(wxT("#LAUNCHED#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LLAUNCHED#"),Export::replaceNewLine(true,parent->m_staticText126->GetLabel(),true));
-				break;
-			case 19:
-				odt.Replace(wxT("#YARDNO#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LYARDNO#"),Export::replaceNewLine(true,parent->m_staticText127->GetLabel(),true));
-				break;
-			case 20:
-				odt.Replace(wxT("#DESIGNER#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LDESIGNER#"),Export::replaceNewLine(true,parent->m_staticText123->GetLabel(),true));
-				break;
-			case 21: 
-				odt.Replace(wxT("#CONSTRUCT#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LCONSTRUCT#"),Export::replaceNewLine(true,parent->m_staticText129->GetLabel(),true));
-				break;
-			case 22: 
-				odt.Replace(wxT("#LOA#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LLOA#"),Export::replaceNewLine(true,parent->m_staticText106->GetLabel(),true));
-				break;
-			case 23:
-				odt.Replace(wxT("#LOD#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LLOD#"),Export::replaceNewLine(true,parent->m_staticText107->GetLabel(),true));
-				break;
-			case 24:
-				odt.Replace(wxT("#LWL#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LLWL#"),Export::replaceNewLine(true,parent->m_staticText108->GetLabel(),true));
-				break;
-			case 25: 
-				odt.Replace(wxT("#BEAM#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LBEAM#"),Export::replaceNewLine(true,parent->m_staticText109->GetLabel(),true));
-				break;
-			case 26: 
-				odt.Replace(wxT("#DRAFT#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LDRAFT#"),Export::replaceNewLine(true,parent->m_staticText110->GetLabel(),true));
-				break;
-			case 27: 
-				odt.Replace(wxT("#LUSER1#"),Export::replaceNewLine(true,parent->UserLabel1->GetValue(),true));
-				break;
-			case 28:
-				odt.Replace(wxT("#USER1#"),Export::replaceNewLine(true,te->GetValue(),false));
-				break;
-			case 29: 
-				odt.Replace(wxT("#LUSER2#"),Export::replaceNewLine(true,parent->UserLabel2->GetValue(),true));
-				break;
-			case 30:
-				odt.Replace(wxT("#USER2#"),Export::replaceNewLine(true,te->GetValue(),false));
-				break;
-			case 31: 
-				odt.Replace(wxT("#LUSER3#"),Export::replaceNewLine(true,parent->UserLabel3->GetValue(),true));
-				break;
-			case 32:
-				odt.Replace(wxT("#USER3#"),Export::replaceNewLine(true,te->GetValue(),false));
-				break;
-			case 33: 
-				odt.Replace(wxT("#DISPL#"),Export::replaceNewLine(true,te->GetValue(),false));
-				odt.Replace(wxT("#LDISPL#"),Export::replaceNewLine(true,parent->m_staticText122->GetLabel(),true));
-				break;
-			}
-		}
-	}
-
-	odt.Replace(_T("#LOWNER#"),Export::replaceNewLine(true,parent->sbSizer6->GetStaticBox()->GetLabel(),true));
-	if(odt.Contains(wxT("{{")))
-		odt = repeatAreaODT(odt);
-	
-	wxString fn = data_locn;
-	fn.Replace(_T("txt"),_T("odt"));
-	if(mode == false)
-	{
-		fn.Replace(wxT("txt"),wxT("odt"));
-	}
-	else
-		fn = path;
-
-	if(::wxFileExists(fn))
-		::wxRemoveFile(fn);
-
-    auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(layout_locn + layout + _T(".odt")));
-    wxTempFileOutputStream out(fn);
-
-    wxZipInputStream inzip(*in);
-    wxZipOutputStream outzip(out);
-	wxTextOutputStream odtFile(outzip);
+    odt.Replace( _T( "#LOWNER#" ),Export::replaceNewLine( true,parent->sbSizer6->GetStaticBox()->GetLabel(),true ) );
+    if ( odt.Contains( wxT( "{{" ) ) )
+        odt = repeatAreaODT( odt );
+
+    wxString fn = data_locn;
+    fn.Replace( _T( "txt" ),_T( "odt" ) );
+    if ( mode == false )
+    {
+        fn.Replace( wxT( "txt" ),wxT( "odt" ) );
+    }
+    else
+        fn = path;
+
+    if ( ::wxFileExists( fn ) )
+        ::wxRemoveFile( fn );
+
+    auto_ptr<wxFFileInputStream> in( new wxFFileInputStream( layout_locn + layout + _T( ".odt" ) ) );
+    wxTempFileOutputStream out( fn );
+
+    wxZipInputStream inzip( *in );
+    wxZipOutputStream outzip( out );
+    wxTextOutputStream odtFile( outzip );
     auto_ptr<wxZipEntry> entry;
 
-    outzip.CopyArchiveMetaData(inzip);
+    outzip.CopyArchiveMetaData( inzip );
 
-    while (entry.reset(inzip.GetNextEntry()), entry.get() != NULL)
-        if (!entry->GetName().Matches(_T("content.xml")))
-            if (!outzip.CopyEntry(entry.release(), inzip))
+    while ( entry.reset( inzip.GetNextEntry() ), entry.get() != NULL )
+        if ( !entry->GetName().Matches( _T( "content.xml" ) ) )
+            if ( !outzip.CopyEntry( entry.release(), inzip ) )
                 break;
 
     in.reset();
 
-	outzip.PutNextEntry(_T("content.xml"));
+    outzip.PutNextEntry( _T( "content.xml" ) );
+
+    odtFile << odt;
+
+    inzip.Eof() && outzip.Close() && out.Commit();
+    return fn;
+}
+
+wxString Boat::repeatAreaODT( wxString odt )
+{
+    wxString topODT;
+    wxString bottomODT;
+    wxString middleODT;
+
+    wxString seperatorTop = wxT( "{{" );
+    wxString seperatorBottom = wxT( "}}" );
+
+    int indexTop = odt.First( seperatorTop )+seperatorTop.Len();
+    int indexBottom = odt.First( seperatorBottom )+seperatorBottom.Len();
+
+    topODT = odt.substr( 0,indexTop );
+    middleODT = odt.substr( indexTop+9 );
+    indexTop = topODT.find_last_of( '<' );
+    topODT = odt.substr( 0,indexTop );
+    bottomODT = odt.substr( indexBottom,odt.Len()-1 );
+    indexBottom = bottomODT.find_first_of( '>' )+1;
+    bottomODT = bottomODT.substr( indexBottom,odt.Len()-1 );
+
+    middleODT.Replace( bottomODT,_T( "" ) );
+    indexBottom = middleODT.First( seperatorBottom )+seperatorBottom.Len();
+    middleODT = middleODT.substr( 0,indexBottom-1 );
+    indexBottom = middleODT.find_last_of( '<' );
+    middleODT = middleODT.substr( 0,indexBottom );
+
+    topODT.Replace( _T( "#LEQUIP#" ),parent->sbSizer12->GetStaticBox()->GetLabel() );
+    topODT.Replace( _T( "#LETYPE#" ),parent->m_gridEquipment->GetColLabelValue( 0 ) );
+    topODT.Replace( _T( "#LDISCRIPTION#" ),parent->m_gridEquipment->GetColLabelValue( 1 ) );
+    topODT.Replace( _T( "#LSERIAL#" ),parent->m_gridEquipment->GetColLabelValue( 2 ) );
+    topODT.Replace( _T( "#LREMARKS#" ),parent->m_gridEquipment->GetColLabelValue( 3 ) );
+
+    wxString newMiddleODT = _T( "" );
+    for ( int i = 0; i < parent->m_gridEquipment->GetNumberRows(); i++ )
+    {
+        wxString temp = middleODT;
+        for ( int c = 0; c < parent->m_gridEquipment->GetNumberCols(); c++ )
+        {
+            wxString text = parent->m_gridEquipment->GetCellValue( i,c );
 
-	odtFile << odt;
+            switch ( c )
+            {
+            case 0:
+                temp.Replace( _T( "#ETYPE#" ),text );
+                break;
+            case 1:
+                temp.Replace( _T( "#DISCRIPTION#" ),text );
+                break;
+            case 2:
+                temp.Replace( _T( "#SERIAL#" ),text );
+                break;
+            case 3:
+                temp.Replace( _T( "#REMARKS#" ),text );
+                break;
+            }
+        }
+        newMiddleODT += temp;
+    }
 
-	inzip.Eof() && outzip.Close() && out.Commit();
-	return fn;
+    odt = topODT + newMiddleODT + bottomODT;
+    return odt;
 }
 
-wxString Boat::repeatAreaODT(wxString odt)
-{
-	wxString topODT;
-	wxString bottomODT;
-	wxString middleODT;
-
-	wxString seperatorTop = wxT("{{");
-	wxString seperatorBottom = wxT("}}");
-
-	int indexTop = odt.First(seperatorTop)+seperatorTop.Len();
-	int indexBottom = odt.First(seperatorBottom)+seperatorBottom.Len();
-
-	topODT = odt.substr(0,indexTop);
-	middleODT = odt.substr(indexTop+9);
-	indexTop = topODT.find_last_of('<');
-	topODT = odt.substr(0,indexTop);
-	bottomODT = odt.substr(indexBottom,odt.Len()-1);
-	indexBottom = bottomODT.find_first_of('>')+1;
-	bottomODT = bottomODT.substr(indexBottom,odt.Len()-1);
-
-	middleODT.Replace(bottomODT,_T(""));
-	indexBottom = middleODT.First(seperatorBottom)+seperatorBottom.Len();
-	middleODT = middleODT.substr(0,indexBottom-1);
-	indexBottom = middleODT.find_last_of('<');
-	middleODT = middleODT.substr(0,indexBottom);
-
-	topODT.Replace(_T("#LEQUIP#"),parent->sbSizer12->GetStaticBox()->GetLabel());
-	topODT.Replace(_T("#LETYPE#"),parent->m_gridEquipment->GetColLabelValue(0));
-	topODT.Replace(_T("#LDISCRIPTION#"),parent->m_gridEquipment->GetColLabelValue(1));
-	topODT.Replace(_T("#LSERIAL#"),parent->m_gridEquipment->GetColLabelValue(2));
-	topODT.Replace(_T("#LREMARKS#"),parent->m_gridEquipment->GetColLabelValue(3));
-
-	wxString newMiddleODT = _T("");
-	for(int i = 0; i < parent->m_gridEquipment->GetNumberRows(); i++)
-	{
-		wxString temp = middleODT;
-		for(int c = 0; c < parent->m_gridEquipment->GetNumberCols(); c++)
-		{
-		wxString text = parent->m_gridEquipment->GetCellValue(i,c);
-
-		switch(c)
-		{
-			case 0: 		
-				temp.Replace(_T("#ETYPE#"),text);
-				break;
-			case 1: 		
-				temp.Replace(_T("#DISCRIPTION#"),text);
-				break;
-			case 2: 		
-				temp.Replace(_T("#SERIAL#"),text);
-				break;
-			case 3: 		
-				temp.Replace(_T("#REMARKS#"),text);
-				break;
-		}
-		}
-		newMiddleODT += temp;
-	}
-
-	odt = topODT + newMiddleODT + bottomODT;
-	return odt;
-}
-
-void Boat::toHTML(wxString path, wxString layout, bool mode)
-{
-	wxString s, html;
-
-	if(layout == _T(""))
-	{
-		wxMessageBox(_("Sorry, no Layout installed"),_("Information"),wxOK);
-		return;
-	}
-
-	saveData();
-
-	boatLayoutFile = new wxTextFile(layout_locn+layout+wxT(".html"));
-	boatLayoutFile->Open();
-
-	wxString fn = data_locn;
-	fn.Replace(_T("txt"),_T("html"));
-	if(mode == false)
-		boatHTMLFile = new wxFile(fn,wxFile::write);
-	else
-		boatHTMLFile = new wxFile(path,wxFile::write);
-
-	for(unsigned int i = 0; i < boatLayoutFile->GetLineCount(); i++)
-		html += boatLayoutFile->GetLine(i);
-	boatLayoutFile->Close();
-
-	for(unsigned int i = 0; i < ctrl.GetCount(); i++)
-	{
-		if(ctrl[i]->IsKindOf(CLASSINFO(wxTextCtrl)))
-		{
-			wxTextCtrl* te = wxDynamicCast(ctrl[i], wxTextCtrl);
-
-			switch(i)
-			{
-			case 0: 
-				html.Replace(wxT("#BOATNAME#"),te->GetValue());
-				html.Replace(wxT("#LBOATNAME#"),parent->bname->GetLabel());
-				break;
-			case 1: 
-				html.Replace(wxT("#HOMEPORT#"),te->GetValue());
-				html.Replace(wxT("#LHOMEPORT#"),parent->m_staticText114->GetLabel());
-				break;
-			case 2: 
-				html.Replace(wxT("#CALLSIGN#"),te->GetValue());
-				html.Replace(wxT("#LCALLSIGN#"),parent->m_staticText115->GetLabel());
-				break;
-			case 3: 
-				html.Replace(wxT("#HIN#"),te->GetValue());
-				html.Replace(wxT("#LHIN#"),parent->m_staticText116->GetLabel());
-				break;
-			case 4: 
-				html.Replace(wxT("#SAILNO#"),te->GetValue());
-				html.Replace(wxT("#LSAILNO#"),parent->m_staticText117->GetLabel());
-				break;
-			case 6: 
-				html.Replace(wxT("#REGISTRATION#"),te->GetValue());
-				html.Replace(wxT("#LREGISTRATION#"),parent->m_staticText118->GetLabel());
-				break;
-			case 5: 
-				html.Replace(wxT("#INSURANCE#"),te->GetValue());
-				html.Replace(wxT("#LINSURANCE#"),parent->m_staticText119->GetLabel());
-				break;
-			case 7: 
-				html.Replace(wxT("#POLICY#"),te->GetValue());
-				html.Replace(wxT("#LPOLICY#"),parent->m_staticText120->GetLabel());
-				break;
-			case 8: 
-				html.Replace(wxT("#MMSI#"),te->GetValue());
-				html.Replace(wxT("#LMMSI#"),parent->m_staticText53->GetLabel());
-				break;
-			case 9: 
-				html.Replace(wxT("#ONAME#"),te->GetValue());
-				html.Replace(wxT("#LONAME#"),parent->m_staticText90->GetLabel());
-				break;
-			case 10: 
-				html.Replace(wxT("#OFIRST#"),te->GetValue());
-				html.Replace(wxT("#LOFIRST#"),parent->m_staticText91->GetLabel());
-				break;
-			case 11: 
-				html.Replace(wxT("#TELEPHONE#"),te->GetValue());
-				html.Replace(wxT("#LTELEPHONE#"),parent->m_staticText95->GetLabel());
-				break;
-			case 12: 
-				html.Replace(wxT("#STREET#"),te->GetValue());
-				html.Replace(wxT("#LSTREET#"),parent->m_staticText92->GetLabel());
-				break;
-			case 13: 
-				html.Replace(wxT("#ZIP#"),te->GetValue());
-				html.Replace(wxT("#LZIP#"),parent->m_staticText93->GetLabel());
-				break;
-			case 14: 
-				html.Replace(wxT("#TOWN#"),te->GetValue());
-				html.Replace(wxT("#LTOWN#"),parent->m_staticText94->GetLabel());
-				break;
-			case 15: 
-				html.Replace(wxT("#TYPE#"),te->GetValue());
-				html.Replace(wxT("#LTYPE#"),parent->m_staticText128->GetLabel());
-				break;
-			case 16: 
-				html.Replace(wxT("#BUILDER#"),te->GetValue());
-				html.Replace(wxT("#LBUILDER#"),parent->m_staticText125->GetLabel());
-				break;
-			case 17: 
-				html.Replace(wxT("#HULL#"),te->GetValue());
-				html.Replace(wxT("#LHULL#"),parent->m_staticText124->GetLabel());
-				break;
-			case 18: 
-				html.Replace(wxT("#LAUNCHED#"),te->GetValue());
-				html.Replace(wxT("#LLAUNCHED#"),parent->m_staticText126->GetLabel());
-				break;
-			case 19:
-				html.Replace(wxT("#YARDNO#"),te->GetValue());
-				html.Replace(wxT("#LYARDNO#"),parent->m_staticText127->GetLabel());
-				break;
-			case 20:
-				html.Replace(wxT("#DESIGNER#"),te->GetValue());
-				html.Replace(wxT("#LDESIGNER#"),parent->m_staticText123->GetLabel());
-				break;
-			case 21: 
-				html.Replace(wxT("#CONSTRUCT#"),te->GetValue());
-				html.Replace(wxT("#LCONSTRUCT#"),parent->m_staticText129->GetLabel());
-				break;
-			case 22: 
-				html.Replace(wxT("#LOA#"),te->GetValue());
-				html.Replace(wxT("#LLOA#"),parent->m_staticText106->GetLabel());
-				break;
-			case 23:
-				html.Replace(wxT("#LOD#"),te->GetValue());
-				html.Replace(wxT("#LLOD#"),parent->m_staticText107->GetLabel());
-				break;
-			case 24:
-				html.Replace(wxT("#LWL#"),te->GetValue());				
-				html.Replace(wxT("#LLWL#"),parent->m_staticText108->GetLabel());
-				break;
-			case 25: 
-				html.Replace(wxT("#BEAM#"),te->GetValue());				
-				html.Replace(wxT("#LBEAM#"),parent->m_staticText109->GetLabel());
-				break;
-			case 26: 
-				html.Replace(wxT("#DRAFT#"),te->GetValue());
-				html.Replace(wxT("#LDRAFT#"),parent->m_staticText110->GetLabel());
-				break;
-			case 27: 
-				html.Replace(wxT("#LUSER1#"),parent->UserLabel1->GetValue());
-				break;
-			case 28:
-				html.Replace(wxT("#USER1#"),te->GetValue());
-				break;
-			case 29: 
-				html.Replace(wxT("#LUSER2#"),parent->UserLabel2->GetValue());
-				break;
-			case 30:
-				html.Replace(wxT("#USER2#"),te->GetValue());
-				break;
-			case 31: 
-				html.Replace(wxT("#LUSER3#"),parent->UserLabel3->GetValue());
-				break;
-			case 32:
-				html.Replace(wxT("#USER3#"),te->GetValue());
-				break;
-			case 33: 
-				html.Replace(wxT("#DISPL#"),te->GetValue());				
-				html.Replace(wxT("#LDISPL#"),parent->m_staticText122->GetLabel());
-				break; 
-			}
-		}
-	}
-
-	html.Replace(_T("#LOWNER#"),parent->sbSizer6->GetStaticBox()->GetLabel());
-	html.Replace(_T("#LDATE#"),parent->m_gridGlobal->GetColLabelValue(1));
-	html.Replace(_T("#LEQUIP#"),parent->sbSizer12->GetStaticBox()->GetLabel());
+void Boat::toHTML( wxString path, wxString layout, bool mode )
+{
+    wxString s, html;
+
+    if ( layout == _T( "" ) )
+    {
+        wxMessageBox( _( "Sorry, no Layout installed" ),_( "Information" ),wxOK );
+        return;
+    }
+
+    saveData();
 
-	if(html.Contains(wxT("<!--Repeat -->")))
-		html = repeatArea(html);
+    boatLayoutFile = new wxTextFile( layout_locn+layout+wxT( ".html" ) );
+    boatLayoutFile->Open();
+
+    wxString fn = data_locn;
+    fn.Replace( _T( "txt" ),_T( "html" ) );
+    if ( mode == false )
+        boatHTMLFile = new wxFile( fn,wxFile::write );
+    else
+        boatHTMLFile = new wxFile( path,wxFile::write );
+
+    for ( unsigned int i = 0; i < boatLayoutFile->GetLineCount(); i++ )
+        html += boatLayoutFile->GetLine( i );
+    boatLayoutFile->Close();
+
+    for ( unsigned int i = 0; i < ctrl.GetCount(); i++ )
+    {
+        if ( ctrl[i]->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+        {
+            wxTextCtrl* te = wxDynamicCast( ctrl[i], wxTextCtrl );
+
+            switch ( i )
+            {
+            case 0:
+                html.Replace( wxT( "#BOATNAME#" ),te->GetValue() );
+                html.Replace( wxT( "#LBOATNAME#" ),parent->bname->GetLabel() );
+                break;
+            case 1:
+                html.Replace( wxT( "#HOMEPORT#" ),te->GetValue() );
+                html.Replace( wxT( "#LHOMEPORT#" ),parent->m_staticText114->GetLabel() );
+                break;
+            case 2:
+                html.Replace( wxT( "#CALLSIGN#" ),te->GetValue() );
+                html.Replace( wxT( "#LCALLSIGN#" ),parent->m_staticText115->GetLabel() );
+                break;
+            case 3:
+                html.Replace( wxT( "#HIN#" ),te->GetValue() );
+                html.Replace( wxT( "#LHIN#" ),parent->m_staticText116->GetLabel() );
+                break;
+            case 4:
+                html.Replace( wxT( "#SAILNO#" ),te->GetValue() );
+                html.Replace( wxT( "#LSAILNO#" ),parent->m_staticText117->GetLabel() );
+                break;
+            case 6:
+                html.Replace( wxT( "#REGISTRATION#" ),te->GetValue() );
+                html.Replace( wxT( "#LREGISTRATION#" ),parent->m_staticText118->GetLabel() );
+                break;
+            case 5:
+                html.Replace( wxT( "#INSURANCE#" ),te->GetValue() );
+                html.Replace( wxT( "#LINSURANCE#" ),parent->m_staticText119->GetLabel() );
+                break;
+            case 7:
+                html.Replace( wxT( "#POLICY#" ),te->GetValue() );
+                html.Replace( wxT( "#LPOLICY#" ),parent->m_staticText120->GetLabel() );
+                break;
+            case 8:
+                html.Replace( wxT( "#MMSI#" ),te->GetValue() );
+                html.Replace( wxT( "#LMMSI#" ),parent->m_staticText53->GetLabel() );
+                break;
+            case 9:
+                html.Replace( wxT( "#ONAME#" ),te->GetValue() );
+                html.Replace( wxT( "#LONAME#" ),parent->m_staticText90->GetLabel() );
+                break;
+            case 10:
+                html.Replace( wxT( "#OFIRST#" ),te->GetValue() );
+                html.Replace( wxT( "#LOFIRST#" ),parent->m_staticText91->GetLabel() );
+                break;
+            case 11:
+                html.Replace( wxT( "#TELEPHONE#" ),te->GetValue() );
+                html.Replace( wxT( "#LTELEPHONE#" ),parent->m_staticText95->GetLabel() );
+                break;
+            case 12:
+                html.Replace( wxT( "#STREET#" ),te->GetValue() );
+                html.Replace( wxT( "#LSTREET#" ),parent->m_staticText92->GetLabel() );
+                break;
+            case 13:
+                html.Replace( wxT( "#ZIP#" ),te->GetValue() );
+                html.Replace( wxT( "#LZIP#" ),parent->m_staticText93->GetLabel() );
+                break;
+            case 14:
+                html.Replace( wxT( "#TOWN#" ),te->GetValue() );
+                html.Replace( wxT( "#LTOWN#" ),parent->m_staticText94->GetLabel() );
+                break;
+            case 15:
+                html.Replace( wxT( "#TYPE#" ),te->GetValue() );
+                html.Replace( wxT( "#LTYPE#" ),parent->m_staticText128->GetLabel() );
+                break;
+            case 16:
+                html.Replace( wxT( "#BUILDER#" ),te->GetValue() );
+                html.Replace( wxT( "#LBUILDER#" ),parent->m_staticText125->GetLabel() );
+                break;
+            case 17:
+                html.Replace( wxT( "#HULL#" ),te->GetValue() );
+                html.Replace( wxT( "#LHULL#" ),parent->m_staticText124->GetLabel() );
+                break;
+            case 18:
+                html.Replace( wxT( "#LAUNCHED#" ),te->GetValue() );
+                html.Replace( wxT( "#LLAUNCHED#" ),parent->m_staticText126->GetLabel() );
+                break;
+            case 19:
+                html.Replace( wxT( "#YARDNO#" ),te->GetValue() );
+                html.Replace( wxT( "#LYARDNO#" ),parent->m_staticText127->GetLabel() );
+                break;
+            case 20:
+                html.Replace( wxT( "#DESIGNER#" ),te->GetValue() );
+                html.Replace( wxT( "#LDESIGNER#" ),parent->m_staticText123->GetLabel() );
+                break;
+            case 21:
+                html.Replace( wxT( "#CONSTRUCT#" ),te->GetValue() );
+                html.Replace( wxT( "#LCONSTRUCT#" ),parent->m_staticText129->GetLabel() );
+                break;
+            case 22:
+                html.Replace( wxT( "#LOA#" ),te->GetValue() );
+                html.Replace( wxT( "#LLOA#" ),parent->m_staticText106->GetLabel() );
+                break;
+            case 23:
+                html.Replace( wxT( "#LOD#" ),te->GetValue() );
+                html.Replace( wxT( "#LLOD#" ),parent->m_staticText107->GetLabel() );
+                break;
+            case 24:
+                html.Replace( wxT( "#LWL#" ),te->GetValue() );
+                html.Replace( wxT( "#LLWL#" ),parent->m_staticText108->GetLabel() );
+                break;
+            case 25:
+                html.Replace( wxT( "#BEAM#" ),te->GetValue() );
+                html.Replace( wxT( "#LBEAM#" ),parent->m_staticText109->GetLabel() );
+                break;
+            case 26:
+                html.Replace( wxT( "#DRAFT#" ),te->GetValue() );
+                html.Replace( wxT( "#LDRAFT#" ),parent->m_staticText110->GetLabel() );
+                break;
+            case 27:
+                html.Replace( wxT( "#LUSER1#" ),parent->UserLabel1->GetValue() );
+                break;
+            case 28:
+                html.Replace( wxT( "#USER1#" ),te->GetValue() );
+                break;
+            case 29:
+                html.Replace( wxT( "#LUSER2#" ),parent->UserLabel2->GetValue() );
+                break;
+            case 30:
+                html.Replace( wxT( "#USER2#" ),te->GetValue() );
+                break;
+            case 31:
+                html.Replace( wxT( "#LUSER3#" ),parent->UserLabel3->GetValue() );
+                break;
+            case 32:
+                html.Replace( wxT( "#USER3#" ),te->GetValue() );
+                break;
+            case 33:
+                html.Replace( wxT( "#DISPL#" ),te->GetValue() );
+                html.Replace( wxT( "#LDISPL#" ),parent->m_staticText122->GetLabel() );
+                break;
+            }
+        }
+    }
+
+    html.Replace( _T( "#LOWNER#" ),parent->sbSizer6->GetStaticBox()->GetLabel() );
+    html.Replace( _T( "#LDATE#" ),parent->m_gridGlobal->GetColLabelValue( 1 ) );
+    html.Replace( _T( "#LEQUIP#" ),parent->sbSizer12->GetStaticBox()->GetLabel() );
+
+    if ( html.Contains( wxT( "<!--Repeat -->" ) ) )
+        html = repeatArea( html );
 #ifdef __WXOSX__
-       wxString str(html.wx_str(), wxConvUTF8);
+    wxString str( html.wx_str(), wxConvUTF8 );
 #else
-	wxString str(html);	
+    wxString str( html );
 #endif
-	boatHTMLFile->Write(str);
-	boatHTMLFile->Close();
+    boatHTMLFile->Write( str );
+    boatHTMLFile->Close();
 }
 
-wxString Boat::repeatArea(wxString html)
+wxString Boat::repeatArea( wxString html )
 {
-	wxString topHTML;
-	wxString bottomHTML;
-	wxString middleHTML;
-
-	wxString seperatorTop = wxT("<!--Repeat -->");
-	wxString seperatorBottom = wxT("<!--Repeat End -->");
-
-	int indexTop = html.First(seperatorTop)+seperatorTop.Len();
-	int indexBottom = html.First(seperatorBottom)+seperatorBottom.Len();
-
-	topHTML = html.substr(0,indexTop);
-	bottomHTML = html.substr(indexBottom,html.Len()-1);
-	middleHTML = html.substr(indexTop,indexBottom-indexTop);
-
-	topHTML.Replace(_T("#LETYPE#"),parent->m_gridEquipment->GetColLabelValue(0));
-	topHTML.Replace(_T("#LDISCRIPTION#"),parent->m_gridEquipment->GetColLabelValue(1));
-	topHTML.Replace(_T("#LSERIAL#"),parent->m_gridEquipment->GetColLabelValue(2));
-	topHTML.Replace(_T("#LREMARKS#"),parent->m_gridEquipment->GetColLabelValue(3));
-
-	wxString newMiddleHTML = _T("");
-	for(int i = 0; i < parent->m_gridEquipment->GetNumberRows(); i++)
-	{
-		wxString temp = middleHTML;
-		for(int c = 0; c < parent->m_gridEquipment->GetNumberCols(); c++)
-		{
-		wxString text = parent->m_gridEquipment->GetCellValue(i,c);
-
-		switch(c)
-		{
-			case 0: 		
-				temp.Replace(_T("#ETYPE#"),text);
-				break;
-			case 1: 		
-				temp.Replace(_T("#DISCRIPTION#"),text);
-				break;
-			case 2: 		
-				temp.Replace(_T("#SERIAL#"),text);
-				break;
-			case 3: 		
-				temp.Replace(_T("#REMARKS#"),text);
-				break;
-		}
-		}
-		newMiddleHTML += temp;
-	}
-
-	html = topHTML + newMiddleHTML + bottomHTML;
-	return html;
-}
-
-void Boat::viewHTML(wxString path, wxString layout, bool mode)
-{
-	if(parent->logbookPlugIn->opt->filterLayout[LogbookDialog::BOAT])
-        layout.Prepend(parent->logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT]);
-
-    toHTML(path, layout, mode);
-	if(layout != _T(""))
-	{
-	    wxString fn = data_locn;
-	    fn.Replace(_T("txt"),_T("html"));
-	    parent->startBrowser(fn);
-	}
+    wxString topHTML;
+    wxString bottomHTML;
+    wxString middleHTML;
+
+    wxString seperatorTop = wxT( "<!--Repeat -->" );
+    wxString seperatorBottom = wxT( "<!--Repeat End -->" );
+
+    int indexTop = html.First( seperatorTop )+seperatorTop.Len();
+    int indexBottom = html.First( seperatorBottom )+seperatorBottom.Len();
+
+    topHTML = html.substr( 0,indexTop );
+    bottomHTML = html.substr( indexBottom,html.Len()-1 );
+    middleHTML = html.substr( indexTop,indexBottom-indexTop );
+
+    topHTML.Replace( _T( "#LETYPE#" ),parent->m_gridEquipment->GetColLabelValue( 0 ) );
+    topHTML.Replace( _T( "#LDISCRIPTION#" ),parent->m_gridEquipment->GetColLabelValue( 1 ) );
+    topHTML.Replace( _T( "#LSERIAL#" ),parent->m_gridEquipment->GetColLabelValue( 2 ) );
+    topHTML.Replace( _T( "#LREMARKS#" ),parent->m_gridEquipment->GetColLabelValue( 3 ) );
+
+    wxString newMiddleHTML = _T( "" );
+    for ( int i = 0; i < parent->m_gridEquipment->GetNumberRows(); i++ )
+    {
+        wxString temp = middleHTML;
+        for ( int c = 0; c < parent->m_gridEquipment->GetNumberCols(); c++ )
+        {
+            wxString text = parent->m_gridEquipment->GetCellValue( i,c );
+
+            switch ( c )
+            {
+            case 0:
+                temp.Replace( _T( "#ETYPE#" ),text );
+                break;
+            case 1:
+                temp.Replace( _T( "#DISCRIPTION#" ),text );
+                break;
+            case 2:
+                temp.Replace( _T( "#SERIAL#" ),text );
+                break;
+            case 3:
+                temp.Replace( _T( "#REMARKS#" ),text );
+                break;
+            }
+        }
+        newMiddleHTML += temp;
+    }
+
+    html = topHTML + newMiddleHTML + bottomHTML;
+    return html;
+}
+
+void Boat::viewHTML( wxString path, wxString layout, bool mode )
+{
+    if ( parent->logbookPlugIn->opt->filterLayout[LogbookDialog::BOAT] )
+        layout.Prepend( parent->logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT] );
+
+    toHTML( path, layout, mode );
+    if ( layout != _T( "" ) )
+    {
+        wxString fn = data_locn;
+        fn.Replace( _T( "txt" ),_T( "html" ) );
+        parent->startBrowser( fn );
+    }
 }
 
 void Boat::addEquip()
 {
-	wxString s;
+    wxString s;
+
+    modified = true;
 
-	modified = true;
+    parent->m_gridEquipment->AppendRows();
+    parent->m_gridEquipment->SetCellValue( parent->m_gridEquipment->GetNumberRows()-1,
+                                           parent->m_gridEquipment->GetNumberCols()-1,_T( " " ) );
+    parent->m_gridEquipment->MakeCellVisible( parent->m_gridEquipment->GetNumberRows()-1,0 );
 
-	parent->m_gridEquipment->AppendRows();
-	parent->m_gridEquipment->SetCellValue(parent->m_gridEquipment->GetNumberRows()-1,
-										  parent->m_gridEquipment->GetNumberCols()-1,_T(" "));
-	parent->m_gridEquipment->MakeCellVisible(parent->m_gridEquipment->GetNumberRows()-1,0);
-	
-	equipFile->Open();
+    equipFile->Open();
 
-	for(int i = 0; i < parent->m_gridEquipment->GetNumberCols(); i++)
-	{
-		s += _T(",");	
-	}
-	
-	equipFile->AddLine(s);
-	equipFile->Write();
-	equipFile->Close();
+    for ( int i = 0; i < parent->m_gridEquipment->GetNumberCols(); i++ )
+    {
+        s += _T( "," );
+    }
+
+    equipFile->AddLine( s );
+    equipFile->Write();
+    equipFile->Close();
 }
-void Boat::cellChanged(int row, int col)
+void Boat::cellChanged( int row, int col )
 {
-	modified = true;
+    modified = true;
 
-	if(parent->m_gridEquipment->GetCellValue(
-		row,parent->m_gridEquipment->GetNumberCols()-1) == _T(""))
-			parent->m_gridEquipment->SetCellValue(
-				row,parent->m_gridEquipment->GetNumberCols()-1,_T(" "));
+    if ( parent->m_gridEquipment->GetCellValue(
+                row,parent->m_gridEquipment->GetNumberCols()-1 ) == _T( "" ) )
+        parent->m_gridEquipment->SetCellValue(
+            row,parent->m_gridEquipment->GetNumberCols()-1,_T( " " ) );
 }
 
-void Boat::deleteRow(int row)
+void Boat::deleteRow( int row )
 {
-	int answer = wxMessageBox(wxString::Format(_("Delete Row Nr. %i ?"),row+1), _("Confirm"),
-                              wxYES_NO | wxCANCEL, parent);
+    int answer = wxMessageBox( wxString::Format( _( "Delete Row Nr. %i ?" ),row+1 ), _( "Confirm" ),
+                               wxYES_NO | wxCANCEL, parent );
 
-	if (answer == wxYES)
-	  {
-		parent->m_gridEquipment->DeleteRows(row);
-	  }
+    if ( answer == wxYES )
+    {
+        parent->m_gridEquipment->DeleteRows( row );
+    }
 }
 
-void Boat::toCSV(wxString savePath)
+void Boat::toCSV( wxString savePath )
 {
-	wxString line;
-	wxString s;
+    wxString line;
+    wxString s;
 
-	saveData();
+    saveData();
 
-	wxTextFile* csvFile = new wxTextFile(savePath);
-	wxString path = savePath;
-	path.Replace(wxT("Boat"),wxT("Equipment"));
-	wxTextFile* csvEquipFile = new wxTextFile(path);
+    wxTextFile* csvFile = new wxTextFile( savePath );
+    wxString path = savePath;
+    path.Replace( wxT( "Boat" ),wxT( "Equipment" ) );
+    wxTextFile* csvEquipFile = new wxTextFile( path );
 
-	if(csvFile->Exists())
-	{
-		::wxRemoveFile(savePath);
-		::wxRemoveFile(path);
-		csvFile->Create();
-		equipFile->Create();
-	}
+    if ( csvFile->Exists() )
+    {
+        ::wxRemoveFile( savePath );
+        ::wxRemoveFile( path );
+        csvFile->Create();
+        equipFile->Create();
+    }
 
-	saveCSV(csvFile,true);
-	saveCSV(csvEquipFile,false);
+    saveCSV( csvFile,true );
+    saveCSV( csvEquipFile,false );
 
 }
 
-void Boat::saveCSV(wxTextFile* file, bool mode)
+void Boat::saveCSV( wxTextFile* file, bool mode )
 {
-	wxString line, s;
-	int col = 0;
+    wxString line, s;
+    int col = 0;
 
-	saveData();
+    saveData();
 
-	((mode)?boatFile:equipFile)->Open();
+    ( ( mode )?boatFile:equipFile )->Open();
 
-	for(unsigned int i = 0; i < ((mode)?boatFile:equipFile)->GetLineCount(); i++)
-	{
-		line = ((mode)?boatFile:equipFile)->GetLine(i);
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY );
-		col = 0;
+    for ( unsigned int i = 0; i < ( ( mode )?boatFile:equipFile )->GetLineCount(); i++ )
+    {
+        line = ( ( mode )?boatFile:equipFile )->GetLine( i );
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        col = 0;
 
-		while ( tkz.HasMoreTokens() )
-		{
-			if(mode == true)
-			{
-				if( col != 27 && col != 29 && col != 31) 
-				{
-					s += wxT("\"")+parent->restoreDangerChar(tkz.GetNextToken().RemoveLast())+_T("\",");
-				}
-				else
-					tkz.GetNextToken();
-			}
-			else
-				s += wxT("\"")+parent->restoreDangerChar(tkz.GetNextToken().RemoveLast())+_T("\",");
-			col++;
-		}
-		s.RemoveLast();
-		file->AddLine(s);
-		s=_T("");
-	}
+        while ( tkz.HasMoreTokens() )
+        {
+            if ( mode == true )
+            {
+                if ( col != 27 && col != 29 && col != 31 )
+                {
+                    s += wxT( "\"" )+parent->restoreDangerChar( tkz.GetNextToken().RemoveLast() )+_T( "\"," );
+                }
+                else
+                    tkz.GetNextToken();
+            }
+            else
+                s += wxT( "\"" )+parent->restoreDangerChar( tkz.GetNextToken().RemoveLast() )+_T( "\"," );
+            col++;
+        }
+        s.RemoveLast();
+        file->AddLine( s );
+        s=_T( "" );
+    }
 
-	file->Write();
-	file->Close();
-	((mode)?boatFile:equipFile)->Close();
+    file->Write();
+    file->Close();
+    ( ( mode )?boatFile:equipFile )->Close();
 
 }
 
-void Boat::toXML(wxString savePath)
+void Boat::toXML( wxString savePath )
 {
-	wxString line;
-	wxString s;
+    wxString line;
+    wxString s;
 
-	wxTextFile* xmlFile = new wxTextFile(savePath);
-	wxString path = savePath;
-	path.Replace(wxT("Boat"),wxT("Equipment"));
-	wxTextFile* xmlEquipFile = new wxTextFile(path);
+    wxTextFile* xmlFile = new wxTextFile( savePath );
+    wxString path = savePath;
+    path.Replace( wxT( "Boat" ),wxT( "Equipment" ) );
+    wxTextFile* xmlEquipFile = new wxTextFile( path );
 
-	if(xmlFile->Exists())
-	{
-		::wxRemoveFile(savePath);
-		::wxRemoveFile(path);
-		xmlFile->Create();
-		xmlEquipFile->Create();
-	}
+    if ( xmlFile->Exists() )
+    {
+        ::wxRemoveFile( savePath );
+        ::wxRemoveFile( path );
+        xmlFile->Create();
+        xmlEquipFile->Create();
+    }
 
-	saveData();
-	saveXML(xmlFile,true);
-	saveXML(xmlEquipFile,false);
+    saveData();
+    saveXML( xmlFile,true );
+    saveXML( xmlEquipFile,false );
 
 }
 
-void Boat::saveXML(wxTextFile* xmlFile, bool mode)
+void Boat::saveXML( wxTextFile* xmlFile, bool mode )
 {
-	wxTextFile* file;
-	wxString temp;
+    wxTextFile* file;
+    wxString temp;
 
-	wxString line, s;
+    wxString line, s;
 
-	if(mode)
-		file = boatFile;
-	else 
-		file = equipFile;
+    if ( mode )
+        file = boatFile;
+    else
+        file = equipFile;
 
-	file->Open();
+    file->Open();
 
-	xmlFile->AddLine(parent->xmlHead);
+    xmlFile->AddLine( parent->xmlHead );
 
-	for(unsigned int i = 0; i < file->GetLineCount(); i++)
-	{
-		int col = 0;
-		line = file->GetLine(i);
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY );
-		s = wxString::Format(_T("<Row ss:Height=\"%u\">"),parent->m_gridGlobal->GetRowHeight(i));
+    for ( unsigned int i = 0; i < file->GetLineCount(); i++ )
+    {
+        int col = 0;
+        line = file->GetLine( i );
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        s = wxString::Format( _T( "<Row ss:Height=\"%u\">" ),parent->m_gridGlobal->GetRowHeight( i ) );
 
-		while ( tkz.HasMoreTokens() )
-		{ 
-			if(col != 27 && col != 29 && col != 31)
-			{
-				s += _T("<Cell>");
-				s += _T("<Data ss:Type=\"String\">#DATA#</Data>");
-				temp = parent->restoreDangerChar(tkz.GetNextToken().RemoveLast());
-				temp.Replace(_T("\n"),_T("&#10;"));
-				temp.Replace(_T("&"),_T("&amp;"));
-				temp.Replace(_T("\""),_T("&quot;"));
-				temp.Replace(_T("<"),_T("&lt;"));
-				temp.Replace(_T(">"),_T("&gt;"));
-				temp.Replace(_T("'"),_T("&apos;"));
-				s.Replace(_T("#DATA#"),temp);
-				s += _T("</Cell>");
-			}
-			else tkz.GetNextToken();
-			col++;
-		}
-		s += _T("</Row>");
-		xmlFile->AddLine(s);
-	}
+        while ( tkz.HasMoreTokens() )
+        {
+            if ( col != 27 && col != 29 && col != 31 )
+            {
+                s += _T( "<Cell>" );
+                s += _T( "<Data ss:Type=\"String\">#DATA#</Data>" );
+                temp = parent->restoreDangerChar( tkz.GetNextToken().RemoveLast() );
+                temp.Replace( _T( "\n" ),_T( "&#10;" ) );
+                temp.Replace( _T( "&" ),_T( "&amp;" ) );
+                temp.Replace( _T( "\"" ),_T( "&quot;" ) );
+                temp.Replace( _T( "<" ),_T( "&lt;" ) );
+                temp.Replace( _T( ">" ),_T( "&gt;" ) );
+                temp.Replace( _T( "'" ),_T( "&apos;" ) );
+                s.Replace( _T( "#DATA#" ),temp );
+                s += _T( "</Cell>" );
+            }
+            else tkz.GetNextToken();
+            col++;
+        }
+        s += _T( "</Row>" );
+        xmlFile->AddLine( s );
+    }
 
-	xmlFile->AddLine(parent->xmlEnd);
-	xmlFile->Write();
-	file->Close();
-	xmlFile->Close();
+    xmlFile->AddLine( parent->xmlEnd );
+    xmlFile->Write();
+    file->Close();
+    xmlFile->Close();
 }
 
-void Boat::backup(wxString path)
+void Boat::backup( wxString path )
 {
-	wxFileName fn(path);
-	wxString z = fn.GetName();
+    wxFileName fn( path );
+    wxString z = fn.GetName();
 
-	saveData();
+    saveData();
 
-	wxCopyFile(data_locn,path);
-	path.Replace(z,_T("equipment"));
-	wxCopyFile(equip_locn,path);
+    wxCopyFile( data_locn,path );
+    path.Replace( z,_T( "equipment" ) );
+    wxCopyFile( equip_locn,path );
 }
 
-void Boat::toODS(wxString path)
+void Boat::toODS( wxString path )
 {
-	wxString s = _T("");
-	wxString line;
-	wxString temp;
+    wxString s = _T( "" );
+    wxString line;
+    wxString temp;
 
-	saveData();
+    saveData();
 
-	saveODS(path,false);
+    saveODS( path,false );
 
-	wxFileName fn(path);
-	wxString sf = fn.GetName();
-	path.Replace(sf,_T("equipment"));
+    wxFileName fn( path );
+    wxString sf = fn.GetName();
+    path.Replace( sf,_T( "equipment" ) );
 
-	saveODS(path, true);
+    saveODS( path, true );
 }
 
 void Boat::saveODS( wxString path, bool mode )
-{	
-	wxString temp, col, tableName;
-	int x = 0;
-
-	if(mode)
-	{
-		temp = equip_locn;
-		col = _T("table:number-columns-repeated=\"4\"");
-		tableName = _T("Equipment");
-		x = parent->m_gridEquipment->GetNumberCols();
-	}
-	else
-	{
-		temp = data_locn;
-		col = _T("table:number-columns-repeated=\"31\""); 
-		tableName = _T("Boat");
-		x = ctrlStaticText.GetCount();
-	}
-
-
-	wxFileInputStream input( temp );
-	wxTextInputStream* stream = new wxTextInputStream (input);
-
-	wxFFileOutputStream out(path);
-	wxZipOutputStream zip(out);
-	wxTextOutputStream txt(zip);
-	wxString sep(wxFileName::GetPathSeparator());
-
-	temp = parent->content;
-	temp.Replace(_T("table:number-columns-repeated=\"33\""),col);
-	temp.Replace(_T("Logbook"),tableName);
-	zip.PutNextEntry(wxT("content.xml"));
-	txt << temp;
-
-	txt << _T("<table:table-row table:style-name=\"ro2\">");
-	for(int i = 0; i < x; i++)
-	{
-		txt << _T("<table:table-cell office:value-type=\"string\">");
-		txt << _T("<text:p>");
-		if(!mode)
-		{
-			if(i == 27)
-			{
-				txt << parent->UserLabel1->GetValue();
-				txt << _T("</text:p>");
-				txt << _T("</table:table-cell>");
-
-				txt << _T("<table:table-cell office:value-type=\"string\">");
-				txt << _T("<text:p>");
-				txt << parent->UserLabel2->GetValue();
-				txt << _T("</text:p>");
-				txt << _T("</table:table-cell>");
-
-				txt << _T("<table:table-cell office:value-type=\"string\">");
-				txt << _T("<text:p>");
-				txt << parent->UserLabel3->GetValue();
-				txt << _T("</text:p>");
-				txt << _T("</table:table-cell>");
-
-				txt << _T("<table:table-cell office:value-type=\"string\">");
-				txt << _T("<text:p>");
-				wxStaticText* t = wxDynamicCast(ctrlStaticText[i], wxStaticText);
-				txt << t->GetLabel();
-			}
-			else
-			{
-				wxStaticText* t = wxDynamicCast(ctrlStaticText[i], wxStaticText);
-				txt << t->GetLabel();
-			}
-		}
-		else
-			txt << parent->m_gridEquipment->GetColLabelValue(i);
-		txt << _T("</text:p>");
-		txt << _T("</table:table-cell>");
-	}
-	txt << _T("</table:table-row>");
+{
+    wxString temp, col, tableName;
+    int x = 0;
+
+    if ( mode )
+    {
+        temp = equip_locn;
+        col = _T( "table:number-columns-repeated=\"4\"" );
+        tableName = _T( "Equipment" );
+        x = parent->m_gridEquipment->GetNumberCols();
+    }
+    else
+    {
+        temp = data_locn;
+        col = _T( "table:number-columns-repeated=\"31\"" );
+        tableName = _T( "Boat" );
+        x = ctrlStaticText.GetCount();
+    }
+
+
+    wxFileInputStream input( temp );
+    wxTextInputStream* stream = new wxTextInputStream ( input );
+
+    wxFFileOutputStream out( path );
+    wxZipOutputStream zip( out );
+    wxTextOutputStream txt( zip );
+    wxString sep( wxFileName::GetPathSeparator() );
+
+    temp = parent->content;
+    temp.Replace( _T( "table:number-columns-repeated=\"33\"" ),col );
+    temp.Replace( _T( "Logbook" ),tableName );
+    zip.PutNextEntry( wxT( "content.xml" ) );
+    txt << temp;
+
+    txt << _T( "<table:table-row table:style-name=\"ro2\">" );
+    for ( int i = 0; i < x; i++ )
+    {
+        txt << _T( "<table:table-cell office:value-type=\"string\">" );
+        txt << _T( "<text:p>" );
+        if ( !mode )
+        {
+            if ( i == 27 )
+            {
+                txt << parent->UserLabel1->GetValue();
+                txt << _T( "</text:p>" );
+                txt << _T( "</table:table-cell>" );
+
+                txt << _T( "<table:table-cell office:value-type=\"string\">" );
+                txt << _T( "<text:p>" );
+                txt << parent->UserLabel2->GetValue();
+                txt << _T( "</text:p>" );
+                txt << _T( "</table:table-cell>" );
+
+                txt << _T( "<table:table-cell office:value-type=\"string\">" );
+                txt << _T( "<text:p>" );
+                txt << parent->UserLabel3->GetValue();
+                txt << _T( "</text:p>" );
+                txt << _T( "</table:table-cell>" );
+
+                txt << _T( "<table:table-cell office:value-type=\"string\">" );
+                txt << _T( "<text:p>" );
+                wxStaticText* t = wxDynamicCast( ctrlStaticText[i], wxStaticText );
+                txt << t->GetLabel();
+            }
+            else
+            {
+                wxStaticText* t = wxDynamicCast( ctrlStaticText[i], wxStaticText );
+                txt << t->GetLabel();
+            }
+        }
+        else
+            txt << parent->m_gridEquipment->GetColLabelValue( i );
+        txt << _T( "</text:p>" );
+        txt << _T( "</table:table-cell>" );
+    }
+    txt << _T( "</table:table-row>" );
 
 //	bool empty = false;
-	long emptyCol = 0;
+    long emptyCol = 0;
 
     wxString line;
-	while(!input.Eof())
-	{
-		line = stream->ReadLine(); // for #1.2#
-		int col = 0;
-		if(input.Eof()) break;
-		txt << _T("<table:table-row table:style-name=\"ro2\">");
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY );
-
-		while ( tkz.HasMoreTokens() )
-		{ 
-			wxString s = parent->restoreDangerChar(tkz.GetNextToken().RemoveLast());
-			if(s == _T(""))
-			{
-				txt <<  _T("<table:table-cell />");
-				//empty = true;
-				emptyCol++;
-				col++;
-				continue;
-			}
-
-			if(col != 27 && col != 29 && col != 31 )
-				txt << _T("<table:table-cell office:value-type=\"string\">");
-			else
-			{ 
-			  col++; 
-			  continue; 
-			}
-
-			wxStringTokenizer str(s, _T("\n"));
-			while(str.HasMoreTokens())
-			{
-				wxString e = str.GetNextToken();
-				e.Replace(_T("&"),_T("&amp;"));
-				e.Replace(_T("\""),_T("&quot;"));
-				e.Replace(_T("<"),_T("&lt;"));
-				e.Replace(_T(">"),_T("&gt;"));
-				e.Replace(_T("'"),_T("&apos;"));
-				txt << _T("<text:p>");
-				txt << e;
-				txt << _T("</text:p>");
-			}
-			txt << _T("</table:table-cell>");
-			col++;
-		}
-		txt << _T("</table:table-row>");;
-
-	}
-	txt << parent->contentEnd;
-
-	zip.PutNextEntry(wxT("mimetype"));
-	txt << wxT("application/vnd.oasis.opendocument.spreadsheet");
-
-	zip.PutNextEntry(wxT("styles.xml"));
-	txt << parent->styles;
-
-	zip.PutNextEntry(wxT("meta.xml"));
-	txt << parent->meta;
-
-	zip.PutNextEntry(wxT("META-INF") + sep + wxT("manifest.xml"));
-	txt << parent->manifest;
-
-	zip.PutNextEntry(wxT("Thumbnails") + sep);
-
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("floater"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("menubar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("popupmenu"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("progressbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("statusbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("toolbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("images") + sep + wxT("Bitmaps"));
+    while ( !input.Eof() )
+    {
+        line = stream->ReadLine(); // for #1.2#
+        int col = 0;
+        if ( input.Eof() ) break;
+        txt << _T( "<table:table-row table:style-name=\"ro2\">" );
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+
+        while ( tkz.HasMoreTokens() )
+        {
+            wxString s = parent->restoreDangerChar( tkz.GetNextToken().RemoveLast() );
+            if ( s == _T( "" ) )
+            {
+                txt <<  _T( "<table:table-cell />" );
+                //empty = true;
+                emptyCol++;
+                col++;
+                continue;
+            }
+
+            if ( col != 27 && col != 29 && col != 31 )
+                txt << _T( "<table:table-cell office:value-type=\"string\">" );
+            else
+            {
+                col++;
+                continue;
+            }
+
+            wxStringTokenizer str( s, _T( "\n" ) );
+            while ( str.HasMoreTokens() )
+            {
+                wxString e = str.GetNextToken();
+                e.Replace( _T( "&" ),_T( "&amp;" ) );
+                e.Replace( _T( "\"" ),_T( "&quot;" ) );
+                e.Replace( _T( "<" ),_T( "&lt;" ) );
+                e.Replace( _T( ">" ),_T( "&gt;" ) );
+                e.Replace( _T( "'" ),_T( "&apos;" ) );
+                txt << _T( "<text:p>" );
+                txt << e;
+                txt << _T( "</text:p>" );
+            }
+            txt << _T( "</table:table-cell>" );
+            col++;
+        }
+        txt << _T( "</table:table-row>" );;
+
+    }
+    txt << parent->contentEnd;
+
+    zip.PutNextEntry( wxT( "mimetype" ) );
+    txt << wxT( "application/vnd.oasis.opendocument.spreadsheet" );
+
+    zip.PutNextEntry( wxT( "styles.xml" ) );
+    txt << parent->styles;
+
+    zip.PutNextEntry( wxT( "meta.xml" ) );
+    txt << parent->meta;
+
+    zip.PutNextEntry( wxT( "META-INF" ) + sep + wxT( "manifest.xml" ) );
+    txt << parent->manifest;
+
+    zip.PutNextEntry( wxT( "Thumbnails" ) + sep );
+
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "floater" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "menubar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "popupmenu" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "progressbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "statusbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "toolbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "images" ) + sep + wxT( "Bitmaps" ) );
 
-	zip.Close();
-	out.Close();
+    zip.Close();
+    out.Close();
 }
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/boat.h opencpn-plugin-logbookkonni-1.2024/src/boat.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/boat.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/boat.h	2016-02-25 13:06:29.000000000 +0000
@@ -1,67 +1,67 @@
 #pragma once
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
 #include <wx/textfile.h>
-#include <wx/wfstream.h> 
-#include <wx/txtstrm.h> 
-#include <wx/zipstrm.h> 
+#include <wx/wfstream.h>
+#include <wx/txtstrm.h>
+#include <wx/zipstrm.h>
 
 class LogbookDialog;
 
 class Boat
 {
 public:
-	Boat(LogbookDialog* d, wxString data, wxString lay, wxString layoutODT);
-	~Boat(void);
+    Boat( LogbookDialog* d, wxString data, wxString lay, wxString layoutODT );
+    ~Boat( void );
 
-	void saveData();
-	void loadData();
-	void toHTML(wxString path,wxString layout, bool mode);
-	wxString toODT(wxString path,wxString layout, bool mode);
-	void toCSV(wxString path);
-	void toXML(wxString path);
-	void toODS(wxString path);
-	void backup(wxString path);
-	void viewHTML(wxString path,wxString layout,bool mode);
-	void viewODT(wxString path,wxString layout,bool mode);
-	wxString readLayoutFileODT(wxString layout);
-	void addEquip();
-	void cellChanged(int row, int col);
-	void deleteRow(int row);
-	void setLayoutLocation(wxString loc);
-
-	wxString		layout_locn;
-	wxString		layout;
-	wxString		ODTLayout;
+    void saveData();
+    void loadData();
+    void toHTML( wxString path,wxString layout, bool mode );
+    wxString toODT( wxString path,wxString layout, bool mode );
+    void toCSV( wxString path );
+    void toXML( wxString path );
+    void toODS( wxString path );
+    void backup( wxString path );
+    void viewHTML( wxString path,wxString layout,bool mode );
+    void viewODT( wxString path,wxString layout,bool mode );
+    wxString readLayoutFileODT( wxString layout );
+    void addEquip();
+    void cellChanged( int row, int col );
+    void deleteRow( int row );
+    void setLayoutLocation( wxString loc );
+
+    wxString		layout_locn;
+    wxString		layout;
+    wxString		ODTLayout;
 
-	bool			modified;
+    bool			modified;
 private:
-	LogbookDialog*	parent; 
-	wxTextFile*		boatFile;
-	wxTextFile*		equipFile;
-	wxTextFile*		boatLayoutFile;
-	wxFile*			boatHTMLFile;
-	wxFile*			boatODTFile;
-	wxString		data_locn;
-	wxString		equip_locn;
-	wxString		lay;
-	wxString		layoutODT;
-
-	wxWindowList	ctrl;		// all wxTextCtrl's in Window;
-	wxWindowList    ctrlStaticText; // all wxStaticText in Window
-
-
-	void createFiles(wxString data, wxString lay);
-	void createTextCtrlConnections();
-	void createStaticTextList();
-	void saveCSV(wxTextFile* file, bool mode);
-	void saveXML(wxTextFile* file, bool mode);
-	void saveODS( wxString path, bool mode );
-	wxString repeatArea(wxString html);
-	wxString repeatAreaODT(wxString odt);
+    LogbookDialog*	parent;
+    wxTextFile*		boatFile;
+    wxTextFile*		equipFile;
+    wxTextFile*		boatLayoutFile;
+    wxFile*			boatHTMLFile;
+    wxFile*			boatODTFile;
+    wxString		data_locn;
+    wxString		equip_locn;
+    wxString		lay;
+    wxString		layoutODT;
+
+    wxWindowList	ctrl;		// all wxTextCtrl's in Window;
+    wxWindowList    ctrlStaticText; // all wxStaticText in Window
+
+
+    void createFiles( wxString data, wxString lay );
+    void createTextCtrlConnections();
+    void createStaticTextList();
+    void saveCSV( wxTextFile* file, bool mode );
+    void saveXML( wxTextFile* file, bool mode );
+    void saveODS( wxString path, bool mode );
+    wxString repeatArea( wxString html );
+    wxString repeatAreaODT( wxString odt );
 
- //   DECLARE_EVENT_TABLE()
+//   DECLARE_EVENT_TABLE()
 
 };
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/CrewList.cpp opencpn-plugin-logbookkonni-1.2024/src/CrewList.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/CrewList.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/CrewList.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -6,382 +6,398 @@
 #include "Export.h"
 
 #ifndef WX_PRECOMP
-     #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 
 #include <wx/tokenzr.h>
-#include <wx/filename.h> 
+#include <wx/filename.h>
 #include <wx/mimetype.h>
-#include <wx/wfstream.h> 
-#include <wx/txtstrm.h> 
+#include <wx/wfstream.h>
+#include <wx/txtstrm.h>
 #include <wx/zipstrm.h>
 #include <wx/arrstr.h>
 
 #include <memory>
 using namespace std;
 
-bool ActuellWatch::active				= false;
-unsigned int ActuellWatch::day			= 0;
-int ActuellWatch::col					= -1;
-wxTimeSpan ActuellWatch::time			= wxTimeSpan();
-wxDateTime ActuellWatch::start			= wxDateTime();
-wxDateTime ActuellWatch::end			= wxDateTime();
-wxString ActuellWatch::member			= wxEmptyString;
-wxArrayString ActuellWatch::menuMembers	= wxArrayString();
-
-CrewList::CrewList(LogbookDialog* d, wxString data, wxString layout, wxString layoutODT)
-{	
-	dialog = d;
+bool ActualWatch::active				= false;
+unsigned int ActualWatch::day			= 0;
+int ActualWatch::col					= -1;
+wxTimeSpan ActualWatch::time			= wxTimeSpan();
+wxDateTime ActualWatch::start			= wxDateTime();
+wxDateTime ActualWatch::end			= wxDateTime();
+wxString ActualWatch::member			= wxEmptyString;
+wxArrayString ActualWatch::menuMembers	= wxArrayString();
+
+CrewList::CrewList( LogbookDialog* d, wxString data, wxString layout, wxString layoutODT )
+{
+    dialog = d;
     opt = d->logbookPlugIn->opt;
-	gridCrew = d->m_gridCrew;
-	gridWake = d->m_gridCrewWake;
-	rowHeight = gridCrew->GetRowHeight(0);
-	selRow = 0; selCol = 0;
-	day = 0;
-	ActuellWatch::end = wxDateTime::Now()+wxDateSpan(1);
-
-	this->layout = layout;
-	this->ODTLayout = layoutODT;
-	modified = false;
-
-	if(dialog->m_radioBtnHTMLCrew->GetValue())
-		layout_locn = layout;
-	else
-		layout_locn = layoutODT;
-
-	wxString watchData = data;
-	watchData.Append(_T("watchlist.txt"));
-	wxFileName wxHomeFiledir(watchData) ;
-	if(true != wxHomeFiledir.FileExists())
-	{
-		watchListFile = new wxTextFile(watchData);				
-		watchListFile->Create();
+    gridCrew = d->m_gridCrew;
+    gridWake = d->m_gridCrewWake;
+    rowHeight = gridCrew->GetRowHeight( 0 );
+    selRow = 0;
+    selCol = 0;
+    day = 0;
+    ActualWatch::end = wxDateTime::Now()+wxDateSpan( 1 );
+
+    this->layout = layout;
+    this->ODTLayout = layoutODT;
+    modified = false;
+
+    if ( dialog->m_radioBtnHTMLCrew->GetValue() )
+        layout_locn = layout;
+    else
+        layout_locn = layoutODT;
+
+    wxString watchData = data;
+    watchData.Append( _T( "watchlist.txt" ) );
+    wxFileName wxHomeFiledir( watchData ) ;
+    if ( true != wxHomeFiledir.FileExists() )
+    {
+        watchListFile = new wxTextFile( watchData );
+        watchListFile->Create();
 //		watchListFile->AddLine(_T("#1.2#"));
-	}
-	else
-		watchListFile = new wxTextFile(watchData);
+    }
+    else
+        watchListFile = new wxTextFile( watchData );
+
+    wxString crewData = data;
+    crewData.Append( _T( "crewlist.txt" ) );
+    wxFileName wxHomeFiledir1( crewData ) ;
+    if ( true != wxHomeFiledir1.FileExists() )
+    {
+        crewListFile = new wxTextFile( crewData );
+        crewListFile->Create();
+    }
+    else
+        crewListFile = new wxTextFile( crewData );
+
+    wxString crewLay = layout_locn;
+    crewLay.Append( _T( "crew" ) );
+    dialog->appendOSDirSlash( &crewLay );
+
+    data_locn = crewData;
+    layout_locn = crewLay;
+    html_locn = data_locn;
+    html_locn.Replace( _T( "txt" ),_T( "html" ) );
 
-	wxString crewData = data;
-	crewData.Append(_T("crewlist.txt"));
-	wxFileName wxHomeFiledir1(crewData) ;
-	if(true != wxHomeFiledir1.FileExists())
-	{
-		crewListFile = new wxTextFile(crewData);				
-		crewListFile->Create();
-	}
-	else
-		crewListFile = new wxTextFile(crewData);
+    setLayoutLocation( layout_locn );
 
-	wxString crewLay = layout_locn;
-	crewLay.Append(_T("crew"));
-	dialog->appendOSDirSlash(&crewLay);
-
-	data_locn = crewData;
-	layout_locn = crewLay;
-	html_locn = data_locn;
-	html_locn.Replace(_T("txt"),_T("html"));
-
-	setLayoutLocation(layout_locn);
-
-	gridWakeInit();
+    gridWakeInit();
 }
 
-CrewList::~CrewList(void)
+CrewList::~CrewList( void )
 {
-	saveData();
+    saveData();
 }
 
 void CrewList::gridWakeInit()
 {
-	gridCrew->EnableDragCell();
-	gridCrew->GetGridWindow()->SetDropTarget(new DnDCrew(gridCrew,this));
+    gridCrew->EnableDragCell();
+    gridCrew->GetGridWindow()->SetDropTarget( new DnDCrew( gridCrew,this ) );
 
-	gridWake->EnableDragCell();
-	gridWake->GetGridWindow()->SetDropTarget(new DnDWatch(gridWake,this));
+    gridWake->EnableDragCell();
+    gridWake->GetGridWindow()->SetDropTarget( new DnDWatch( gridWake,this ) );
 
-	gridWake->AutoSizeColumns();
-	gridWake->AutoSizeRows();
+    gridWake->AutoSizeColumns();
+    gridWake->AutoSizeRows();
 
-	firstColumn();
+    firstColumn();
 
 #ifdef __WXGTK__
-	dialog->m_splitterWatch->SetSashPosition(1);
+    dialog->m_splitterWatch->SetSashPosition( 1 );
 #else
-	dialog->m_splitterWatch->SetSashPosition(160);
+    dialog->m_splitterWatch->SetSashPosition( 160 );
 #endif
 
-	statustext[0] = _("Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes");
-	statustext[1] = _("Alter watchtimes as desired / Drag 'n Drop members from the Crewlist");
-	statustext[2] = _("*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate");
-	statustext[3] = _("All changes depending to this day only.");
+    statustext[0] = _( "Enter default watchtime e.g. 3.30 / available formats are 3.30, 3,30, 3:30, 0330 for 3 hours 30 minutes" );
+    statustext[1] = _( "Alter watchtimes as desired / Drag 'n Drop members from the Crewlist" );
+    statustext[2] = _( "*Optional* Prepend a * to a member to make this member static to a watch / Click Calculate" );
+    statustext[3] = _( "All changes depending to this day only." );
 }
 
 void CrewList::firstColumn()
 {
-	gridWake->SetCellEditor(3,0,new wxGridCellAutoWrapStringEditor);
-	dialog->m_textCtrlWatchStartTime->SetValue(_T("08:00"));
-	dialog->m_textCtrlWatchStartDate->SetValue(wxDateTime::Now().Format(dialog->logbookPlugIn->opt->sdateformat));
-
-	gridWake->SetCellValue(0,0,wxString::Format(_T("00:00%s"),dialog->logbookPlugIn->opt->motorh.c_str()));
-	wxDateTime dt,e;
-	dt = wxDateTime::Now();
-	e = dt;
-	dt.Set(8,0);
-	e.Set(7,59);
-	gridWake->SetCellValue(1,0,wxDateTime::Now().Format(dialog->logbookPlugIn->opt->sdateformat));
-	gridWake->SetCellValue(2,0,wxString::Format(_T("%s-%s"),dt.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str(),
-						e.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str()));//_T("08:00-07:59"));
-	gridWake->SetCellValue(3,0,wxEmptyString);
-
-	gridWake->SetReadOnly(1,0);
-	gridWake->SetReadOnly(2,0);
-	gridWake->AutoSizeColumns();
-}
-
-void CrewList::setLayoutLocation(wxString loc)
-{
-	bool radio = dialog->m_radioBtnHTMLCrew->GetValue();
-	if(radio)
-		layout_locn = layout;
-	else
-		layout_locn = ODTLayout;
-	wxString crewLay = layout_locn;
-
-	crewLay.Append(_T("crew"));
-	dialog->appendOSDirSlash(&crewLay);
-	layout_locn = crewLay;
-	dialog->loadLayoutChoice(LogbookDialog::CREW,crewLay,dialog->crewChoice,opt->layoutPrefix[LogbookDialog::CREW]);
-	if(radio)
-		dialog->crewChoice->SetSelection(dialog->logbookPlugIn->opt->crewGridLayoutChoice);
-	else
-		dialog->crewChoice->SetSelection(dialog->logbookPlugIn->opt->crewGridLayoutChoiceODT);
+    gridWake->SetCellEditor( 3,0,new wxGridCellAutoWrapStringEditor );
+    dialog->m_textCtrlWatchStartTime->SetValue( _T( "08:00" ) );
+    dialog->m_textCtrlWatchStartDate->SetValue( wxDateTime::Now().Format( dialog->logbookPlugIn->opt->sdateformat ) );
+
+    gridWake->SetCellValue( 0,0,wxString::Format( _T( "00:00%s" ),dialog->logbookPlugIn->opt->motorh.c_str() ) );
+    wxDateTime dt,e;
+    dt = wxDateTime::Now();
+    e = dt;
+    dt.Set( 8,0 );
+    e.Set( 7,59 );
+    gridWake->SetCellValue( 1,0,wxDateTime::Now().Format( dialog->logbookPlugIn->opt->sdateformat ) );
+    gridWake->SetCellValue( 2,0,wxString::Format( _T( "%s-%s" ),dt.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str(),
+                            e.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str() ) ); //_T("08:00-07:59"));
+    gridWake->SetCellValue( 3,0,wxEmptyString );
+
+    gridWake->SetReadOnly( 1,0 );
+    gridWake->SetReadOnly( 2,0 );
+    gridWake->AutoSizeColumns();
+}
+
+void CrewList::setLayoutLocation( wxString loc )
+{
+    bool radio = dialog->m_radioBtnHTMLCrew->GetValue();
+    if ( radio )
+        layout_locn = layout;
+    else
+        layout_locn = ODTLayout;
+    wxString crewLay = layout_locn;
+
+    crewLay.Append( _T( "crew" ) );
+    dialog->appendOSDirSlash( &crewLay );
+    layout_locn = crewLay;
+    dialog->loadLayoutChoice( LogbookDialog::CREW,crewLay,dialog->crewChoice,opt->layoutPrefix[LogbookDialog::CREW] );
+    if ( radio )
+        dialog->crewChoice->SetSelection( dialog->logbookPlugIn->opt->crewGridLayoutChoice );
+    else
+        dialog->crewChoice->SetSelection( dialog->logbookPlugIn->opt->crewGridLayoutChoiceODT );
 
 }
 
 void CrewList::loadData()
 {
-	wxString s, line;
-	wxGrid* grid;
-	int lineCount, numRows;
-	bool newCol;
-
-	if(gridCrew->GetNumberRows() > 0)
-		gridCrew->DeleteRows(0,gridCrew->GetNumberRows());
-
-	crewListFile->Open();
-	lineCount = crewListFile->GetLineCount();
-
-	if(lineCount <= 0) { crewListFile->Close(); return; }
+    wxString s, line;
+    wxGrid* grid;
+    int lineCount, numRows;
+    bool newCol;
+
+    if ( gridCrew->GetNumberRows() > 0 )
+        gridCrew->DeleteRows( 0,gridCrew->GetNumberRows() );
+
+    crewListFile->Open();
+    lineCount = crewListFile->GetLineCount();
+
+    if ( lineCount <= 0 )
+    {
+        crewListFile->Close();
+        return;
+    }
+
+    for ( int i = 0; i < lineCount; i++ )
+    {
+        line = crewListFile->GetLine( i );
+        if ( line.Contains( _T( "#1.2#" ) ) )
+            continue;
+        gridCrew->AppendRows();
+        numRows = gridCrew->GetNumberRows()-1;
+        myGridCellBoolEditor* boolEditor = new myGridCellBoolEditor();
+        boolEditor->UseStringValues( _( "Yes" ) );
+        gridCrew->SetCellEditor( numRows,0,boolEditor );
+        gridCrew->SetCellAlignment( wxALIGN_CENTRE,numRows,0 );
+
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        int c;
+        int colCount = gridCrew->GetNumberCols();
+        if ( tkz.CountTokens() != ( unsigned int ) colCount )
+        {
+            c = 1;
+            newCol = true;
+        }
+        else
+        {
+            c = 0;
+            newCol = false;
+        }
 
-	for( int i = 0; i < lineCount; i++)
-	{
-		line = crewListFile->GetLine(i);
-		if(line.Contains(_T("#1.2#")))
-			continue;
-		gridCrew->AppendRows();
-		numRows = gridCrew->GetNumberRows()-1;
-		myGridCellBoolEditor* boolEditor = new myGridCellBoolEditor();
-		boolEditor->UseStringValues(_("Yes"));
-		gridCrew->SetCellEditor(numRows,0,boolEditor);
-		gridCrew->SetCellAlignment(wxALIGN_CENTRE,numRows,0);
-
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY);
-		int c;
-		int colCount = gridCrew->GetNumberCols();
-		if(tkz.CountTokens() != (unsigned int) colCount)
-			{ c = 1; newCol = true; }
-		else
-			{ c = 0; newCol = false; }
-
-		grid = gridCrew;
-
-		int cell = 0;
-		while ( tkz.HasMoreTokens() )
-		{
-			s = tkz.GetNextToken().RemoveLast();
-			s = dialog->restoreDangerChar(s);
-
-			if(cell == BIRTHDATE && (!s.IsEmpty() && s.GetChar(0) != ' '))
-				s = dialog->maintenance->getDateString(s);
-			if(cell == EST_ON && (!s.IsEmpty() && s.GetChar(0) != ' '))
-				s = dialog->maintenance->getDateString(s);
-			grid->SetCellValue(numRows,c++,s);
-			cell++;
-			if(c == colCount) break;
-		}
-
-		if(newCol)
-		{
-			modified = true;
-			grid->SetCellValue(numRows,0,_("Yes"));
-		}
-	}
+        grid = gridCrew;
 
-	crewListFile->Close();
-	gridCrew->ForceRefresh();
+        int cell = 0;
+        while ( tkz.HasMoreTokens() )
+        {
+            s = tkz.GetNextToken().RemoveLast();
+            s = dialog->restoreDangerChar( s );
 
-	watchListFile->Open();
-	lineCount = watchListFile->GetLineCount();
+            if ( cell == BIRTHDATE && ( !s.IsEmpty() && s.GetChar( 0 ) != ' ' ) )
+                s = dialog->maintenance->getDateString( s );
+            if ( cell == EST_ON && ( !s.IsEmpty() && s.GetChar( 0 ) != ' ' ) )
+                s = dialog->maintenance->getDateString( s );
+            grid->SetCellValue( numRows,c++,s );
+            cell++;
+            if ( c == colCount ) break;
+        }
 
-	if(lineCount <= 6) { watchListFile->Close(); statusText(DEFAULTWATCH); return; }
+        if ( newCol )
+        {
+            modified = true;
+            grid->SetCellValue( numRows,0,_( "Yes" ) );
+        }
+    }
 
-	line = watchListFile->GetFirstLine();
-	wxStringTokenizer tkz(line,_T("\t"));
-	s = tkz.GetNextToken();
-	if(s != _T("#1.2#")) return;
-	s = tkz.GetNextToken();
-	dialog->m_textCtrlWatchStartDate->SetValue(s);
-	s = tkz.GetNextToken();
-	dialog->m_textCtrlWatchStartTime->SetValue(s);
-	s = tkz.GetNextToken();
-	if(s == _T("1"))
-		setDayButtons(true);
-	dialog->m_buttonReset->Enable();
-	s = tkz.GetNextToken();
-	dialog->m_textCtrlWakeTrip->SetValue(s);
+    crewListFile->Close();
+    gridCrew->ForceRefresh();
 
-	setMembersInMenu();
+    watchListFile->Open();
+    lineCount = watchListFile->GetLineCount();
 
-	dayNow(false);
-	if(day != 0)
-	{
-		dialog->m_textCtrlWatchStartDate->Enable(false);
-		dialog->m_textCtrlWatchStartTime->Enable(false);
-		dialog->m_textCtrlWakeTrip->Enable(false);
-	}
+    if ( lineCount <= 6 )
+    {
+        watchListFile->Close();
+        statusText( DEFAULTWATCH );
+        return;
+    }
+
+    line = watchListFile->GetFirstLine();
+    wxStringTokenizer tkz( line,_T( "\t" ) );
+    s = tkz.GetNextToken();
+    if ( s != _T( "#1.2#" ) ) return;
+    s = tkz.GetNextToken();
+    dialog->m_textCtrlWatchStartDate->SetValue( s );
+    s = tkz.GetNextToken();
+    dialog->m_textCtrlWatchStartTime->SetValue( s );
+    s = tkz.GetNextToken();
+    if ( s == _T( "1" ) )
+        setDayButtons( true );
+    dialog->m_buttonReset->Enable();
+    s = tkz.GetNextToken();
+    dialog->m_textCtrlWakeTrip->SetValue( s );
+
+    setMembersInMenu();
+
+    dayNow( false );
+    if ( day != 0 )
+    {
+        dialog->m_textCtrlWatchStartDate->Enable( false );
+        dialog->m_textCtrlWatchStartTime->Enable( false );
+        dialog->m_textCtrlWakeTrip->Enable( false );
+    }
 }
 
 void CrewList::filterCrewMembers()
 {
-	int i = 0;
+    int i = 0;
 
-	for(int row = 0; row < gridCrew->GetNumberRows(); row++)
-	{
-		if(gridCrew->GetCellValue(row,ONBOARD) == _T(""))
-		{
-			gridCrew->SetRowHeight(row,0);
-			i++;
-		}
-	}
+    for ( int row = 0; row < gridCrew->GetNumberRows(); row++ )
+    {
+        if ( gridCrew->GetCellValue( row,ONBOARD ) == _T( "" ) )
+        {
+            gridCrew->SetRowHeight( row,0 );
+            i++;
+        }
+    }
 
-	if(i == gridCrew->GetNumberRows()) 
-	{
-		showAllCrewMembers();
-		dialog->m_menu2->Check(MENUCREWONBOARD,false);
-		dialog->m_menu2->Check(MENUCREWALL,true);
-	}
-	else
-		gridCrew->ForceRefresh();
+    if ( i == gridCrew->GetNumberRows() )
+    {
+        showAllCrewMembers();
+        dialog->m_menu2->Check( MENUCREWONBOARD,false );
+        dialog->m_menu2->Check( MENUCREWALL,true );
+    }
+    else
+        gridCrew->ForceRefresh();
 }
 
 void CrewList::showAllCrewMembers()
 {
-	for(int row = 0; row < gridCrew->GetNumberRows(); row++)
-	{
-		if(gridCrew->GetCellValue(row,ONBOARD) == _T(""))
-			gridCrew->SetRowHeight(row,rowHeight);
-	}
+    for ( int row = 0; row < gridCrew->GetNumberRows(); row++ )
+    {
+        if ( gridCrew->GetCellValue( row,ONBOARD ) == _T( "" ) )
+            gridCrew->SetRowHeight( row,rowHeight );
+    }
 
-	gridCrew->ForceRefresh();
+    gridCrew->ForceRefresh();
 }
 
 void CrewList::saveData()
 {
-	if(!modified) return;
-	modified = false;
+    if ( !modified ) return;
+    modified = false;
 
-	wxString s = _T("");
-	crewListFile->Open();
-	crewListFile->Clear();
-
-	int count = gridCrew->GetNumberRows();
-	crewListFile->AddLine(_T("#1.2#"));
-	for(int r = 0; r < count; r++)
-	{
-		for(int c = 0; c < gridCrew->GetNumberCols(); c++)
-		{
-			wxString temp = gridCrew->GetCellValue(r,c);
-			if(c == BIRTHDATE && (!temp.IsEmpty() && temp.GetChar(0) != ' '))
-			{
-				wxDateTime dt;
-				dialog->myParseDate(temp,dt);
-				s += wxString::Format(_T("%i/%i/%i \t"),dt.GetMonth(), dt.GetDay(), dt.GetYear());
-			}
-			else if(c == EST_ON && (!temp.IsEmpty() && temp.GetChar(0) != ' '))
-			{
-				wxDateTime dt;
-				dialog->myParseDate(temp,dt);
-				s += wxString::Format(_T("%i/%i/%i \t"),dt.GetMonth(), dt.GetDay(), dt.GetYear());
-			}
-			else
-				s += temp +_T(" \t");
-		}
-		s.RemoveLast();
-		crewListFile->AddLine(s);
-		s = _T("");
-	}
-	crewListFile->Write();
-	crewListFile->Close();
+    wxString s = _T( "" );
+    crewListFile->Open();
+    crewListFile->Clear();
+
+    int count = gridCrew->GetNumberRows();
+    crewListFile->AddLine( _T( "#1.2#" ) );
+    for ( int r = 0; r < count; r++ )
+    {
+        for ( int c = 0; c < gridCrew->GetNumberCols(); c++ )
+        {
+            wxString temp = gridCrew->GetCellValue( r,c );
+            if ( c == BIRTHDATE && ( !temp.IsEmpty() && temp.GetChar( 0 ) != ' ' ) )
+            {
+                wxDateTime dt;
+                dialog->myParseDate( temp,dt );
+                s += wxString::Format( _T( "%i/%i/%i \t" ),dt.GetMonth(), dt.GetDay(), dt.GetYear() );
+            }
+            else if ( c == EST_ON && ( !temp.IsEmpty() && temp.GetChar( 0 ) != ' ' ) )
+            {
+                wxDateTime dt;
+                dialog->myParseDate( temp,dt );
+                s += wxString::Format( _T( "%i/%i/%i \t" ),dt.GetMonth(), dt.GetDay(), dt.GetYear() );
+            }
+            else
+                s += temp +_T( " \t" );
+        }
+        s.RemoveLast();
+        crewListFile->AddLine( s );
+        s = _T( "" );
+    }
+    crewListFile->Write();
+    crewListFile->Close();
 
-	watchListFile->Close();
+    watchListFile->Close();
 }
 
-void CrewList::addCrew(wxGrid* grid, wxGrid* wake)
+void CrewList::addCrew( wxGrid* grid, wxGrid* wake )
 {
-	wxString s;
+    wxString s;
 
-	modified = true;
+    modified = true;
 
-	gridCrew->AppendRows();
+    gridCrew->AppendRows();
 
-	int numRows = gridCrew->GetNumberRows()-1;
-	myGridCellBoolEditor* boolEditor = new myGridCellBoolEditor();
-	boolEditor->UseStringValues(_("Yes"));
-	gridCrew->SetCellEditor(numRows,0,boolEditor);
+    int numRows = gridCrew->GetNumberRows()-1;
+    myGridCellBoolEditor* boolEditor = new myGridCellBoolEditor();
+    boolEditor->UseStringValues( _( "Yes" ) );
+    gridCrew->SetCellEditor( numRows,0,boolEditor );
 
-	gridCrew->SetCellAlignment(wxALIGN_CENTRE,numRows,0);
-	gridCrew->MakeCellVisible(numRows,NAME);
+    gridCrew->SetCellAlignment( wxALIGN_CENTRE,numRows,0 );
+    gridCrew->MakeCellVisible( numRows,NAME );
 
-	if(dialog->m_menu2->IsChecked(MENUCREWALL))
-		grid->SetCellValue(numRows,ONBOARD,_T(""));
-	else
-		grid->SetCellValue(numRows,ONBOARD,_("Yes"));
+    if ( dialog->m_menu2->IsChecked( MENUCREWALL ) )
+        grid->SetCellValue( numRows,ONBOARD,_T( "" ) );
+    else
+        grid->SetCellValue( numRows,ONBOARD,_( "Yes" ) );
 
-	gridCrew->SetFocus();
-	gridCrew->SetGridCursor(numRows,NAME);
+    gridCrew->SetFocus();
+    gridCrew->SetGridCursor( numRows,NAME );
 }
 
-void CrewList::changeCrew(wxGrid* grid, int row, int col, int offset)
+void CrewList::changeCrew( wxGrid* grid, int row, int col, int offset )
 {
-	wxString result;
+    wxString result;
 
-	modified = true;
-	wxString search;
+    modified = true;
+    wxString search;
 
-	if(col == ONBOARD && dialog->m_menu2->IsChecked(MENUCREWONBOARD))
-	{
-		if(grid->GetCellValue(row,col) == _T("") )
-		{
-			filterCrewMembers();
-			grid->ForceRefresh();				
-		}
-	}
-/*	if(col == NAME && offset == 0)
-	{
-			int rowWake = searchInWatch();
-			if(rowWake >= 0)
-				gridWake->SetCellValue(rowWake,0,gridCrew->GetCellValue(dialog->selGridRow,NAME));
-	}
-	if(col == FIRSTNAME && offset == 0)
-	{
-			int rowWake = searchInWatch();
-			if(rowWake >= 0)
-				gridWake->SetCellValue(rowWake,1,gridCrew->GetCellValue(row,FIRSTNAME));
-	}
-	*/
+    if ( col == ONBOARD && dialog->m_menu2->IsChecked( MENUCREWONBOARD ) )
+    {
+        if ( grid->GetCellValue( row,col ) == _T( "" ) )
+        {
+            filterCrewMembers();
+            grid->ForceRefresh();
+        }
+    }
+    /*	if(col == NAME && offset == 0)
+    	{
+    			int rowWake = searchInWatch();
+    			if(rowWake >= 0)
+    				gridWake->SetCellValue(rowWake,0,gridCrew->GetCellValue(dialog->selGridRow,NAME));
+    	}
+    	if(col == FIRSTNAME && offset == 0)
+    	{
+    			int rowWake = searchInWatch();
+    			if(rowWake >= 0)
+    				gridWake->SetCellValue(rowWake,1,gridCrew->GetCellValue(row,FIRSTNAME));
+    	}
+    	*/
 }
 /*
-int CrewList::searchInWatch() 
+int CrewList::searchInWatch()
 {
 	for(int row = 0; row < gridWake->GetNumberRows(); row++)
 	{
@@ -394,2489 +410,2523 @@
 	return -1;
 }
 */
-void CrewList::changeCrewWake(wxGrid* grid, int row, int col, bool* toggle)
+void CrewList::changeCrewWake( wxGrid* grid, int row, int col, bool* toggle )
 {
-	wxDateTime dt, time;
-	wxString s;
+    wxDateTime dt, time;
+    wxString s;
 
-	if (row == 0)
-	{
-		s = gridWake->GetCellValue(0,col);
+    if ( row == 0 )
+    {
+        s = gridWake->GetCellValue( 0,col );
 
-		if(s.Contains(_T(" ")))
-		{
-			s = s.RemoveLast();
-			s = s.RemoveLast();
-		}
+        if ( s.Contains( _T( " " ) ) )
+        {
+            s = s.RemoveLast();
+            s = s.RemoveLast();
+        }
 
-		if(!checkHourFormat(s, 0, col, &dt)) return;
+        if ( !checkHourFormat( s, 0, col, &dt ) ) return;
 
-		wxString t = wxString::Format(_T("%s %s"),dt.Format(_T("%H:%M")).c_str(),dialog->logbookPlugIn->opt->motorh.c_str());
+        wxString t = wxString::Format( _T( "%s %s" ),dt.Format( _T( "%H:%M" ) ).c_str(),dialog->logbookPlugIn->opt->motorh.c_str() );
 
-		if( t == s || (dt.GetHour() == 0 && dt.GetMinute() == 0)) return;
-		gridWake->SetCellValue(0,col,t);
-	}
-	
-	if(row == 3)
-	{
-		s = gridWake->GetCellValue(row,col);
-		if(s.IsEmpty())
-		{
-			gridWake->SetCellValue(row,col,_T(" "));
-			return;
-		}
-		if(s.GetChar(0) == '\n')
-		{
-			s = s.substr(1);
-			gridWake->SetCellValue(row,col,s);
-		}
-	}
+        if ( t == s || ( dt.GetHour() == 0 && dt.GetMinute() == 0 ) ) return;
+        gridWake->SetCellValue( 0,col,t );
+    }
+
+    if ( row == 3 )
+    {
+        s = gridWake->GetCellValue( row,col );
+        if ( s.IsEmpty() )
+        {
+            gridWake->SetCellValue( row,col,_T( " " ) );
+            return;
+        }
+        if ( s.GetChar( 0 ) == '\n' )
+        {
+            s = s.substr( 1 );
+            gridWake->SetCellValue( row,col,s );
+        }
+    }
 
 }
 
-void CrewList::insertDefaultCols(bool *insertCols)
+void CrewList::insertDefaultCols( bool *insertCols )
 {
-	wxDateTime dt, dtend, time;
-	wxTimeSpan hr(24,0,0,0);
-	wxTimeSpan ed(0,1), df;
-	int i = 1;
-	wxString t;
+    wxDateTime dt, dtend, time;
+    wxTimeSpan hr( 24,0,0,0 );
+    wxTimeSpan ed( 0,1 ), df;
+    int i = 1;
+    wxString t;
 
-	df = createDefaultDateTime(dt, dtend, time);
-	if(df.GetHours() == 0 && df.GetMinutes() == 0) return;
+    df = createDefaultDateTime( dt, dtend, time );
+    if ( df.GetHours() == 0 && df.GetMinutes() == 0 ) return;
 
-	while(dt < dtend)
-	{
-		wxDateTime e = dt;
-		e.Add(df);
-		e.Subtract(ed);
+    while ( dt < dtend )
+    {
+        wxDateTime e = dt;
+        e.Add( df );
+        e.Subtract( ed );
 //		wxMessageBox(wxString::Format(_T("%s %s %s \n%s\n%i"),dt.FormatDate(),dtend.FormatDate(),time.FormatISOTime(),e.FormatDate(),df.GetHours()));
-		if(e < dtend)
-		{
-			insertWatchColumn(i,t,time,dt,e,insertCols);
-		}
-		else
-		{
-			e = dtend;
-			wxDateTime tt = e;
-			e.Subtract(ed);
-			wxTimeSpan x = tt.Subtract(dt);
-			int hh = x.GetHours();
-			int mm = x.GetMinutes()-hh*60;
-			wxDateTime y(hh,mm);
-
-			insertWatchColumn(i,t,y,dt,e,insertCols);
-		}
-		i++;
-		dt.Add(df);
-	}
-	day = 0;
-	statusText(ALTERWATCH);
-}
-
-wxTimeSpan CrewList::createDefaultDateTime(wxDateTime &dt, wxDateTime &dtend, wxDateTime &time)
-{
-	wxTimeSpan hr(24,0,0,0);
-	wxTimeSpan ed(0,1);
-	wxString t;
-
-	dialog->myParseTime(gridWake->GetCellValue(0,0),time);
-	dt = stringToDateTime(dialog->m_textCtrlWatchStartDate->GetValue(),dialog->m_textCtrlWatchStartTime->GetValue(),true);
-	dtend = dt;
-	dtend.Add(hr);
-
-	t = gridWake->GetCellValue(0,0);
-	wxStringTokenizer tkz(t,_T(":"));
-	long h,m;
-	tkz.GetNextToken().ToLong(&h);
-	tkz.GetNextToken().ToLong(&m);
-	wxTimeSpan df(h,m);
-
-	wxDateTime e = dt;
-	e.Add(df);
-	e.Subtract(ed);
-	gridWake->SetCellValue(2,0,wxString::Format(_T("%s-%s"),dt.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str(),
-								e.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str()));
-	dt.Add(df);
-
-	return df;
-}
-
-void CrewList::insertWatchColumn(int col, wxString time, wxDateTime wtime, wxDateTime dt, wxDateTime dtend,bool* insertCols)
-{
-		gridWake->BeginBatch();
-		gridWake->AppendCols();
-		gridWake->SetCellEditor(3,col,new wxGridCellAutoWrapStringEditor);
-
-		gridWake->SetColLabelValue(col,wxString::Format(_T("%d. %s"),col+1,dialog->m_gridGlobal->GetColLabelValue(LogbookDialog::WAKE).c_str()));
-		gridWake->SetCellValue(0,col,wxString::Format(_T("%s %s"),wtime.Format(_T("%H:%M")).c_str(),dialog->logbookPlugIn->opt->motorh.c_str()));
-		if(dt.GetDateOnly() != dtend.GetDateOnly())
-			gridWake->SetCellValue(1,col,wxString::Format(_T("%s\n%s"),dt.Format(dialog->logbookPlugIn->opt->sdateformat).c_str(),
-										dtend.Format(dialog->logbookPlugIn->opt->sdateformat).c_str()));
-		else
-			gridWake->SetCellValue(1,col,dt.Format(dialog->logbookPlugIn->opt->sdateformat));
-		gridWake->SetCellValue(2,col,wxString::Format(_T("%s-%s"),dt.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str(),
-									dtend.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str()));
-		gridWake->SetCellValue(3,col,_T(" "));
-		gridWake->SetReadOnly(1,col);
-		gridWake->SetReadOnly(2,col);
-		gridWake->EndBatch();
-		gridWake->AutoSizeColumns();
-}
-
-wxString CrewList::updateWatchTime(unsigned int day, int col, bool* insertCols)
-{
-	wxDateTime dt, dtst, dtend, time, e, tmp;
-	wxTimeSpan h((long)24,(long)0);
-	wxTimeSpan ed((long)0,(long)1);
-	wxString s, str, str1, str2, ret;
-	int delcol = 0;
-	time = wxDateTime::Now();
+        if ( e < dtend )
+        {
+            insertWatchColumn( i,t,time,dt,e,insertCols );
+        }
+        else
+        {
+            e = dtend;
+            wxDateTime tt = e;
+            e.Subtract( ed );
+            wxTimeSpan x = tt.Subtract( dt );
+            int hh = x.GetHours();
+            int mm = x.GetMinutes()-hh*60;
+            wxDateTime y( hh,mm );
 
-	ret = gridWake->GetCellValue(0,col);
+            insertWatchColumn( i,t,y,dt,e,insertCols );
+        }
+        i++;
+        dt.Add( df );
+    }
+    day = 0;
+    statusText( ALTERWATCH );
+}
+
+wxTimeSpan CrewList::createDefaultDateTime( wxDateTime &dt, wxDateTime &dtend, wxDateTime &time )
+{
+    wxTimeSpan hr( 24,0,0,0 );
+    wxTimeSpan ed( 0,1 );
+    wxString t;
+
+    dialog->myParseTime( gridWake->GetCellValue( 0,0 ),time );
+    dt = stringToDateTime( dialog->m_textCtrlWatchStartDate->GetValue(),dialog->m_textCtrlWatchStartTime->GetValue(),true );
+    dtend = dt;
+    dtend.Add( hr );
+
+    t = gridWake->GetCellValue( 0,0 );
+    wxStringTokenizer tkz( t,_T( ":" ) );
+    long h,m;
+    tkz.GetNextToken().ToLong( &h );
+    tkz.GetNextToken().ToLong( &m );
+    wxTimeSpan df( h,m );
+
+    wxDateTime e = dt;
+    e.Add( df );
+    e.Subtract( ed );
+    gridWake->SetCellValue( 2,0,wxString::Format( _T( "%s-%s" ),dt.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str(),
+                            e.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str() ) );
+    dt.Add( df );
+
+    return df;
+}
+
+void CrewList::insertWatchColumn( int col, wxString time, wxDateTime wtime, wxDateTime dt, wxDateTime dtend,bool* insertCols )
+{
+    gridWake->BeginBatch();
+    gridWake->AppendCols();
+    gridWake->SetCellEditor( 3,col,new wxGridCellAutoWrapStringEditor );
+
+    gridWake->SetColLabelValue( col,wxString::Format( _T( "%d. %s" ),col+1,dialog->m_gridGlobal->GetColLabelValue( LogbookDialog::WAKE ).c_str() ) );
+    gridWake->SetCellValue( 0,col,wxString::Format( _T( "%s %s" ),wtime.Format( _T( "%H:%M" ) ).c_str(),dialog->logbookPlugIn->opt->motorh.c_str() ) );
+    if ( dt.GetDateOnly() != dtend.GetDateOnly() )
+        gridWake->SetCellValue( 1,col,wxString::Format( _T( "%s\n%s" ),dt.Format( dialog->logbookPlugIn->opt->sdateformat ).c_str(),
+                                dtend.Format( dialog->logbookPlugIn->opt->sdateformat ).c_str() ) );
+    else
+        gridWake->SetCellValue( 1,col,dt.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+    gridWake->SetCellValue( 2,col,wxString::Format( _T( "%s-%s" ),dt.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str(),
+                            dtend.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str() ) );
+    gridWake->SetCellValue( 3,col,_T( " " ) );
+    gridWake->SetReadOnly( 1,col );
+    gridWake->SetReadOnly( 2,col );
+    gridWake->EndBatch();
+    gridWake->AutoSizeColumns();
+}
+
+wxString CrewList::updateWatchTime( unsigned int day, int col, bool* insertCols )
+{
+    wxDateTime dt, dtst, dtend, time, e, tmp;
+    wxTimeSpan h( ( long )24,( long )0 );
+    wxTimeSpan ed( ( long )0,( long )1 );
+    wxString s, str, str1, str2, ret;
+    int delcol = 0;
+    time = wxDateTime::Now();
+
+    ret = gridWake->GetCellValue( 0,col );
+
+    for ( int i = 0; i < gridWake->GetNumberCols(); i++ )
+    {
+        gridWake->SetColLabelValue( i,wxString::Format( _T( "%i. %s" ),i+1,dialog->m_gridGlobal->GetColLabelValue( LogbookDialog::WAKE ).c_str() ) );
+        dialog->myParseTime( gridWake->GetCellValue( 0,i ),time );
+        wxTimeSpan df( ( long )time.GetHour(),( long )time.GetMinute() );
 
-	for(int i = 0; i < gridWake->GetNumberCols(); i++)
-	{
-		gridWake->SetColLabelValue(i,wxString::Format(_T("%i. %s"),i+1,dialog->m_gridGlobal->GetColLabelValue(LogbookDialog::WAKE).c_str()));
-		dialog->myParseTime(gridWake->GetCellValue(0,i),time);
-		wxTimeSpan df((long)time.GetHour(),(long)time.GetMinute());
-
-		if(i == 0)
-		{
-			str1 = dialog->m_textCtrlWatchStartTime->GetValue();
-			dialog->myParseTime(str1,dtst);
-			getStartEndDate(gridWake->GetCellValue(1,i), dtst, dtend);
+        if ( i == 0 )
+        {
+            str1 = dialog->m_textCtrlWatchStartTime->GetValue();
+            dialog->myParseTime( str1,dtst );
+            getStartEndDate( gridWake->GetCellValue( 1,i ), dtst, dtend );
 //			wxTimeSpan ts(dtst.GetHour(),dtst.GetMinute());
 //			dtst.Add(ts);
-		}
-		else
-		{
-			str = gridWake->GetCellValue(2,i-1);
-		    	wxStringTokenizer tkz(str,_T("-"));
-			str1 = tkz.GetNextToken();
-			str2 = tkz.GetNextToken();
-			//dialog->myParseTime(str1,dtst);
-			dialog->myParseTime(str2,dtst);
-			getStartEndDate(gridWake->GetCellValue(1,i-1), dtst, dtend);
+        }
+        else
+        {
+            str = gridWake->GetCellValue( 2,i-1 );
+            wxStringTokenizer tkz( str,_T( "-" ) );
+            str1 = tkz.GetNextToken();
+            str2 = tkz.GetNextToken();
+            //dialog->myParseTime(str1,dtst);
+            dialog->myParseTime( str2,dtst );
+            getStartEndDate( gridWake->GetCellValue( 1,i-1 ), dtst, dtend );
 //			wxTimeSpan ts(dtst.GetHour(),dtst.GetMinute());
 //			dtst.Add(ts);
 //			wxTimeSpan tse(dtend.GetHour(),dtend.GetMinute());
 //			dtend.Add(tse);
-		}
+        }
+
+        //wxMessageBox(wxString::Format(_T("ohne %i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
+        if ( i != 0 )
+        {
+            //dtst.Add(df);
+            //	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
+            dtst = dtend;
+            //	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
+            dtst.Add( ed );
+            //	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
+            dtend.Add( df );
+            //	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
+            //dtend.Subtract(ed);
 
-		//wxMessageBox(wxString::Format(_T("ohne %i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
-		if(i != 0)
-		{
-			//dtst.Add(df);
-		//	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
-			dtst = dtend;
-		//	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
-			dtst.Add(ed);
-		//	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
-			dtend.Add(df);
-		//	wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
-			//dtend.Subtract(ed);
-
-		}
-		else
-		{
-			dtend = dtst;
-			dtend.Add(df);
-			dtend.Subtract(ed);
+        }
+        else
+        {
+            dtend = dtst;
+            dtend.Add( df );
+            dtend.Subtract( ed );
 //			wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
-		}
+        }
 //		wxMessageBox(wxString::Format(_T("%i %s %s\n%s %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
 
 //		dtend.Add(df);
 
 
-		if(gridWake->GetNumberCols() == 1) return ret;
-	//	wxMessageBox(wxString::Format(_T("%i %s  %s\n%s  %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
-		if(dtend.GetDateOnly() == dtst.GetDateOnly())
-			gridWake->SetCellValue(1,i,dtst.Format(dialog->logbookPlugIn->opt->sdateformat));
-		else
-			gridWake->SetCellValue(1,i,dtst.Format(dialog->logbookPlugIn->opt->sdateformat)+_T("\n")+dtend.Format(dialog->logbookPlugIn->opt->sdateformat));
-
-		gridWake->SetCellValue(2,i,wxString::Format(_T("%s-%s"),dtst.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str(),
-									dtend.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str()));
-
-		h.Subtract(df);
-		if(h.GetMinutes() < 0)
-		{
-			delcol = i;
-			break;
-		}
-	}
+        if ( gridWake->GetNumberCols() == 1 ) return ret;
+        //	wxMessageBox(wxString::Format(_T("%i %s  %s\n%s  %s"),i,dtst.FormatDate(),dtst.FormatTime(),dtend.FormatDate(),dtend.FormatTime()));
+        if ( dtend.GetDateOnly() == dtst.GetDateOnly() )
+            gridWake->SetCellValue( 1,i,dtst.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+        else
+            gridWake->SetCellValue( 1,i,dtst.Format( dialog->logbookPlugIn->opt->sdateformat )+_T( "\n" )+dtend.Format( dialog->logbookPlugIn->opt->sdateformat ) );
 
-	if(h.GetMinutes() > 1)
-	{
-		wxDateTime t, dt;
-		dt = dtend;
-		t.Set(h.GetHours(),(h.GetMinutes()-(h.GetHours()*60)));
-		dt.Add(ed);
-		e = dt;
-		e.Add(h);
-		e.Subtract(ed);
-		insertWatchColumn(gridWake->GetNumberCols(), _T(""), t,dt,e, insertCols);
-	}
-	else if(h.GetMinutes() < 0) // end > startvalue in textctrl
-	{
-		//gridWake->DeleteCols(delcol);
- 		wxStringTokenizer date(gridWake->GetCellValue(1,delcol),_T("\n")); // start and end can be different date
+        gridWake->SetCellValue( 2,i,wxString::Format( _T( "%s-%s" ),dtst.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str(),
+                                dtend.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str() ) );
 
-		wxStringTokenizer tkz (gridWake->GetCellValue(2,delcol),_T("-"));
-		wxString tmp = tkz.GetNextToken();
-		dialog->myParseTime(tmp,dt);  // now i have the actuall starting date/time 
+        h.Subtract( df );
+        if ( h.GetMinutes() < 0 )
+        {
+            delcol = i;
+            break;
+        }
+    }
+
+    if ( h.GetMinutes() > 1 )
+    {
+        wxDateTime t, dt;
+        dt = dtend;
+        t.Set( h.GetHours(),( h.GetMinutes()-( h.GetHours()*60 ) ) );
+        dt.Add( ed );
+        e = dt;
+        e.Add( h );
+        e.Subtract( ed );
+        insertWatchColumn( gridWake->GetNumberCols(), _T( "" ), t,dt,e, insertCols );
+    }
+    else if ( h.GetMinutes() < 0 ) // end > startvalue in textctrl
+    {
+        //gridWake->DeleteCols(delcol);
+        wxStringTokenizer date( gridWake->GetCellValue( 1,delcol ),_T( "\n" ) ); // start and end can be different date
+
+        wxStringTokenizer tkz ( gridWake->GetCellValue( 2,delcol ),_T( "-" ) );
+        wxString tmp = tkz.GetNextToken();
+        dialog->myParseTime( tmp,dt ); // now i have the actuall starting date/time
 
-		dialog->myParseTime(dialog->m_textCtrlWatchStartTime->GetValue(),dtend);
+        dialog->myParseTime( dialog->m_textCtrlWatchStartTime->GetValue(),dtend );
 //		getStartEndDate(gridWake->GetCellValue(1,delcol-1),dt,dtend);
-		if(date.CountTokens() == 1) // start and end are same date
-		{
-			dialog->myParseDate(date.GetNextToken(),dt);
-			dialog->myParseDate(gridWake->GetCellValue(1,delcol),dtend);
-			//dtend = dt;
-		}
-		else // start and end are not same date
-		{
-			dialog->myParseDate(date.GetNextToken(),dt);
-			dialog->myParseDate(date.GetNextToken(),dtend);
-		}
-
-		wxTimeSpan t = dtend-dt; 
-		dtend.Subtract(ed); // now i have the actuall end date/time 
-
-		if(dtend.GetDateOnly() == dt.GetDateOnly()) // decide if display two data
-			gridWake->SetCellValue(1,delcol,dt.Format(dialog->logbookPlugIn->opt->sdateformat));
-		else
-		{
-			gridWake->SetCellValue(1,delcol,dt.Format(dialog->logbookPlugIn->opt->sdateformat)+_T("\n")+dtend.Format(dialog->logbookPlugIn->opt->sdateformat));
-		}
-
-		gridWake->SetCellValue(2,delcol,wxString::Format(_T("%s-%s"),dt.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str(),
-									dtend.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str()));
-		gridWake->BeginBatch();
-		gridWake->SetCellValue(0,delcol,t.Format(_T("%H:%M")));
-		gridWake->EndBatch();
-		gridWake->ForceRefresh();
-		int z = gridWake->GetNumberCols();
-		wxDateTime	absEnd;
-		absEnd = getAbsEndTimeWatch(absEnd);
-		for(int x = 0; x < z; x++)
-		{
-			wxDateTime e;
-			e = getEndTimeWatch(gridWake->GetCellValue(2,x));
-			e.Add(ed);
-			if(e.GetHour() == absEnd.GetHour() && e.GetMinute() == absEnd.GetMinute())
-			{
-				int d = x+1;
-				if(d < z)
-				{
-					gridWake->DeleteCols(d,z-d);
-					break;
-				}
-			}
-		}
-	}
-	return ret; 
-}
+        if ( date.CountTokens() == 1 ) // start and end are same date
+        {
+            dialog->myParseDate( date.GetNextToken(),dt );
+            dialog->myParseDate( gridWake->GetCellValue( 1,delcol ),dtend );
+            //dtend = dt;
+        }
+        else // start and end are not same date
+        {
+            dialog->myParseDate( date.GetNextToken(),dt );
+            dialog->myParseDate( date.GetNextToken(),dtend );
+        }
 
+        wxTimeSpan t = dtend-dt;
+        dtend.Subtract( ed ); // now i have the actuall end date/time
 
-void CrewList::getStartEndDate(wxString date, wxDateTime &dtstart, wxDateTime &dtend)
-{
- 		wxStringTokenizer d(date,_T("\n")); // start and end can be different date
-		if(d.CountTokens() == 1) // start and end are same date
-		{
-			dialog->myParseDate(d.GetNextToken(),dtstart);
-			dtend = dtstart;
-		}
-		else // start and end are not same date
-		{
-			//dialog->myParseDate(date,dtstart);
-			d.GetNextToken();
-			//dialog->myParseDate(d.GetNextToken(),dtstart);
-			dialog->myParseDate(d.GetNextToken(),dtstart);
-		}
+        if ( dtend.GetDateOnly() == dt.GetDateOnly() ) // decide if display two data
+            gridWake->SetCellValue( 1,delcol,dt.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+        else
+        {
+            gridWake->SetCellValue( 1,delcol,dt.Format( dialog->logbookPlugIn->opt->sdateformat )+_T( "\n" )+dtend.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+        }
 
+        gridWake->SetCellValue( 2,delcol,wxString::Format( _T( "%s-%s" ),dt.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str(),
+                                dtend.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str() ) );
+        gridWake->BeginBatch();
+        gridWake->SetCellValue( 0,delcol,t.Format( _T( "%H:%M" ) ) );
+        gridWake->EndBatch();
+        gridWake->ForceRefresh();
+        int z = gridWake->GetNumberCols();
+        wxDateTime	absEnd;
+        absEnd = getAbsEndTimeWatch( absEnd );
+        for ( int x = 0; x < z; x++ )
+        {
+            wxDateTime e;
+            e = getEndTimeWatch( gridWake->GetCellValue( 2,x ) );
+            e.Add( ed );
+            if ( e.GetHour() == absEnd.GetHour() && e.GetMinute() == absEnd.GetMinute() )
+            {
+                int d = x+1;
+                if ( d < z )
+                {
+                    gridWake->DeleteCols( d,z-d );
+                    break;
+                }
+            }
+        }
+    }
+    return ret;
 }
 
-wxDateTime CrewList::getStartTimeWatch(wxString s)
+
+void CrewList::getStartEndDate( wxString date, wxDateTime &dtstart, wxDateTime &dtend )
 {
-	wxDateTime dtstart;
+    wxStringTokenizer d( date,_T( "\n" ) ); // start and end can be different date
+    if ( d.CountTokens() == 1 ) // start and end are same date
+    {
+        dialog->myParseDate( d.GetNextToken(),dtstart );
+        dtend = dtstart;
+    }
+    else // start and end are not same date
+    {
+        //dialog->myParseDate(date,dtstart);
+        d.GetNextToken();
+        //dialog->myParseDate(d.GetNextToken(),dtstart);
+        dialog->myParseDate( d.GetNextToken(),dtstart );
+    }
 
-	wxStringTokenizer tkz(s,_T("-"));
-	s = tkz.GetNextToken();
-	dialog->myParseTime(s,dtstart);
-	return dtstart;
 }
 
-wxDateTime CrewList::getEndTimeWatch(wxString s)
+wxDateTime CrewList::getStartTimeWatch( wxString s )
 {
-	wxDateTime dtend;
+    wxDateTime dtstart;
 
-	wxStringTokenizer tkz(s,_T("-"));
-	tkz.GetNextToken();
-	s = tkz.GetNextToken();
-	dialog->myParseTime(s,dtend);
-	return dtend;
+    wxStringTokenizer tkz( s,_T( "-" ) );
+    s = tkz.GetNextToken();
+    dialog->myParseTime( s,dtstart );
+    return dtstart;
 }
 
-wxDateTime CrewList::getAbsEndTimeWatch(wxDateTime dtend)
+wxDateTime CrewList::getEndTimeWatch( wxString s )
 {
-	dialog->myParseTime(dialog->m_textCtrlWatchStartTime->GetValue(),dtend);
+    wxDateTime dtend;
 
-	return dtend;
+    wxStringTokenizer tkz( s,_T( "-" ) );
+    tkz.GetNextToken();
+    s = tkz.GetNextToken();
+    dialog->myParseTime( s,dtend );
+    return dtend;
 }
 
-void CrewList::Calculate()
+wxDateTime CrewList::getAbsEndTimeWatch( wxDateTime dtend )
 {
-	dialog->m_buttonCalculate->Enable(false);
-	dialog->m_buttonReset->Enable(true);
-	dialog->m_textCtrlWakeDay->Enable(true);
-
-	wxDateTime dtstart, dtend, time, dtNoShift = wxDateTime::Now();
-	wxTimeSpan ed(0,1);
-	wxString s,w;
-	wxArrayString ar, *noshift;
-	wxArrayInt singleNoShift;
-	bool shift = false, ins;
-
-	map<wxDateTime,wxArrayString*> noShiftMap;
-	map<wxDateTime,wxArrayString*>::iterator it;
-
-	watchListFile->Clear();
-	dialog->m_textCtrlWatchStartDate->Enable(false);
-	dialog->m_textCtrlWatchStartTime->Enable(false);
-	dialog->m_textCtrlWakeTrip->Enable(false);
-	
-	for(int c = 0; c < gridWake->GetNumberCols(); c++)  // write the base = day 0
-	{
-		s = wxString::Format(_T("%i\t"),0);
-
-		for(int r = 0; r < gridWake->GetNumberRows(); r++)
-		{
-			if(r == 0)
-			{
-				s += wxString::Format(_T("%i\t"),gridWake->GetColumnWidth(c));
-				s += dialog->replaceDangerChar(gridWake->GetCellValue(r,c))+_T("\t");
-			}
-
-			if(r == 1)
-			{
-				wxDateTime dtstart1, dtend1;
-				wxString t = gridWake->GetCellValue(r,c);
-				if(t.Contains(_T("\n")))
-				{
-					wxStringTokenizer tkz(t,_T("\n"));
-					dialog->myParseDate(tkz.GetNextToken(),dtstart1);
-					dialog->myParseDate(tkz.GetNextToken(),dtend1);
-					s += dialog->replaceDangerChar(wxString::Format(_T("%i/%i/%i\n%i/%i/%i\t"),dtstart1.GetMonth(),dtstart1.GetDay(),dtstart1.GetYear(),															dtend1.GetMonth(),dtend1.GetDay(),dtend1.GetYear()));
-				}
-				else
-				{
-					dialog->myParseDate(gridWake->GetCellValue(r,c),dtstart1);
-					dtend1 = dtstart1;
-					s += wxString::Format(_T("%i/%i/%i\t"),dtstart1.GetMonth(),dtstart1.GetDay(),dtstart1.GetYear());
-				}
-			}
-
-			if(r == 2)
-			{
-				wxDateTime from, to;
-				dtNoShift = getStartTimeWatch(gridWake->GetCellValue(r,c));
-				wxString g = gridWake->GetCellValue(r,c);
-				wxStringTokenizer sep(g,_T("-"));
-				dialog->myParseTime(sep.GetNextToken(),from);
-				dialog->myParseTime(sep.GetNextToken(),to);
-				s += wxString::Format(_T("%02i,%02i,%02i,%02i\t"),from.GetHour(),from.GetMinute(),to.GetHour(),to.GetMinute());
-			}
-
-			if(r == 3)
-			{
-				w = gridWake->GetCellValue(r,c);
-				//if(w.IsEmpty() || w.GetChar(0) == ' ') continue;
-				wxStringTokenizer l(w,_T("\n"));
-				int z = l.CountTokens();
-				int cc = 0;
-				while(l.HasMoreTokens())
-					if(l.GetNextToken().GetChar(0) == '*')
-						cc++;
-
-				if(z != 0 && cc == z)
-					singleNoShift.Add(1);
-				else if(!w.Contains(_T("\n")) && w.Contains(_T("*")))
-					singleNoShift.Add(1);
-				else
-					singleNoShift.Add(0);
-
-				{
-				    noshift = new wxArrayString();
-				    noshift->clear();
-					wxString g = wxEmptyString;
-					wxStringTokenizer tkz(w,_T("\n"));
-
-					while(tkz.HasMoreTokens())
-					{
-						wxString tmp = tkz.GetNextToken();
-
-						if(tmp.GetChar(0) != '*')
-							g += tmp + _T("\n");
-						else
-						{
-							if(!tmp.IsEmpty())
-								noshift->Add(dialog->replaceDangerChar(tmp));
-							else
-								noshift->Add(wxEmptyString);
-
-						}
-					}
-					g.RemoveLast();
-
-					if(!g.IsEmpty() && g.GetChar(0) != ' ')
-						ar.Add(dialog->replaceDangerChar(g));
-					
-					noShiftMap[dtNoShift] = noshift;
-
-					s += dialog->replaceDangerChar(gridWake->GetCellValue(r,c))+_T("\t");
-				}
-			}
-		}
-		s.RemoveLast();
-		s = dialog->replaceDangerChar(s);
-		watchListFile->AddLine(s);
-		s = _T("");
-	}
+    dialog->myParseTime( dialog->m_textCtrlWatchStartTime->GetValue(),dtend );
 
-	dialog->myParseTime(dialog->m_textCtrlWatchStartTime->GetValue(),dtstart);
-	dialog->myParseDate(dialog->m_textCtrlWatchStartDate->GetValue(),dtstart);
-	dtend = dtstart;
-
-	int dend = wxAtoi(dialog->m_textCtrlWakeTrip->GetValue())+1;
-	unsigned int i = 0;
-	for(int d = 1; d < dend; d++)
-	{
-		for(int c = 0; c < gridWake->GetNumberCols(); c++)
-		{
-			s = wxString::Format(_T("%i\t"),d);
-			ins = false;
-
-			for(int r = 0; r < gridWake->GetNumberRows(); r++)
-			{
-				if( r == 0)
-				{
-					s += wxString::Format(_T("%i\t"),gridWake->GetColumnWidth(c));
-					s += gridWake->GetCellValue(r,c)+_T("\t");
-					dialog->myParseTime(gridWake->GetCellValue(r,c),time);
-				}
-				if(r == 2)
-				{
-					wxTimeSpan df(time.GetHour(),time.GetMinute());
-
-					dtend = dtstart;
-					dtNoShift.Set(dtstart.GetHour(),dtstart.GetMinute());
-					dtend.Add(df);
-					dtend.Subtract(ed);
-
-					if(dtend.GetDateOnly() != dtstart.GetDateOnly())
-						s += wxString::Format(_T("%i/%i/%i\n%i/%i/%i\t"),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear(),
-												dtend.GetMonth(),dtend.GetDay(),dtend.GetYear());
-					else
-						s += wxString::Format(_T("%i/%i/%i\t"),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear());
-
-					s += wxString::Format(_T("%02i,%02i,%02i,%02i\t"),dtstart.GetHour(),dtstart.GetMinute(),dtend.GetHour(),dtend.GetMinute());
-					dtstart=dtend;
-					dtstart.Add(ed);
-				}
-				if(r == 3)
-				{
-					if(!ar.IsEmpty() && singleNoShift[c] == 0)
-					{
-						s += ar[i++];
-						ins = true;
-					}
-					if(i == ar.size())
-						{
-							i = 0;
-							shift = true;
-						}
-
-					it = noShiftMap.find(dtNoShift);
-					wxString g = wxEmptyString;
-					if(it != noShiftMap.end())
-					{
-						wxArrayString* t = (*it).second;
-						if(t->GetCount() > 0)
-						{
-						for(unsigned int ii = 0; ii < t->GetCount(); ii++)
-							if(!(*t)[ii].IsEmpty())
-								g += (*t)[ii]+_T("\n");
-						g.RemoveLast();
-						g = dialog->restoreDangerChar(g);
-						if(ins)
-							s += _T("\n")+g;
-						else
-							s += g;
-						}
-					}
-					s += +_T("\t");;
-				}				
-			}
-			s.RemoveLast();
-			s = dialog->replaceDangerChar(s);
-			watchListFile->AddLine(s);
-			s = wxEmptyString;
-		}
-	}
-	watchListFile->InsertLine(wxString::Format(_T("#1.2#\t%s\t%s\t%i\t%s"),
-		dialog->m_textCtrlWatchStartDate->GetValue().c_str(),dialog->m_textCtrlWatchStartTime->GetValue().c_str(),shift,dialog->m_textCtrlWakeTrip->GetValue().c_str()),0);
-	watchListFile->Write();
-	day = 1;
-	dayNow(false);
-	setDayButtons(shift);
-	setMembersInMenu();
+    return dtend;
 }
 
-void CrewList::rightClickMenu(int row, int col)
+void CrewList::Calculate()
 {
-	selRowWake = row;
-	selColWake = col;
+    dialog->m_buttonCalculate->Enable( false );
+    dialog->m_buttonReset->Enable( true );
+    dialog->m_textCtrlWakeDay->Enable( true );
+
+    wxDateTime dtstart, dtend, time, dtNoShift = wxDateTime::Now();
+    wxTimeSpan ed( 0,1 );
+    wxString s,w;
+    wxArrayString ar, *noshift;
+    wxArrayInt singleNoShift;
+    bool shift = false, ins;
+
+    map<wxDateTime,wxArrayString*> noShiftMap;
+    map<wxDateTime,wxArrayString*>::iterator it;
+
+    watchListFile->Clear();
+    dialog->m_textCtrlWatchStartDate->Enable( false );
+    dialog->m_textCtrlWatchStartTime->Enable( false );
+    dialog->m_textCtrlWakeTrip->Enable( false );
+
+    for ( int c = 0; c < gridWake->GetNumberCols(); c++ ) // write the base = day 0
+    {
+        s = wxString::Format( _T( "%i\t" ),0 );
 
-	wxArrayInt cols = gridWake->GetSelectedCols();
-	int count = cols.GetCount();
+        for ( int r = 0; r < gridWake->GetNumberRows(); r++ )
+        {
+            if ( r == 0 )
+            {
+                s += wxString::Format( _T( "%i\t" ),gridWake->GetColumnWidth( c ) );
+                s += dialog->replaceDangerChar( gridWake->GetCellValue( r,c ) )+_T( "\t" );
+            }
+
+            if ( r == 1 )
+            {
+                wxDateTime dtstart1, dtend1;
+                wxString t = gridWake->GetCellValue( r,c );
+                if ( t.Contains( _T( "\n" ) ) )
+                {
+                    wxStringTokenizer tkz( t,_T( "\n" ) );
+                    dialog->myParseDate( tkz.GetNextToken(),dtstart1 );
+                    dialog->myParseDate( tkz.GetNextToken(),dtend1 );
+                    s += dialog->replaceDangerChar( wxString::Format( _T( "%i/%i/%i\n%i/%i/%i\t" ),dtstart1.GetMonth(),dtstart1.GetDay(),dtstart1.GetYear(),															dtend1.GetMonth(),dtend1.GetDay(),dtend1.GetYear() ) );
+                }
+                else
+                {
+                    dialog->myParseDate( gridWake->GetCellValue( r,c ),dtstart1 );
+                    dtend1 = dtstart1;
+                    s += wxString::Format( _T( "%i/%i/%i\t" ),dtstart1.GetMonth(),dtstart1.GetDay(),dtstart1.GetYear() );
+                }
+            }
+
+            if ( r == 2 )
+            {
+                wxDateTime from, to;
+                dtNoShift = getStartTimeWatch( gridWake->GetCellValue( r,c ) );
+                wxString g = gridWake->GetCellValue( r,c );
+                wxStringTokenizer sep( g,_T( "-" ) );
+                dialog->myParseTime( sep.GetNextToken(),from );
+                dialog->myParseTime( sep.GetNextToken(),to );
+                s += wxString::Format( _T( "%02i,%02i,%02i,%02i\t" ),from.GetHour(),from.GetMinute(),to.GetHour(),to.GetMinute() );
+            }
+
+            if ( r == 3 )
+            {
+                w = gridWake->GetCellValue( r,c );
+                //if(w.IsEmpty() || w.GetChar(0) == ' ') continue;
+                wxStringTokenizer l( w,_T( "\n" ) );
+                int z = l.CountTokens();
+                int cc = 0;
+                while ( l.HasMoreTokens() )
+                    if ( l.GetNextToken().GetChar( 0 ) == '*' )
+                        cc++;
+
+                if ( z != 0 && cc == z )
+                    singleNoShift.Add( 1 );
+                else if ( !w.Contains( _T( "\n" ) ) && w.Contains( _T( "*" ) ) )
+                    singleNoShift.Add( 1 );
+                else
+                    singleNoShift.Add( 0 );
+
+                {
+                    noshift = new wxArrayString();
+                    noshift->clear();
+                    wxString g = wxEmptyString;
+                    wxStringTokenizer tkz( w,_T( "\n" ) );
+
+                    while ( tkz.HasMoreTokens() )
+                    {
+                        wxString tmp = tkz.GetNextToken();
+
+                        if ( tmp.GetChar( 0 ) != '*' )
+                            g += tmp + _T( "\n" );
+                        else
+                        {
+                            if ( !tmp.IsEmpty() )
+                                noshift->Add( dialog->replaceDangerChar( tmp ) );
+                            else
+                                noshift->Add( wxEmptyString );
+
+                        }
+                    }
+                    g.RemoveLast();
+
+                    if ( !g.IsEmpty() && g.GetChar( 0 ) != ' ' )
+                        ar.Add( dialog->replaceDangerChar( g ) );
+
+                    noShiftMap[dtNoShift] = noshift;
+
+                    s += dialog->replaceDangerChar( gridWake->GetCellValue( r,c ) )+_T( "\t" );
+                }
+            }
+        }
+        s.RemoveLast();
+        s = dialog->replaceDangerChar( s );
+        watchListFile->AddLine( s );
+        s = _T( "" );
+    }
+
+    dialog->myParseTime( dialog->m_textCtrlWatchStartTime->GetValue(),dtstart );
+    dialog->myParseDate( dialog->m_textCtrlWatchStartDate->GetValue(),dtstart );
+    dtend = dtstart;
+
+    int dend = wxAtoi( dialog->m_textCtrlWakeTrip->GetValue() )+1;
+    unsigned int i = 0;
+    for ( int d = 1; d < dend; d++ )
+    {
+        for ( int c = 0; c < gridWake->GetNumberCols(); c++ )
+        {
+            s = wxString::Format( _T( "%i\t" ),d );
+            ins = false;
 
-	if(count > 1)
-	{
-		dialog->m_menu21->Enable(MENUWAKESPLIT,false);
-		dialog->m_menu21->Enable(MENUWAKEMERGE,true);
-		dialog->m_menu21->Enable(MENUWAKECHANGE,true);
-	}
-	else
-	{
-		dialog->m_menu21->Enable(MENUWAKESPLIT,true);
-		dialog->m_menu21->Enable(MENUWAKEMERGE,false);
-		dialog->m_menu21->Enable(MENUWAKEDELETE,false);
-		dialog->m_menu21->Enable(MENUWAKECHANGE,false);
-	}
+            for ( int r = 0; r < gridWake->GetNumberRows(); r++ )
+            {
+                if ( r == 0 )
+                {
+                    s += wxString::Format( _T( "%i\t" ),gridWake->GetColumnWidth( c ) );
+                    s += gridWake->GetCellValue( r,c )+_T( "\t" );
+                    dialog->myParseTime( gridWake->GetCellValue( r,c ),time );
+                }
+                if ( r == 2 )
+                {
+                    wxTimeSpan df( time.GetHour(),time.GetMinute() );
+
+                    dtend = dtstart;
+                    dtNoShift.Set( dtstart.GetHour(),dtstart.GetMinute() );
+                    dtend.Add( df );
+                    dtend.Subtract( ed );
+
+                    if ( dtend.GetDateOnly() != dtstart.GetDateOnly() )
+                        s += wxString::Format( _T( "%i/%i/%i\n%i/%i/%i\t" ),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear(),
+                                               dtend.GetMonth(),dtend.GetDay(),dtend.GetYear() );
+                    else
+                        s += wxString::Format( _T( "%i/%i/%i\t" ),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear() );
+
+                    s += wxString::Format( _T( "%02i,%02i,%02i,%02i\t" ),dtstart.GetHour(),dtstart.GetMinute(),dtend.GetHour(),dtend.GetMinute() );
+                    dtstart=dtend;
+                    dtstart.Add( ed );
+                }
+                if ( r == 3 )
+                {
+                    if ( !ar.IsEmpty() && singleNoShift[c] == 0 )
+                    {
+                        s += ar[i++];
+                        ins = true;
+                    }
+                    if ( i == ar.size() )
+                    {
+                        i = 0;
+                        shift = true;
+                    }
+
+                    it = noShiftMap.find( dtNoShift );
+                    wxString g = wxEmptyString;
+                    if ( it != noShiftMap.end() )
+                    {
+                        wxArrayString* t = ( *it ).second;
+                        if ( t->GetCount() > 0 )
+                        {
+                            for ( unsigned int ii = 0; ii < t->GetCount(); ii++ )
+                                if ( !( *t )[ii].IsEmpty() )
+                                    g += ( *t )[ii]+_T( "\n" );
+                            g.RemoveLast();
+                            g = dialog->restoreDangerChar( g );
+                            if ( ins )
+                                s += _T( "\n" )+g;
+                            else
+                                s += g;
+                        }
+                    }
+                    s += +_T( "\t" );;
+                }
+            }
+            s.RemoveLast();
+            s = dialog->replaceDangerChar( s );
+            watchListFile->AddLine( s );
+            s = wxEmptyString;
+        }
+    }
+    watchListFile->InsertLine( wxString::Format( _T( "#1.2#\t%s\t%s\t%i\t%s" ),
+                               dialog->m_textCtrlWatchStartDate->GetValue().c_str(),dialog->m_textCtrlWatchStartTime->GetValue().c_str(),shift,dialog->m_textCtrlWakeTrip->GetValue().c_str() ),0 );
+    watchListFile->Write();
+    day = 1;
+    dayNow( false );
+    setDayButtons( shift );
+    setMembersInMenu();
+}
+
+void CrewList::rightClickMenu( int row, int col )
+{
+    selRowWake = row;
+    selColWake = col;
+
+    wxArrayInt cols = gridWake->GetSelectedCols();
+    int count = cols.GetCount();
+
+    if ( count > 1 )
+    {
+        dialog->m_menu21->Enable( MENUWAKESPLIT,false );
+        dialog->m_menu21->Enable( MENUWAKEMERGE,true );
+        dialog->m_menu21->Enable( MENUWAKECHANGE,true );
+    }
+    else
+    {
+        dialog->m_menu21->Enable( MENUWAKESPLIT,true );
+        dialog->m_menu21->Enable( MENUWAKEMERGE,false );
+        dialog->m_menu21->Enable( MENUWAKEDELETE,false );
+        dialog->m_menu21->Enable( MENUWAKECHANGE,false );
+    }
+
+    if ( gridWake->IsSelection() )
+        dialog->m_menu21->Enable( MENUWAKEDELETE,true );
+    else
+        dialog->m_menu21->Enable( MENUWAKEDELETE,false );
 
-	if(gridWake->IsSelection())
-		dialog->m_menu21->Enable(MENUWAKEDELETE,true);
-	else
-		dialog->m_menu21->Enable(MENUWAKEDELETE,false);
-    
-	gridWake->SetGridCursor(row,col);
-    gridWake->PopupMenu(dialog->m_menu21);
+    gridWake->SetGridCursor( row,col );
+    gridWake->PopupMenu( dialog->m_menu21 );
 }
 
 void CrewList::mergeWatches()
 {
-	bool dummy;
-	int leftCol = 10000;
-	wxDateTime dt;
-	wxTimeSpan sp(0);
-
-	wxArrayInt col = gridWake->GetSelectedCols();
-	unsigned int cc = col.GetCount();
-	if(cc <= 1) return;
-
-	bool sort = false;
-	unsigned int i = 0;
-	while(true)
-	{
-		int tmp = col[i+1];
-		if(col[i] > col[i+1])
-		{
-			col[i+1] = col[i];
-			col[i] = tmp;
-			sort = true;
-		}
-		i++;
-		if(i == cc-1) 
-		{
-			i = 0;
-			if(!sort)
-				break;
-			sort = false;
-		}
-	}
-
-	leftCol = col[0];
+    bool dummy;
+    int leftCol = 10000;
+    wxDateTime dt;
+    wxTimeSpan sp( 0 );
+
+    wxArrayInt col = gridWake->GetSelectedCols();
+    unsigned int cc = col.GetCount();
+    if ( cc <= 1 ) return;
+
+    bool sort = false;
+    unsigned int i = 0;
+    while ( true )
+    {
+        int tmp = col[i+1];
+        if ( col[i] > col[i+1] )
+        {
+            col[i+1] = col[i];
+            col[i] = tmp;
+            sort = true;
+        }
+        i++;
+        if ( i == cc-1 )
+        {
+            i = 0;
+            if ( !sort )
+                break;
+            sort = false;
+        }
+    }
 
-	for(unsigned int i = 0; i < cc; i++)
-	{
-		dialog->myParseTime(gridWake->GetCellValue(0,col[i]),dt);
-		wxTimeSpan df(dt.GetHour(),dt.GetMinute());
-		sp += df;
-	}
+    leftCol = col[0];
 
-	gridWake->BeginBatch();
-	for(int i = cc-1 ; i >= 0; i--)
-		if(leftCol != col[i])
-			gridWake->DeleteCols(col[i]);
-	gridWake->SetCellValue(0,leftCol,wxString::Format(_T("%s %s"),sp.Format(_T("%H:%M")).c_str(),dialog->logbookPlugIn->opt->motorh.c_str()));
-	gridWake->EndBatch();
-	updateWatchTime(day,0,&dummy);
+    for ( unsigned int i = 0; i < cc; i++ )
+    {
+        dialog->myParseTime( gridWake->GetCellValue( 0,col[i] ),dt );
+        wxTimeSpan df( dt.GetHour(),dt.GetMinute() );
+        sp += df;
+    }
+
+    gridWake->BeginBatch();
+    for ( int i = cc-1 ; i >= 0; i-- )
+        if ( leftCol != col[i] )
+            gridWake->DeleteCols( col[i] );
+    gridWake->SetCellValue( 0,leftCol,wxString::Format( _T( "%s %s" ),sp.Format( _T( "%H:%M" ) ).c_str(),dialog->logbookPlugIn->opt->motorh.c_str() ) );
+    gridWake->EndBatch();
+    updateWatchTime( day,0,&dummy );
 
-	updateLine();
+    updateLine();
 }
 
 void CrewList::flipWatches()
 {
-	wxArrayInt col = gridWake->GetSelectedCols();
-	if(col.Count() != 2) return;
-	
-	wxString tmp = gridWake->GetCellValue(3,col[0]);
-	gridWake->BeginBatch();
-	gridWake->SetCellValue(3,col[0],gridWake->GetCellValue(3,col[1]));
-	gridWake->SetCellValue(3,col[1],tmp);
-	gridWake->EndBatch();
+    wxArrayInt col = gridWake->GetSelectedCols();
+    if ( col.Count() != 2 ) return;
+
+    wxString tmp = gridWake->GetCellValue( 3,col[0] );
+    gridWake->BeginBatch();
+    gridWake->SetCellValue( 3,col[0],gridWake->GetCellValue( 3,col[1] ) );
+    gridWake->SetCellValue( 3,col[1],tmp );
+    gridWake->EndBatch();
 }
 
 void CrewList::splitWatch()
 {
-	wxDateTime dt;
-	bool dummy;
+    wxDateTime dt;
+    bool dummy;
 
-	wxString s = gridWake->GetCellValue(0,selColWake);
-	dialog->myParseTime(s,dt);
-	int hr = dt.GetHour()*60;
-	int min1 = dt.GetMinute()+hr;
-	int min = min1 / 2;
-	hr = min/60;
-	min = min-hr*60;
-	wxTimeSpan sp(hr,min);
-	wxTimeSpan sp1 = sp;
-	if(min1 % 2 != 0)
-		sp1.Add(wxTimeSpan(0,1));
-	
-	gridWake->BeginBatch();
-	gridWake->InsertCols(selColWake+1);
-	gridWake->SetCellValue(0,selColWake,wxString::Format(_T("%s %s"),sp.Format(_T("%H:%M")).c_str(),dialog->logbookPlugIn->opt->motorh.c_str()));
-	gridWake->SetCellValue(0,selColWake+1,wxString::Format(_T("%s %s"),sp1.Format(_T("%H:%M")).c_str(),dialog->logbookPlugIn->opt->motorh.c_str()));
-	gridWake->EndBatch();
-	updateWatchTime(day,0,&dummy);
-	
-	updateLine();
+    wxString s = gridWake->GetCellValue( 0,selColWake );
+    dialog->myParseTime( s,dt );
+    int hr = dt.GetHour()*60;
+    int min1 = dt.GetMinute()+hr;
+    int min = min1 / 2;
+    hr = min/60;
+    min = min-hr*60;
+    wxTimeSpan sp( hr,min );
+    wxTimeSpan sp1 = sp;
+    if ( min1 % 2 != 0 )
+        sp1.Add( wxTimeSpan( 0,1 ) );
+
+    gridWake->BeginBatch();
+    gridWake->InsertCols( selColWake+1 );
+    gridWake->SetCellValue( 0,selColWake,wxString::Format( _T( "%s %s" ),sp.Format( _T( "%H:%M" ) ).c_str(),dialog->logbookPlugIn->opt->motorh.c_str() ) );
+    gridWake->SetCellValue( 0,selColWake+1,wxString::Format( _T( "%s %s" ),sp1.Format( _T( "%H:%M" ) ).c_str(),dialog->logbookPlugIn->opt->motorh.c_str() ) );
+    gridWake->EndBatch();
+    updateWatchTime( day,0,&dummy );
+
+    updateLine();
 }
 
 void CrewList::setAsNewWatchbase()
 {
-	wxDateTime start,end;
-	wxString t = gridWake->GetCellValue(1,0);
-	getStartEndDate(gridWake->GetCellValue(1,0),start,end);
-	dialog->m_textCtrlWatchStartDate->SetValue(start.Format(dialog->logbookPlugIn->opt->sdateformat));
-	watchListFile->Clear();
-	day = 0;
-	dialog->m_textCtrlWakeDay->SetValue(_T("0"));
-	dialog->m_buttonCalculate->Enable(true);
-	dialog->m_buttonReset->Enable(false);
-	dialog->m_textCtrlWatchStartDate->Enable(true);
-	dialog->m_textCtrlWatchStartTime->Enable(true);
-	dialog->m_textCtrlWakeTrip->Enable(true);
-	dialog->m_textCtrlWakeDay->Enable(false);
-	setDayButtons(false);
-	this->statusText(HITCALCULATE);
+    wxDateTime start,end;
+    wxString t = gridWake->GetCellValue( 1,0 );
+    getStartEndDate( gridWake->GetCellValue( 1,0 ),start,end );
+    dialog->m_textCtrlWatchStartDate->SetValue( start.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+    watchListFile->Clear();
+    day = 0;
+    dialog->m_textCtrlWakeDay->SetValue( _T( "0" ) );
+    dialog->m_buttonCalculate->Enable( true );
+    dialog->m_buttonReset->Enable( false );
+    dialog->m_textCtrlWatchStartDate->Enable( true );
+    dialog->m_textCtrlWatchStartTime->Enable( true );
+    dialog->m_textCtrlWakeTrip->Enable( true );
+    dialog->m_textCtrlWakeDay->Enable( false );
+    setDayButtons( false );
+    this->statusText( HITCALCULATE );
 }
 
 void CrewList::enterDay()
 {
-	int d = wxAtoi(dialog->m_textCtrlWakeDay->GetValue());
-	if(d < 1 ) d = 1;
-	int trip = wxAtoi(dialog->m_textCtrlWakeTrip->GetValue());
-	if(d > trip) d = trip;
-	day = d;
-	readRecord(day);
+    int d = wxAtoi( dialog->m_textCtrlWakeDay->GetValue() );
+    if ( d < 1 ) d = 1;
+    int trip = wxAtoi( dialog->m_textCtrlWakeTrip->GetValue() );
+    if ( d > trip ) d = trip;
+    day = d;
+    readRecord( day );
 }
 
 void CrewList::deleteMembers()
 {
-	wxArrayInt col = gridWake->GetSelectedCols();
-	
-	if(col.Count() != 0)
-		for(unsigned int i = 0; i < col.Count(); i++)
-			gridWake->SetCellValue(3,col[i],wxEmptyString);
-	else
-		for(int i = 0; i < gridWake->GetNumberCols(); i++)
-			gridWake->SetCellValue(3,i,wxEmptyString);
+    wxArrayInt col = gridWake->GetSelectedCols();
+
+    if ( col.Count() != 0 )
+        for ( unsigned int i = 0; i < col.Count(); i++ )
+            gridWake->SetCellValue( 3,col[i],wxEmptyString );
+    else
+        for ( int i = 0; i < gridWake->GetNumberCols(); i++ )
+            gridWake->SetCellValue( 3,i,wxEmptyString );
 
-	updateLine();
-	gridWake->AutoSizeColumns();
+    updateLine();
+    gridWake->AutoSizeColumns();
 }
 
 void CrewList::setMembersInMenu()
 {
-	wxString col, m, member;
+    wxString col, m, member;
 
-	ActuellWatch::menuMembers.clear();
-	if(watchListFile->GetLineCount() < 1) return;
+    ActualWatch::menuMembers.clear();
+    if ( watchListFile->GetLineCount() < 1 ) return;
 
-	watchListFile->GoToLine(1);
-	col = watchListFile->GetLine(1);
+    watchListFile->GoToLine( 1 );
+    col = watchListFile->GetLine( 1 );
 
-	while(!watchListFile->Eof())
-	{
-		wxStringTokenizer tkz(col,_T("\t"));
-		for(int i = 0; i < 5; i++)
-			tkz.GetNextToken();
-		if(tkz.HasMoreTokens())
-			m = tkz.GetNextToken();
-		else
-		{
-			col = watchListFile->GetNextLine();
-			continue;
-		}
-
-		m = dialog->restoreDangerChar(m);
-		wxStringTokenizer mtkz(m,_T("\n"));
-		while(mtkz.HasMoreTokens())
-		{
-			member = mtkz.GetNextToken();
-			member.Replace(_T("*"),_T(""));
-
-			if(ActuellWatch::menuMembers.IsEmpty() && (member.length() == 1 && member.GetChar(0) != ' '))
-				ActuellWatch::menuMembers.Add(member);
-			else
-			{
-				bool found = false;
-				for(unsigned int i = 0; i < ActuellWatch::menuMembers.Count(); i++)
-					if(ActuellWatch::menuMembers[i] == member || (member.length() == 1 && member.GetChar(0) == ' '))
-					{
-						found = true;
-						break;
-					}
-			
-				if(!found)
-					ActuellWatch::menuMembers.Add(member);
-			}
-		}
-		col = watchListFile->GetNextLine();
-	}
+    while ( !watchListFile->Eof() )
+    {
+        wxStringTokenizer tkz( col,_T( "\t" ) );
+        for ( int i = 0; i < 5; i++ )
+            tkz.GetNextToken();
+        if ( tkz.HasMoreTokens() )
+            m = tkz.GetNextToken();
+        else
+        {
+            col = watchListFile->GetNextLine();
+            continue;
+        }
+
+        m = dialog->restoreDangerChar( m );
+        wxStringTokenizer mtkz( m,_T( "\n" ) );
+        while ( mtkz.HasMoreTokens() )
+        {
+            member = mtkz.GetNextToken();
+            member.Replace( _T( "*" ),_T( "" ) );
+
+            if ( ActualWatch::menuMembers.IsEmpty() && ( member.length() == 1 && member.GetChar( 0 ) != ' ' ) )
+                ActualWatch::menuMembers.Add( member );
+            else
+            {
+                bool found = false;
+                for ( unsigned int i = 0; i < ActualWatch::menuMembers.Count(); i++ )
+                    if ( ActualWatch::menuMembers[i] == member || ( member.length() == 1 && member.GetChar( 0 ) == ' ' ) )
+                    {
+                        found = true;
+                        break;
+                    }
+
+                if ( !found )
+                    ActualWatch::menuMembers.Add( member );
+            }
+        }
+        col = watchListFile->GetNextLine();
+    }
 }
 
-void CrewList::checkMemberIsInMenu(wxString member)
+void CrewList::checkMemberIsInMenu( wxString member )
 {
-	bool insert = true;
+    bool insert = true;
 
-	for(unsigned int i = 0; i < ActuellWatch::menuMembers.Count(); i++)
-	{
-		if(member == ActuellWatch::menuMembers[i])
-		{   insert = false;
-			break;
-		}
-	}
-	
-	if(insert)
-		ActuellWatch::menuMembers.Add(member);
+    for ( unsigned int i = 0; i < ActualWatch::menuMembers.Count(); i++ )
+    {
+        if ( member == ActualWatch::menuMembers[i] )
+        {
+            insert = false;
+            break;
+        }
+    }
+
+    if ( insert )
+        ActualWatch::menuMembers.Add( member );
 }
 
-void CrewList::wakeMemberDrag(int row, int col)
+void CrewList::wakeMemberDrag( int row, int col )
 {
 //	gridWake->SetRowHeight(row,gridWake->GetRowHeight(row)+30);
-	gridWake->SetColumnWidth(col,gridWake->GetColumnWidth(col)+20);
-	gridWake->Refresh();
+    gridWake->SetColumnWidth( col,gridWake->GetColumnWidth( col )+20 );
+    gridWake->Refresh();
 }
 
-void CrewList::watchEditorShown(int row, int col)
-{	
-	wxGridCellEditor* ed = gridWake->GetCellEditor(row, col);
-	wxTextCtrl* gridTextCtrl = wxDynamicCast(ed->GetControl(), wxTextCtrl );
-	
-	if(gridTextCtrl)
-	{
-		gridTextCtrl->Connect( wxEVT_MOTION, wxMouseEventHandler( LogbookDialog::OnMotion ), NULL, dialog );
-		gridTextCtrl->SetDropTarget(new DnDWatch(gridWake, this));
-		((DnDWatch*)gridWake->GetGridWindow()->GetDropTarget())->source = gridWake;
-		((DnDCrew*)gridCrew->GetGridWindow()->GetDropTarget())->source = gridWake;
-		((DnDWatch*)gridWake->GetGridWindow()->GetDropTarget())->col = col;
+void CrewList::watchEditorShown( int row, int col )
+{
+    wxGridCellEditor* ed = gridWake->GetCellEditor( row, col );
+    wxTextCtrl* gridTextCtrl = wxDynamicCast( ed->GetControl(), wxTextCtrl );
+
+    if ( gridTextCtrl )
+    {
+        gridTextCtrl->Connect( wxEVT_MOTION, wxMouseEventHandler( LogbookDialog::OnMotion ), NULL, dialog );
+        gridTextCtrl->SetDropTarget( new DnDWatch( gridWake, this ) );
+        ( ( DnDWatch* )gridWake->GetGridWindow()->GetDropTarget() )->source = gridWake;
+        ( ( DnDCrew* )gridCrew->GetGridWindow()->GetDropTarget() )->source = gridWake;
+        ( ( DnDWatch* )gridWake->GetGridWindow()->GetDropTarget() )->col = col;
 
 //		gridTextCtrl->ShowPosition(0);
-	}
+    }
 }
 
-void CrewList::watchEditorHidden(int row, int col)
+void CrewList::watchEditorHidden( int row, int col )
 {
-	wxGridCellEditor* ed = gridWake->GetCellEditor(row, col);
-	wxTextCtrl* gridTextCtrl = wxDynamicCast(ed->GetControl(), wxTextCtrl );
+    wxGridCellEditor* ed = gridWake->GetCellEditor( row, col );
+    wxTextCtrl* gridTextCtrl = wxDynamicCast( ed->GetControl(), wxTextCtrl );
 
-	if(gridTextCtrl && row == 3)
-	{
-		if(gridTextCtrl->IsModified())
-		{
-			updateLine();
-			if(ActuellWatch::day == day && ActuellWatch::col == col)
-				ActuellWatch::member = gridTextCtrl->GetValue();
-		}
-		gridTextCtrl->Disconnect( wxEVT_MOTION, wxMouseEventHandler( LogbookDialog::OnMotion ), NULL, dialog );
-	}
-	gridWake->AutoSizeRow(3);
-	gridWake->AutoSizeColumn(col);
-	gridWake->SetRowHeight(	3, gridWake->GetRowHeight(3)+10);
+    if ( gridTextCtrl && row == 3 )
+    {
+        if ( gridTextCtrl->IsModified() )
+        {
+            updateLine();
+            if ( ActualWatch::day == day && ActualWatch::col == col )
+                ActualWatch::member = gridTextCtrl->GetValue();
+        }
+        gridTextCtrl->Disconnect( wxEVT_MOTION, wxMouseEventHandler( LogbookDialog::OnMotion ), NULL, dialog );
+    }
+    gridWake->AutoSizeRow( 3 );
+    gridWake->AutoSizeColumn( col );
+    gridWake->SetRowHeight(	3, gridWake->GetRowHeight( 3 )+10 );
 }
 
 
 
-void CrewList::watchEditorHighlight(wxMouseEvent& event)
+void CrewList::watchEditorHighlight( wxMouseEvent& event )
 {
 #ifndef __WXOSX__
-	wxPoint pt;
-	wxTextCoord col,row;
+    wxPoint pt;
+    wxTextCoord col,row;
 
-	event.GetPosition(&pt.x,&pt.y);
-	wxObject* o = event.GetEventObject();
-	wxTextCtrl* gridTextCtrl = wxDynamicCast(o, wxTextCtrl );
-	gridTextCtrl->HitTest(pt,&col,&row);
-	int len = gridTextCtrl->GetLineLength(row);
-	int pos =  gridTextCtrl->XYToPosition(0,row);
-	gridTextCtrl->SetSelection(pos,pos+len);
+    event.GetPosition( &pt.x,&pt.y );
+    wxObject* o = event.GetEventObject();
+    wxTextCtrl* gridTextCtrl = wxDynamicCast( o, wxTextCtrl );
+    gridTextCtrl->HitTest( pt,&col,&row );
+    int len = gridTextCtrl->GetLineLength( row );
+    int pos =  gridTextCtrl->XYToPosition( 0,row );
+    gridTextCtrl->SetSelection( pos,pos+len );
 #endif
 }
 
-void CrewList::setDayButtons(bool shift)
+void CrewList::setDayButtons( bool shift )
 {
-	if(shift)
-	{
-		dialog->m_buttonDayPlus->Enable();
-		dialog->m_buttonDayMinus->Enable();
-		dialog->m_buttonNow->Enable();
-	}
-	else
-	{
-		dialog->m_buttonDayPlus->Enable(false);
-		dialog->m_buttonDayMinus->Enable(false);
-		dialog->m_buttonNow->Enable(false);
-	}
+    if ( shift )
+    {
+        dialog->m_buttonDayPlus->Enable();
+        dialog->m_buttonDayMinus->Enable();
+        dialog->m_buttonNow->Enable();
+    }
+    else
+    {
+        dialog->m_buttonDayPlus->Enable( false );
+        dialog->m_buttonDayMinus->Enable( false );
+        dialog->m_buttonNow->Enable( false );
+    }
 }
 
 void CrewList::clearWake()
 {
-	watchListFile->Clear();
-	watchListFile->Write();
+    watchListFile->Clear();
+    watchListFile->Write();
 
-	gridWake->BeginBatch();
-	gridWake->DeleteCols(0,gridWake->GetNumberCols());
-	gridWake->AppendCols();
-	firstColumn();
-	gridWake->EndBatch();
-	setDayButtons(false);
-	dialog->m_buttonCalculate->Enable(false);
-	dialog->m_buttonReset->Enable(false);
-	dialog->m_textCtrlWakeDay->Enable(false);
-	dialog->m_textCtrlWatchStartDate->Enable(true);
-	dialog->m_textCtrlWatchStartTime->Enable(true);
-	dialog->m_textCtrlWakeTrip->Enable(true);
-	dialog->m_textCtrlWakeDay->SetValue(_T("0"));
-	gridWake->SetColLabelValue(0,wxString::Format(_T("1. %s"),dialog->m_gridGlobal->GetColLabelValue(LogbookDialog::WAKE).c_str()));
-	day = 0;
-	gridWake->AutoSizeColumns();
-	gridWake->AutoSizeRows();
-	ActuellWatch::menuMembers.clear();
-	statusText(DEFAULTWATCH);
+    gridWake->BeginBatch();
+    gridWake->DeleteCols( 0,gridWake->GetNumberCols() );
+    gridWake->AppendCols();
+    firstColumn();
+    gridWake->EndBatch();
+    setDayButtons( false );
+    dialog->m_buttonCalculate->Enable( false );
+    dialog->m_buttonReset->Enable( false );
+    dialog->m_textCtrlWakeDay->Enable( false );
+    dialog->m_textCtrlWatchStartDate->Enable( true );
+    dialog->m_textCtrlWatchStartTime->Enable( true );
+    dialog->m_textCtrlWakeTrip->Enable( true );
+    dialog->m_textCtrlWakeDay->SetValue( _T( "0" ) );
+    gridWake->SetColLabelValue( 0,wxString::Format( _T( "1. %s" ),dialog->m_gridGlobal->GetColLabelValue( LogbookDialog::WAKE ).c_str() ) );
+    day = 0;
+    gridWake->AutoSizeColumns();
+    gridWake->AutoSizeRows();
+    ActualWatch::menuMembers.clear();
+    statusText( DEFAULTWATCH );
 }
 
 void CrewList::dayPlus()
 {
-	if(day == (unsigned int)wxAtoi(dialog->m_textCtrlWakeTrip->GetValue()) )
-		return;
-	day++;
-	readRecord(day);
-	if(day == ActuellWatch::day)
-		gridWake->SetCellBackgroundColour(wxColor(0,255,0),2,ActuellWatch::col);
+    if ( day == ( unsigned int )wxAtoi( dialog->m_textCtrlWakeTrip->GetValue() ) )
+        return;
+    day++;
+    readRecord( day );
+    if ( day == ActualWatch::day )
+        gridWake->SetCellBackgroundColour( wxColor( 0,255,0 ),2,ActualWatch::col );
 }
 
 void CrewList::dayMinus()
 {
-	if(day <= 1) return;
-	day--;
-	readRecord(day);
-	if(day == ActuellWatch::day)
-		gridWake->SetCellBackgroundColour(wxColor(0,255,0),2,ActuellWatch::col);
-}
-
-void CrewList::dayNow(bool mode)
-{
-	wxString s, sd, st, date, time, timedf, ttmp, str;
-	wxDateTime dtstart, dtend, now;
-	wxTimeSpan ed(0,0,0,1);
-	long d;
-    	int lineno;
-	unsigned int col = 0, daylast = 1;
-	
-	if(dialog->logbook->sDate != wxEmptyString)
-		now = dialog->logbook->mCorrectedDateTime;
-	else
-		now = wxDateTime::Now();
-
-	if((lineno = getDayOne(1)) == -1) { statusText(DEFAULTWATCH); return; }
-
-	ActuellWatch::active = false;
-	while(lineno < (int) watchListFile->GetLineCount())
-	{
-		s = watchListFile->GetLine(lineno);
-		wxStringTokenizer tkz(s,_T("\t"));
-		tkz.GetNextToken().ToLong(&d);
-		if((unsigned int)d != daylast) 
-			col = 0;
-
-		tkz.GetNextToken();
-
-		timedf = tkz.GetNextToken();
-		wxStringTokenizer tkzdf(timedf,_T(":"));
-		long h,m;
-		tkzdf.GetNextToken().ToLong(&h);
-		tkzdf.GetNextToken().ToLong(&m);
-		wxTimeSpan df(h,m);
-
-		date = tkz.GetNextToken();
-		getStartEndDate(date, dtstart, dtend);
-
-		ttmp  = tkz.GetNextToken();
-		wxStringTokenizer timetkz(ttmp,_T(","));
-		time = timetkz.GetNextToken();
-		time += _T(":")+timetkz.GetNextToken();
+    if ( day <= 1 ) return;
+    day--;
+    readRecord( day );
+    if ( day == ActualWatch::day )
+        gridWake->SetCellBackgroundColour( wxColor( 0,255,0 ),2,ActualWatch::col );
+}
+
+void CrewList::dayNow( bool mode )
+{
+    wxString s, sd, st, date, time, timedf, ttmp, str;
+    wxDateTime dtstart, dtend, now;
+    wxTimeSpan ed( 0,0,0,1 );
+    long d;
+    int lineno;
+    unsigned int col = 0, daylast = 1;
+
+    if ( dialog->logbook->sDate != wxEmptyString )
+        now = dialog->logbook->mCorrectedDateTime;
+    else
+        now = wxDateTime::Now();
+
+    if ( ( lineno = getDayOne( 1 ) ) == -1 )
+    {
+        statusText( DEFAULTWATCH );
+        return;
+    }
+
+    ActualWatch::active = false;
+    while ( lineno < ( int ) watchListFile->GetLineCount() )
+    {
+        s = watchListFile->GetLine( lineno );
+        wxStringTokenizer tkz( s,_T( "\t" ) );
+        tkz.GetNextToken().ToLong( &d );
+        if ( ( unsigned int )d != daylast )
+            col = 0;
+
+        tkz.GetNextToken();
+
+        timedf = tkz.GetNextToken();
+        wxStringTokenizer tkzdf( timedf,_T( ":" ) );
+        long h,m;
+        tkzdf.GetNextToken().ToLong( &h );
+        tkzdf.GetNextToken().ToLong( &m );
+        wxTimeSpan df( h,m );
+
+        date = tkz.GetNextToken();
+        getStartEndDate( date, dtstart, dtend );
+
+        ttmp  = tkz.GetNextToken();
+        wxStringTokenizer timetkz( ttmp,_T( "," ) );
+        time = timetkz.GetNextToken();
+        time += _T( ":" )+timetkz.GetNextToken();
 
-		dtstart = stringToDateTime(date, time, mode);
-		dtend = dtstart;
+        dtstart = stringToDateTime( date, time, mode );
+        dtend = dtstart;
 
-		dtend.Add(df);
-		dtend.Subtract(ed);
+        dtend.Add( df );
+        dtend.Subtract( ed );
 //		wxMessageBox(dtstart.FormatDate()+_T(" ")+dtstart.FormatTime()+_T("\n")+now.FormatDate()+_T(" ")+now.FormatTime()+_T("\n")+dtend.FormatDate()+_T(" ")+dtend.FormatTime());
-		str = tkz.GetNextToken();
-		if(now.IsBetween(dtstart,dtend))
-		{
-			readRecord(d);
-			gridWake->SetCellBackgroundColour(wxColor(0,255,0),2,col);
-			gridWake->MakeCellVisible(0,col);
-
-			ActuellWatch::active = true;
-			ActuellWatch::day    = d;
-			ActuellWatch::col    = col;
-			ActuellWatch::time   = df;
-			ActuellWatch::start  = dtstart;
-			ActuellWatch::end    = dtend;
-			ActuellWatch::member = dialog->restoreDangerChar(str);
-
-			statusText(ALTERDAY);
-			return;
-		}
-		col++;
-		daylast = d;
-		lineno++;
-	}
+        str = tkz.GetNextToken();
+        if ( now.IsBetween( dtstart,dtend ) )
+        {
+            readRecord( d );
+            gridWake->SetCellBackgroundColour( wxColor( 0,255,0 ),2,col );
+            gridWake->MakeCellVisible( 0,col );
+
+            ActualWatch::active = true;
+            ActualWatch::day    = d;
+            ActualWatch::col    = col;
+            ActualWatch::time   = df;
+            ActualWatch::start  = dtstart;
+            ActualWatch::end    = dtend;
+            ActualWatch::member = dialog->restoreDangerChar( str );
 
-	if(watchListFile->GetLineCount() > 0)
-	{
-		readRecord(1);
-		statusText(ALTERDAY);
-	}
-	else
-		statusText(DEFAULTWATCH);
+            statusText( ALTERDAY );
+            return;
+        }
+        col++;
+        daylast = d;
+        lineno++;
+    }
+
+    if ( watchListFile->GetLineCount() > 0 )
+    {
+        readRecord( 1 );
+        statusText( ALTERDAY );
+    }
+    else
+        statusText( DEFAULTWATCH );
 }
 
-void CrewList::statusText(int i)
+void CrewList::statusText( int i )
 {
-	dialog->m_staticTextStatusWatch->SetLabel(statustext[i]);
+    dialog->m_staticTextStatusWatch->SetLabel( statustext[i] );
 }
 
 void CrewList::Reset()
 {
-	setDayButtons(false);
-	dialog->m_buttonCalculate->Enable(true);
-	dialog->m_buttonReset->Enable(false);
-	dialog->m_textCtrlWatchStartDate->Enable(true);
-	dialog->m_textCtrlWatchStartTime->Enable(true);
-	dialog->m_textCtrlWakeTrip->Enable(true);
-	dialog->m_textCtrlWakeDay->Enable(false);
-	day = 0;
-	readRecord(day);
-	statusText(ALTERWATCH);
+    setDayButtons( false );
+    dialog->m_buttonCalculate->Enable( true );
+    dialog->m_buttonReset->Enable( false );
+    dialog->m_textCtrlWatchStartDate->Enable( true );
+    dialog->m_textCtrlWatchStartTime->Enable( true );
+    dialog->m_textCtrlWakeTrip->Enable( true );
+    dialog->m_textCtrlWakeDay->Enable( false );
+    day = 0;
+    readRecord( day );
+    statusText( ALTERWATCH );
 }
 
 void CrewList::dateTextCtrlClicked()
 {
-	bool dummy;
-	wxDateTime dt, dtend, time;
+    bool dummy;
+    wxDateTime dt, dtend, time;
 
-	dialog->m_textCtrlWatchStartTime->SetFocus();
-	DateDialog* dlg = new DateDialog(gridWake);
+    dialog->m_textCtrlWatchStartTime->SetFocus();
+    DateDialog* dlg = new DateDialog( gridWake );
 
-	if(dlg->ShowModal() == wxID_OK)
-	{
-		wxDateTime dt = dlg->m_calendar2->GetDate();
-	//	wxMessageBox(dt.FormatDate());
-		dialog->m_textCtrlWatchStartDate->ChangeValue(dt.Format(dialog->logbookPlugIn->opt->sdateformat));
-		gridWake->SetCellValue(1,0,dt.Format(dialog->logbookPlugIn->opt->sdateformat));
-		createDefaultDateTime(dt, dtend, time);
-		updateWatchTime(0,0,&dummy);
-	}
-
-	delete dlg;
-}
-
-void CrewList::timeTextCtrlTextEntered(wxCommandEvent& event)
-{
-	bool dummy;
-	wxDateTime dt, dtend, time;
-
-	if(checkHourFormat(event.GetString(),-1,-1,&dt))
-	{
-		dialog->m_textCtrlWatchStartTime->SetValue(dt.Format(_T("%H:%M")));
-		dialog->myParseDate(dialog->m_textCtrlWatchStartDate->GetValue(),dt);
-		createDefaultDateTime(dt, dtend, time);
-		updateWatchTime(0,0,&dummy);
-	}
-	gridWake->SetFocus();
-	gridWake->SetGridCursor(0,0);
-}
-
-wxDateTime CrewList::stringToDateTime(wxString date, wxString time,bool mode)
-{
-	wxDateTime dt;
-	wxStringTokenizer tkz;
-
-	if(!mode)
-	{
-		tkz.SetString(date,_T("/"));
-		int month = wxAtoi(tkz.GetNextToken());
-		int day = wxAtoi(tkz.GetNextToken());
-		int year = wxAtoi(tkz.GetNextToken());
-		dialog->myParseTime(time,dt);
-		dt.Set(day, (wxDateTime::Month) month, year,dt.GetHour(),dt.GetMinute(),dt.GetSecond());
-	}
-	else 
-	{
-		dialog->myParseTime(time,dt);
-		dialog->myParseDate(date,dt);
-	}
-	return dt;
-}
-
-void CrewList::readRecord(int nr)
-{
-	int uu = watchListFile->GetLineCount() ;
-	if(watchListFile->GetLineCount() <= 1) return;
+    if ( dlg->ShowModal() == wxID_OK )
+    {
+        wxDateTime dt = dlg->m_calendar2->GetDate();
+        //	wxMessageBox(dt.FormatDate());
+        dialog->m_textCtrlWatchStartDate->ChangeValue( dt.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+        gridWake->SetCellValue( 1,0,dt.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+        createDefaultDateTime( dt, dtend, time );
+        updateWatchTime( 0,0,&dummy );
+    }
+
+    delete dlg;
+}
+
+void CrewList::timeTextCtrlTextEntered( wxCommandEvent& event )
+{
+    bool dummy;
+    wxDateTime dt, dtend, time;
+
+    if ( checkHourFormat( event.GetString(),-1,-1,&dt ) )
+    {
+        dialog->m_textCtrlWatchStartTime->SetValue( dt.Format( _T( "%H:%M" ) ) );
+        dialog->myParseDate( dialog->m_textCtrlWatchStartDate->GetValue(),dt );
+        createDefaultDateTime( dt, dtend, time );
+        updateWatchTime( 0,0,&dummy );
+    }
+    gridWake->SetFocus();
+    gridWake->SetGridCursor( 0,0 );
+}
+
+wxDateTime CrewList::stringToDateTime( wxString date, wxString time,bool mode )
+{
+    wxDateTime dt;
+    wxStringTokenizer tkz;
+
+    if ( !mode )
+    {
+        tkz.SetString( date,_T( "/" ) );
+        int month = wxAtoi( tkz.GetNextToken() );
+        int day = wxAtoi( tkz.GetNextToken() );
+        int year = wxAtoi( tkz.GetNextToken() );
+        dialog->myParseTime( time,dt );
+        dt.Set( day, ( wxDateTime::Month ) month, year,dt.GetHour(),dt.GetMinute(),dt.GetSecond() );
+    }
+    else
+    {
+        dialog->myParseTime( time,dt );
+        dialog->myParseDate( date,dt );
+    }
+    return dt;
+}
+
+void CrewList::readRecord( int nr )
+{
+    int uu = watchListFile->GetLineCount() ;
+    if ( watchListFile->GetLineCount() <= 1 ) return;
+
+    long d;
+    int lineno;
+    wxString s;
+
+    if ( ( linenoStart = getDayOne( nr ) ) == -1 ) return;
+    lineno = linenoStart;
+    if ( lineno == -1 ) return;
+
+    gridWake->DeleteCols( 0,gridWake->GetNumberCols() );
+
+    int c = 1;
+    while ( !watchListFile->Eof() )
+    {
+        s = watchListFile->GetLine( lineno );
+        s = dialog->restoreDangerChar( s );
+
+        wxStringTokenizer tkz( s,_T( "\t" ) );
+        tkz.GetNextToken().ToLong( &d );
+        if ( d != nr )
+        {
+            linenoEnd--;
+            break;
+        }
+        day = d;
 
-	long d;
-	int lineno;
-	wxString s;
+        gridWake->BeginBatch();
+        gridWake->AppendCols();
 
-	if((linenoStart = getDayOne(nr)) == -1) return;
-	lineno = linenoStart;
-	if(lineno == -1) return;
+        int col = gridWake->GetNumberCols()-1;
+        gridWake->SetColSize( col, 160 );
+        gridWake->SetCellEditor( 3,col,new wxGridCellAutoWrapStringEditor );
 
-	gridWake->DeleteCols(0,gridWake->GetNumberCols());
+        gridWake->SetReadOnly( 1,col );
+        gridWake->SetReadOnly( 2,col );
+        gridWake->SetColLabelValue( col,wxString::Format( _T( "%i. Watch" ),c++ ) );
+        tkz.GetNextToken();
 
-	int c = 1;
-	while(!watchListFile->Eof())
-	{
-		s = watchListFile->GetLine(lineno);
-		s = dialog->restoreDangerChar(s);
+        for ( int row = 0; row < 4; row++ )
+        {
+            if ( row == 0 || row == 3 )
+                gridWake->SetCellValue( row,col,dialog->restoreDangerChar( tkz.GetNextToken() ) );
+            else if ( row == 1 )
+            {
+                wxString s = tkz.GetNextToken();
+                if ( s.Contains( _T( "\n" ) ) )
+                {
+                    wxStringTokenizer nl( s,_T( "\n" ) );
+                    wxString t = nl.GetNextToken();
+                    wxStringTokenizer tkz( t,_T( "/" ) );
+                    int month = wxAtoi( tkz.GetNextToken() );
+                    int day = wxAtoi( tkz.GetNextToken() );
+                    int year = wxAtoi( tkz.GetNextToken() );
+                    wxDateTime dt( day,( wxDateTime::Month ) month, year );
+
+                    t = nl.GetNextToken();
+                    wxStringTokenizer tkz1( t,_T( "/" ) );
+                    month = wxAtoi( tkz1.GetNextToken() );
+                    day = wxAtoi( tkz1.GetNextToken() );
+                    year = wxAtoi( tkz1.GetNextToken() );
+                    wxDateTime dt1( day,( wxDateTime::Month ) month, year );
+                    gridWake->SetCellValue( row,col,dt.Format( dialog->logbookPlugIn->opt->sdateformat )+_T( "\n" )+dt1.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+                }
+                else
+                {
+                    wxStringTokenizer tkz( s,_T( "/" ) );
+                    int month = wxAtoi( tkz.GetNextToken() );
+                    int day = wxAtoi( tkz.GetNextToken() );
+                    int year = wxAtoi( tkz.GetNextToken() );
+                    wxDateTime dt( day,( wxDateTime::Month ) month, year );
+                    gridWake->SetCellValue( row,col,dt.Format( dialog->logbookPlugIn->opt->sdateformat ) );
+                }
+            }
+            else if ( row == 2 )
+            {
+                wxDateTime from,to;
+                wxString s = tkz.GetNextToken();
+                wxStringTokenizer tkz( s,_T( "," ) );
+                int fh = wxAtoi( tkz.GetNextToken() );
+                int fm = wxAtoi( tkz.GetNextToken() );
+                int th = wxAtoi( tkz.GetNextToken() );
+                int tm = wxAtoi( tkz.GetNextToken() );
+                from.Set( fh,fm );
+                to.Set( th,tm );
+                gridWake->SetCellValue( row,col,wxString::Format( _T( "%s-%s" ),from.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str(),
+                                        to.Format( dialog->logbookPlugIn->opt->stimeformatw ).c_str() ) );
+            }
 
-		wxStringTokenizer tkz(s,_T("\t"));
-		tkz.GetNextToken().ToLong(&d);
-		if(d != nr) { linenoEnd--; break; }
-		day = d;
-
-		gridWake->BeginBatch();
-		gridWake->AppendCols();
-
-		int col = gridWake->GetNumberCols()-1;
-		gridWake->SetColSize( col, 160 );
-		gridWake->SetCellEditor(3,col,new wxGridCellAutoWrapStringEditor);
-
-		gridWake->SetReadOnly(1,col);
-		gridWake->SetReadOnly(2,col);
-		gridWake->SetColLabelValue(col,wxString::Format(_T("%i. Watch"),c++));
-		tkz.GetNextToken();
-
-		for(int row = 0; row < 4; row++)
-		{
-			if(row == 0 || row == 3)
-				gridWake->SetCellValue(row,col,dialog->restoreDangerChar(tkz.GetNextToken()));
-			else if(row == 1)
-			{
-				wxString s = tkz.GetNextToken();
-				if(s.Contains(_T("\n")))
-				{
-					wxStringTokenizer nl(s,_T("\n"));
-					wxString t = nl.GetNextToken();
-					wxStringTokenizer tkz(t,_T("/"));
-					int month = wxAtoi(tkz.GetNextToken());
-					int day = wxAtoi(tkz.GetNextToken());
-					int year = wxAtoi(tkz.GetNextToken());
-					wxDateTime dt(day,(wxDateTime::Month) month, year);
-
-					t = nl.GetNextToken();
-					wxStringTokenizer tkz1(t,_T("/"));
-					month = wxAtoi(tkz1.GetNextToken());
-					day = wxAtoi(tkz1.GetNextToken());
-					year = wxAtoi(tkz1.GetNextToken());
-					wxDateTime dt1(day,(wxDateTime::Month) month, year);
-					gridWake->SetCellValue(row,col,dt.Format(dialog->logbookPlugIn->opt->sdateformat)+_T("\n")+dt1.Format(dialog->logbookPlugIn->opt->sdateformat));
-				}
-				else
-				{
-					wxStringTokenizer tkz(s,_T("/"));
-					int month = wxAtoi(tkz.GetNextToken());
-					int day = wxAtoi(tkz.GetNextToken());
-					int year = wxAtoi(tkz.GetNextToken());
-					wxDateTime dt(day,(wxDateTime::Month) month, year);
-					gridWake->SetCellValue(row,col,dt.Format(dialog->logbookPlugIn->opt->sdateformat));
-				}
-			}
-			else if(row == 2)
-			{
-				wxDateTime from,to;
-				wxString s = tkz.GetNextToken();
-				wxStringTokenizer tkz(s,_T(","));
-				int fh = wxAtoi(tkz.GetNextToken());
-				int fm = wxAtoi(tkz.GetNextToken());
-				int th = wxAtoi(tkz.GetNextToken());
-				int tm = wxAtoi(tkz.GetNextToken());
-				from.Set(fh,fm);
-				to.Set(th,tm);
-				gridWake->SetCellValue(row,col,wxString::Format(_T("%s-%s"),from.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str(),
-											to.Format(dialog->logbookPlugIn->opt->stimeformatw).c_str()));
-			}
-
-		}
-		gridWake->EndBatch();
-
-		lineno++;
-		linenoEnd = lineno;
-		if(lineno >= uu) 
-			break;
-	}
+        }
+        gridWake->EndBatch();
 
-	gridWake->AutoSizeColumns();
-	gridWake->AutoSizeRows();
-	gridWake->SetRowHeight(	3, gridWake->GetRowHeight(3)+10);
+        lineno++;
+        linenoEnd = lineno;
+        if ( lineno >= uu )
+            break;
+    }
+
+    gridWake->AutoSizeColumns();
+    gridWake->AutoSizeRows();
+    gridWake->SetRowHeight(	3, gridWake->GetRowHeight( 3 )+10 );
 
-	dialog->m_textCtrlWakeDay->SetValue(wxString::Format(_T("%i"),day));
+    dialog->m_textCtrlWakeDay->SetValue( wxString::Format( _T( "%i" ),day ) );
 }
 
 void CrewList::updateLine()
 {
-	int lineno = linenoStart;
-	wxString s = wxEmptyString; 
+    int lineno = linenoStart;
+    wxString s = wxEmptyString;
 #ifdef __WXOSX__
-    if(watchListFile->GetLineCount() < 1 || day < (long)0) return;
+    if ( watchListFile->GetLineCount() < 1 || day < ( long )0 ) return;
 #else
-	if(watchListFile->GetLineCount() < 1 || day < 0) return;
+    if ( watchListFile->GetLineCount() < 1 || day < 0 ) return;
 #endif
-	int cc = gridWake->GetNumberCols();
-	for(int c = 0; c < cc; c++)
-	{
-		s  = wxString::Format(_T("%i\t"),day);
-		s += wxString::Format(_T("%i\t"),gridWake->GetColumnWidth(c));
-
-		for(int r = 0; r < gridWake->GetNumberRows(); r++)
-		{
-			if(r == 0 || r == 3)
-				s += gridWake->GetCellValue(r,c) + _T("\t");
-			else if(r == 1)
-			{
-				wxDateTime dtstart, dtend;
-				wxString tmp = gridWake->GetCellValue(r,c);
-				wxString start,end;
-				if(tmp.Contains(_T("\n")))
-				{
-					wxStringTokenizer tkz(tmp,_T("\n"));
-					start = tkz.GetNextToken();
-					end   = tkz.GetNextToken();
-
-					LogbookDialog::myParseDate(start,dtstart);
-					LogbookDialog::myParseDate(end  ,dtend);
-
-					s += wxString::Format(_T("%i/%i/%i\n%i/%i/%i\t"),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear(),
-											dtend.GetMonth(),dtend.GetDay(),dtend.GetYear());
-				}
-				else
-				{
-					LogbookDialog::myParseDate(tmp,dtstart);
-					s += wxString::Format(_T("%i/%i/%i\t"),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear());
-				}
-
-
-			}
-			else if( r == 2)
-			{
-				wxDateTime from, to;
-				wxString g = gridWake->GetCellValue(r,c);
-				wxStringTokenizer sep(g,_T("-"));
-				dialog->myParseTime(sep.GetNextToken(),from);
-				dialog->myParseTime(sep.GetNextToken(),to);
-				s += wxString::Format(_T("%i,%i,%i,%i\t"),from.GetHour(),from.GetMinute(),to.GetHour(),to.GetMinute());				
-			}
-		}
-		s.RemoveLast();
-		s = dialog->replaceDangerChar(s);
-		watchListFile->InsertLine(s,lineno++);
-		s = _T("");
-	}
-
-	wxString l;
-	while(true)
-	{
-		l = watchListFile->GetLine(lineno);
-		wxStringTokenizer tkz(l,_T("\t"));
-		if((unsigned int)wxAtoi(tkz.GetNextToken()) != day)
-			break;
-		else
-			watchListFile->RemoveLine(lineno);
+    int cc = gridWake->GetNumberCols();
+    for ( int c = 0; c < cc; c++ )
+    {
+        s  = wxString::Format( _T( "%i\t" ),day );
+        s += wxString::Format( _T( "%i\t" ),gridWake->GetColumnWidth( c ) );
 
-	}
-	watchListFile->Write();
-}
-
-int CrewList::getDayOne(int dayone)
-{
-	long d;
-	wxString s;
-
-	d = -1;
-	if(watchListFile->GetLineCount() < 1) return -1;
-
-	watchListFile->GoToLine(0);
-	while(d != dayone)
-	{
-		s = watchListFile->GetNextLine();
-		if(watchListFile->Eof()) return -1;
-		wxStringTokenizer tkz(s,_T("\t"));
-		tkz.GetNextToken().ToLong(&d);
-
-	}
-	return watchListFile->GetCurrentLine();
-}
-
-bool CrewList::checkHourFormat(wxString s, int row, int col, wxDateTime *dt)
-{
-	bool t = false;
-	wxString sep;
-
-	if(s.IsEmpty())
-	{
-		gridWake->SetCellValue(row,col,_T("00:00"));
-		s = _T("0");
-	}
-
-	if(s.GetChar(0) == ',' || s.GetChar(0) == '.') // no leading zero when ,3 is entered
-		s.Prepend(_T("0"));
-
-	if(s.Length() == 4 && (!s.Contains(_T(".")) && !s.Contains(_T(",")))) // NATO-Format entered 1230 => 12.30
-		s.insert(2,_T("."));
-
-
-	if(s.Contains(_T(".")))
-	{
-		t = true;
-		sep = _T(".");
-	}
-
-	if(s.Contains(_T(",")))
-	{
-		t = true;
-		sep = _T(",");
-	}
-
-	if(s.Contains(_T(":")))
-	{
-		t = true;
-		sep = _T(":");
-	}
-
-	if(true != t)
-	{
-		s.Append(_T(":0"));
-		sep = _T(":");
-	}
+        for ( int r = 0; r < gridWake->GetNumberRows(); r++ )
+        {
+            if ( r == 0 || r == 3 )
+                s += gridWake->GetCellValue( r,c ) + _T( "\t" );
+            else if ( r == 1 )
+            {
+                wxDateTime dtstart, dtend;
+                wxString tmp = gridWake->GetCellValue( r,c );
+                wxString start,end;
+                if ( tmp.Contains( _T( "\n" ) ) )
+                {
+                    wxStringTokenizer tkz( tmp,_T( "\n" ) );
+                    start = tkz.GetNextToken();
+                    end   = tkz.GetNextToken();
+
+                    LogbookDialog::myParseDate( start,dtstart );
+                    LogbookDialog::myParseDate( end  ,dtend );
+
+                    s += wxString::Format( _T( "%i/%i/%i\n%i/%i/%i\t" ),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear(),
+                                           dtend.GetMonth(),dtend.GetDay(),dtend.GetYear() );
+                }
+                else
+                {
+                    LogbookDialog::myParseDate( tmp,dtstart );
+                    s += wxString::Format( _T( "%i/%i/%i\t" ),dtstart.GetMonth(),dtstart.GetDay(),dtstart.GetYear() );
+                }
+
+
+            }
+            else if ( r == 2 )
+            {
+                wxDateTime from, to;
+                wxString g = gridWake->GetCellValue( r,c );
+                wxStringTokenizer sep( g,_T( "-" ) );
+                dialog->myParseTime( sep.GetNextToken(),from );
+                dialog->myParseTime( sep.GetNextToken(),to );
+                s += wxString::Format( _T( "%i,%i,%i,%i\t" ),from.GetHour(),from.GetMinute(),to.GetHour(),to.GetMinute() );
+            }
+        }
+        s.RemoveLast();
+        s = dialog->replaceDangerChar( s );
+        watchListFile->InsertLine( s,lineno++ );
+        s = _T( "" );
+    }
+
+    wxString l;
+    while ( true )
+    {
+        l = watchListFile->GetLine( lineno );
+        wxStringTokenizer tkz( l,_T( "\t" ) );
+        if ( ( unsigned int )wxAtoi( tkz.GetNextToken() ) != day )
+            break;
+        else
+            watchListFile->RemoveLine( lineno );
+
+    }
+    watchListFile->Write();
+}
+
+int CrewList::getDayOne( int dayone )
+{
+    long d;
+    wxString s;
+
+    d = -1;
+    if ( watchListFile->GetLineCount() < 1 ) return -1;
+
+    watchListFile->GoToLine( 0 );
+    while ( d != dayone )
+    {
+        s = watchListFile->GetNextLine();
+        if ( watchListFile->Eof() ) return -1;
+        wxStringTokenizer tkz( s,_T( "\t" ) );
+        tkz.GetNextToken().ToLong( &d );
+
+    }
+    return watchListFile->GetCurrentLine();
+}
+
+bool CrewList::checkHourFormat( wxString s, int row, int col, wxDateTime *dt )
+{
+    bool t = false;
+    wxString sep;
+
+    if ( s.IsEmpty() )
+    {
+        gridWake->SetCellValue( row,col,_T( "00:00" ) );
+        s = _T( "0" );
+    }
+
+    if ( s.GetChar( 0 ) == ',' || s.GetChar( 0 ) == '.' ) // no leading zero when ,3 is entered
+        s.Prepend( _T( "0" ) );
+
+    if ( s.Length() == 4 && ( !s.Contains( _T( "." ) ) && !s.Contains( _T( "," ) ) ) ) // NATO-Format entered 1230 => 12.30
+        s.insert( 2,_T( "." ) );
+
+
+    if ( s.Contains( _T( "." ) ) )
+    {
+        t = true;
+        sep = _T( "." );
+    }
+
+    if ( s.Contains( _T( "," ) ) )
+    {
+        t = true;
+        sep = _T( "," );
+    }
+
+    if ( s.Contains( _T( ":" ) ) )
+    {
+        t = true;
+        sep = _T( ":" );
+    }
+
+    if ( true != t )
+    {
+        s.Append( _T( ":0" ) );
+        sep = _T( ":" );
+    }
+
+    wxStringTokenizer tkz( s,sep );
+    wxString h = tkz.GetNextToken();
+    wxString m;
+    if ( tkz.HasMoreTokens() )
+        m = tkz.GetNextToken();
+    else
+        m = _T( "0" );
+    if ( !h.IsNumber() ) h = _T( "24" );
+    if ( !m.IsNumber() ) m = _T( "60" );
+
+    if ( wxAtoi( h ) > 23 || wxAtoi( m ) > 59 || wxAtoi( h ) < 0 || wxAtoi( m ) < 0 )
+    {
+        //wxMessageBox(_("Hours < 0 or > 23\nMinutes < 0 or > 59"),_T(""));
+        if ( row != -1 )
+            gridWake->SetCellValue( row,col,_T( "00:00" ) );
+        return false;
+    }
+    else
+        s = wxString::Format( _T( "%s:%s" ),h.c_str(),m.c_str() );
 
-	wxStringTokenizer tkz(s,sep);
-	wxString h = tkz.GetNextToken();
-	wxString m;
-	if(tkz.HasMoreTokens())
-		m = tkz.GetNextToken();
-	else
-		m = _T("0");
-	if(!h.IsNumber()) h = _T("24");
-	if(!m.IsNumber()) m = _T("60");
-
-	if(wxAtoi(h) > 23 || wxAtoi(m) > 59 || wxAtoi(h) < 0 || wxAtoi(m) < 0)
-	{
-		  //wxMessageBox(_("Hours < 0 or > 23\nMinutes < 0 or > 59"),_T(""));
-		if(row != -1)
-			gridWake->SetCellValue(row,col,_T("00:00"));
-		return false;
-	}
-	else
-		s = wxString::Format(_T("%s:%s"),h.c_str(),m.c_str());
-
-	dialog->myParseTime(s,*dt);
-	return true;
+    dialog->myParseTime( s,*dt );
+    return true;
 }
 
-void CrewList::saveCSV(wxString path)
+void CrewList::saveCSV( wxString path )
 {
-	wxString result;
-
-	saveData();
-
-	wxTextFile csvFile(path);
-
-	if(csvFile.Exists())
-	{
-		::wxRemoveFile(path);
-		csvFile.Create();
-	}
-
-	crewListFile->Open();
-
-
-	for(unsigned int i = 0; i < crewListFile->GetLineCount(); i++)
-	{
-		wxString line = crewListFile->GetLine(i);
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY);
+    wxString result;
 
-		while ( tkz.HasMoreTokens() )
-		{
-			wxString s;
-			s += tkz.GetNextToken().RemoveLast();
-			s= dialog->restoreDangerChar(s);
-			result += wxT("\"")+s+wxT("\",");
-		}
-		result.RemoveLast();
-		csvFile.AddLine(result);
-		result=_T("");
-	}
-
-	csvFile.Write();
-	csvFile.Close();
-	crewListFile->Close();
-}
+    saveData();
 
+    wxTextFile csvFile( path );
 
+    if ( csvFile.Exists() )
+    {
+        ::wxRemoveFile( path );
+        csvFile.Create();
+    }
 
-void CrewList::saveHTML(wxString savePath, wxString layout, bool mode)
-{
-	wxString path;
-
-	if(layout == _T(""))
-	{
-		wxMessageBox(_("Sorry, no Layout installed"),_("Information"),wxOK);
-		return;
-	}
+    crewListFile->Open();
 
-	wxArrayString watch;
-	wxString html = readLayout(layout);
 
-	int indexTop;
-	int indexBottom;
-	int indexWakeTop;
-	int indexWakeBottom;
-	int indexWake1Top;
-	int indexWake1Bottom;
-	int indexWakeColumn0Top;
-	int indexWakeColumn0Bottom;
-	int indexWakeColumn1Top;
-	int indexWakeColumn1Bottom;
-	int indexWakeColumn2Top;
-	int indexWakeColumn2Bottom;
-	int indexWakeColumn3Top;
-	int indexWakeColumn3Bottom;
-	int indexWakeColumn4Top;
-	int indexWakeColumn4Bottom;
-
-	wxString topHTML;
-	wxString bottomHTML;
-	wxString middleHTML;
-	wxString columnWake0HTML;
-	wxString columnWake1HTML;
-	wxString columnWake2HTML;
-	wxString columnWake3HTML;
-	wxString columnWake4HTML;
-	wxString topWakeHTML;
-	wxString bottomWakeHTML;
-	wxString middleWakeHTML;
-	wxString middleWake1HTML;
-	wxString headerHTML;
-
-	wxString seperatorTop            = wxT("<!--Repeat -->");
-	wxString seperatorBottom         = wxT("<!--Repeat End -->");
-	wxString seperatorWakeTop        = wxT("<!--Repeat Wake -->");
-	wxString seperatorWakeBottom     = wxT("<!--Repeat Wake End -->");
-	wxString seperatorWake1Top       = wxT("<!--Repeat Wake1 -->");
-	wxString seperatorWake1Bottom    = wxT("<!--Repeat Wake1 End -->");
-	wxString seperatorWakeCol0Top     = wxT("<!--Repeat Col0 -->");
-	wxString seperatorWakeCol0Bottom  = wxT("<!--Repeat Col0 End -->");
-	wxString seperatorWakeCol1Top     = wxT("<!--Repeat Col1 -->");
-	wxString seperatorWakeCol1Bottom  = wxT("<!--Repeat Col1 End -->");
-	wxString seperatorWakeCol2Top     = wxT("<!--Repeat Col2 -->");
-	wxString seperatorWakeCol2Bottom  = wxT("<!--Repeat Col2 End -->");
-	wxString seperatorWakeCol3Top     = wxT("<!--Repeat Col3 -->");
-	wxString seperatorWakeCol3Bottom  = wxT("<!--Repeat Col3 End -->");
-	wxString seperatorWakeCol4Top     = wxT("<!--Repeat Col4 -->");
-	wxString seperatorWakeCol4Bottom  = wxT("<!--Repeat Col4 End -->");
+    for ( unsigned int i = 0; i < crewListFile->GetLineCount(); i++ )
+    {
+        wxString line = crewListFile->GetLine( i );
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
 
-	if(!html.Contains(_T("<!--Repeat Wake -->")))
-	{
-		indexTop        = html.First(seperatorTop)+seperatorTop.Len();
-		indexBottom     = html.First(seperatorBottom)+seperatorBottom.Len();
-		topHTML        = html.substr(0,indexTop);
-		bottomHTML     = html.substr(indexBottom,html.Len()-indexBottom-1);
-		middleHTML     = html.substr(indexTop,indexBottom-indexTop);
-	}
-	else if(!html.Contains(_T("<!--Repeat -->")))
-	{
-		indexWakeTop          = html.First(seperatorWakeTop)+seperatorWakeTop.Len();
-		indexWakeBottom       = html.First(seperatorWakeBottom)+seperatorWakeBottom.Len();
-		indexWake1Top         = html.First(seperatorWake1Top)+seperatorWake1Top.Len();
-		indexWake1Bottom      = html.First(seperatorWake1Bottom);
-		indexWakeColumn0Top    = html.First(seperatorWakeCol0Top)+seperatorWakeCol0Top.Len();
-		indexWakeColumn0Bottom = html.First(seperatorWakeCol0Bottom)+seperatorWakeCol0Bottom.Len();
-		indexWakeColumn1Top    = html.First(seperatorWakeCol1Top)+seperatorWakeCol1Top.Len();
-		indexWakeColumn1Bottom = html.First(seperatorWakeCol1Bottom)+seperatorWakeCol1Bottom.Len();
-		indexWakeColumn2Top    = html.First(seperatorWakeCol2Top)+seperatorWakeCol2Top.Len();
-		indexWakeColumn2Bottom = html.First(seperatorWakeCol2Bottom)+seperatorWakeCol2Bottom.Len();
-		indexWakeColumn3Top    = html.First(seperatorWakeCol3Top)+seperatorWakeCol3Top.Len();
-		indexWakeColumn3Bottom = html.First(seperatorWakeCol3Bottom)+seperatorWakeCol3Bottom.Len();
-		indexWakeColumn4Top    = html.First(seperatorWakeCol4Top)+seperatorWakeCol4Top.Len();
-		indexWakeColumn4Bottom = html.First(seperatorWakeCol4Bottom)+seperatorWakeCol4Bottom.Len();
-		topHTML				  = html.substr(0,indexWakeTop);
-		bottomWakeHTML		  = html.substr(indexWake1Bottom,html.Len()-indexWake1Bottom-1);
-		middleWakeHTML		  = html.substr(indexWakeTop, indexWakeBottom -indexWakeTop -seperatorWakeBottom.Len());
-		middleWake1HTML		  = html.substr(indexWake1Top,indexWake1Bottom-indexWake1Top);
-		columnWake0HTML		  = html.substr(indexWakeColumn0Top,indexWakeColumn0Bottom-indexWakeColumn0Top-seperatorWakeCol0Bottom.Len());
-		columnWake1HTML		  = html.substr(indexWakeColumn1Top,indexWakeColumn1Bottom-indexWakeColumn1Top-seperatorWakeCol1Bottom.Len());
-		columnWake2HTML		  = html.substr(indexWakeColumn2Top,indexWakeColumn2Bottom-indexWakeColumn2Top-seperatorWakeCol2Bottom.Len());
-		columnWake3HTML		  = html.substr(indexWakeColumn3Top,indexWakeColumn3Bottom-indexWakeColumn3Top-seperatorWakeCol3Bottom.Len());
-		columnWake4HTML		  = html.substr(indexWakeColumn4Top,indexWakeColumn4Bottom-indexWakeColumn4Top-seperatorWakeCol4Bottom.Len());
-
-		topHTML.Replace(wxT("#LFROM#"),_("from"));
-		topHTML.Replace(wxT("#LTO#"),_("to"));
-		topHTML.Replace(wxT("#LWATCH#"),dialog->m_gridGlobal->GetColLabelValue(4));
-	}
-	else
-	{
-		indexTop        = html.First(seperatorTop)+seperatorTop.Len();
-		indexBottom     = html.First(seperatorBottom)+seperatorBottom.Len();
-		indexWakeTop    = html.First(seperatorWakeTop)+seperatorWakeTop.Len();
-		indexWakeBottom = html.First(seperatorWakeBottom)+seperatorWakeBottom.Len();
-	
-		topHTML        = html.substr(0,indexTop);
-		bottomHTML     = html.substr(indexBottom,indexWakeTop-indexBottom);
-		middleHTML     = html.substr(indexTop,indexBottom-indexTop);
-		bottomWakeHTML = html.substr(indexWakeBottom,html.Len()-1);
-		middleWakeHTML = html.substr(indexWakeTop,indexWakeBottom-indexWakeTop);
-		bottomHTML.Replace(wxT("#LFROM#"),_("from"));
-		bottomHTML.Replace(wxT("#LTO#"),_("to"));
-		bottomHTML.Replace(wxT("#LWATCH#"),dialog->m_gridGlobal->GetColLabelValue(4));
-	}
+        while ( tkz.HasMoreTokens() )
+        {
+            wxString s;
+            s += tkz.GetNextToken().RemoveLast();
+            s= dialog->restoreDangerChar( s );
+            result += wxT( "\"" )+s+wxT( "\"," );
+        }
+        result.RemoveLast();
+        csvFile.AddLine( result );
+        result=_T( "" );
+    }
+
+    csvFile.Write();
+    csvFile.Close();
+    crewListFile->Close();
+}
+
+
+
+void CrewList::saveHTML( wxString savePath, wxString layout, bool mode )
+{
+    wxString path;
+
+    if ( layout == _T( "" ) )
+    {
+        wxMessageBox( _( "Sorry, no Layout installed" ),_( "Information" ),wxOK );
+        return;
+    }
+
+    wxArrayString watch;
+    wxString html = readLayout( layout );
+
+    int indexTop;
+    int indexBottom;
+    int indexWakeTop;
+    int indexWakeBottom;
+    int indexWake1Top;
+    int indexWake1Bottom;
+    int indexWakeColumn0Top;
+    int indexWakeColumn0Bottom;
+    int indexWakeColumn1Top;
+    int indexWakeColumn1Bottom;
+    int indexWakeColumn2Top;
+    int indexWakeColumn2Bottom;
+    int indexWakeColumn3Top;
+    int indexWakeColumn3Bottom;
+    int indexWakeColumn4Top;
+    int indexWakeColumn4Bottom;
+
+    wxString topHTML;
+    wxString bottomHTML;
+    wxString middleHTML;
+    wxString columnWake0HTML;
+    wxString columnWake1HTML;
+    wxString columnWake2HTML;
+    wxString columnWake3HTML;
+    wxString columnWake4HTML;
+    wxString topWakeHTML;
+    wxString bottomWakeHTML;
+    wxString middleWakeHTML;
+    wxString middleWake1HTML;
+    wxString headerHTML;
+
+    wxString seperatorTop            = wxT( "<!--Repeat -->" );
+    wxString seperatorBottom         = wxT( "<!--Repeat End -->" );
+    wxString seperatorWakeTop        = wxT( "<!--Repeat Wake -->" );
+    wxString seperatorWakeBottom     = wxT( "<!--Repeat Wake End -->" );
+    wxString seperatorWake1Top       = wxT( "<!--Repeat Wake1 -->" );
+    wxString seperatorWake1Bottom    = wxT( "<!--Repeat Wake1 End -->" );
+    wxString seperatorWakeCol0Top     = wxT( "<!--Repeat Col0 -->" );
+    wxString seperatorWakeCol0Bottom  = wxT( "<!--Repeat Col0 End -->" );
+    wxString seperatorWakeCol1Top     = wxT( "<!--Repeat Col1 -->" );
+    wxString seperatorWakeCol1Bottom  = wxT( "<!--Repeat Col1 End -->" );
+    wxString seperatorWakeCol2Top     = wxT( "<!--Repeat Col2 -->" );
+    wxString seperatorWakeCol2Bottom  = wxT( "<!--Repeat Col2 End -->" );
+    wxString seperatorWakeCol3Top     = wxT( "<!--Repeat Col3 -->" );
+    wxString seperatorWakeCol3Bottom  = wxT( "<!--Repeat Col3 End -->" );
+    wxString seperatorWakeCol4Top     = wxT( "<!--Repeat Col4 -->" );
+    wxString seperatorWakeCol4Bottom  = wxT( "<!--Repeat Col4 End -->" );
+
+    if ( !html.Contains( _T( "<!--Repeat Wake -->" ) ) )
+    {
+        indexTop        = html.First( seperatorTop )+seperatorTop.Len();
+        indexBottom     = html.First( seperatorBottom )+seperatorBottom.Len();
+        topHTML        = html.substr( 0,indexTop );
+        bottomHTML     = html.substr( indexBottom,html.Len()-indexBottom-1 );
+        middleHTML     = html.substr( indexTop,indexBottom-indexTop );
+    }
+    else if ( !html.Contains( _T( "<!--Repeat -->" ) ) )
+    {
+        indexWakeTop          = html.First( seperatorWakeTop )+seperatorWakeTop.Len();
+        indexWakeBottom       = html.First( seperatorWakeBottom )+seperatorWakeBottom.Len();
+        indexWake1Top         = html.First( seperatorWake1Top )+seperatorWake1Top.Len();
+        indexWake1Bottom      = html.First( seperatorWake1Bottom );
+        indexWakeColumn0Top    = html.First( seperatorWakeCol0Top )+seperatorWakeCol0Top.Len();
+        indexWakeColumn0Bottom = html.First( seperatorWakeCol0Bottom )+seperatorWakeCol0Bottom.Len();
+        indexWakeColumn1Top    = html.First( seperatorWakeCol1Top )+seperatorWakeCol1Top.Len();
+        indexWakeColumn1Bottom = html.First( seperatorWakeCol1Bottom )+seperatorWakeCol1Bottom.Len();
+        indexWakeColumn2Top    = html.First( seperatorWakeCol2Top )+seperatorWakeCol2Top.Len();
+        indexWakeColumn2Bottom = html.First( seperatorWakeCol2Bottom )+seperatorWakeCol2Bottom.Len();
+        indexWakeColumn3Top    = html.First( seperatorWakeCol3Top )+seperatorWakeCol3Top.Len();
+        indexWakeColumn3Bottom = html.First( seperatorWakeCol3Bottom )+seperatorWakeCol3Bottom.Len();
+        indexWakeColumn4Top    = html.First( seperatorWakeCol4Top )+seperatorWakeCol4Top.Len();
+        indexWakeColumn4Bottom = html.First( seperatorWakeCol4Bottom )+seperatorWakeCol4Bottom.Len();
+        topHTML				  = html.substr( 0,indexWakeTop );
+        bottomWakeHTML		  = html.substr( indexWake1Bottom,html.Len()-indexWake1Bottom-1 );
+        middleWakeHTML		  = html.substr( indexWakeTop, indexWakeBottom -indexWakeTop -seperatorWakeBottom.Len() );
+        middleWake1HTML		  = html.substr( indexWake1Top,indexWake1Bottom-indexWake1Top );
+        columnWake0HTML		  = html.substr( indexWakeColumn0Top,indexWakeColumn0Bottom-indexWakeColumn0Top-seperatorWakeCol0Bottom.Len() );
+        columnWake1HTML		  = html.substr( indexWakeColumn1Top,indexWakeColumn1Bottom-indexWakeColumn1Top-seperatorWakeCol1Bottom.Len() );
+        columnWake2HTML		  = html.substr( indexWakeColumn2Top,indexWakeColumn2Bottom-indexWakeColumn2Top-seperatorWakeCol2Bottom.Len() );
+        columnWake3HTML		  = html.substr( indexWakeColumn3Top,indexWakeColumn3Bottom-indexWakeColumn3Top-seperatorWakeCol3Bottom.Len() );
+        columnWake4HTML		  = html.substr( indexWakeColumn4Top,indexWakeColumn4Bottom-indexWakeColumn4Top-seperatorWakeCol4Bottom.Len() );
+
+        topHTML.Replace( wxT( "#LFROM#" ),_( "from" ) );
+        topHTML.Replace( wxT( "#LTO#" ),_( "to" ) );
+        topHTML.Replace( wxT( "#LWATCH#" ),dialog->m_gridGlobal->GetColLabelValue( 4 ) );
+    }
+    else
+    {
+        indexTop        = html.First( seperatorTop )+seperatorTop.Len();
+        indexBottom     = html.First( seperatorBottom )+seperatorBottom.Len();
+        indexWakeTop    = html.First( seperatorWakeTop )+seperatorWakeTop.Len();
+        indexWakeBottom = html.First( seperatorWakeBottom )+seperatorWakeBottom.Len();
+
+        topHTML        = html.substr( 0,indexTop );
+        bottomHTML     = html.substr( indexBottom,indexWakeTop-indexBottom );
+        middleHTML     = html.substr( indexTop,indexBottom-indexTop );
+        bottomWakeHTML = html.substr( indexWakeBottom,html.Len()-1 );
+        middleWakeHTML = html.substr( indexWakeTop,indexWakeBottom-indexWakeTop );
+        bottomHTML.Replace( wxT( "#LFROM#" ),_( "from" ) );
+        bottomHTML.Replace( wxT( "#LTO#" ),_( "to" ) );
+        bottomHTML.Replace( wxT( "#LWATCH#" ),dialog->m_gridGlobal->GetColLabelValue( 4 ) );
+    }
+
+    path = data_locn;
+    wxTextFile *logFile = new wxTextFile( path );
+    if ( mode != 0 )
+        path.Replace( wxT( "txt" ),wxT( "html" ) );
+    else
+        path = savePath;
+
+    if ( ::wxFileExists( path ) )
+        ::wxRemoveFile( path );
+
+    wxFileOutputStream output( path );
+    wxTextOutputStream htmlFile( output );
+
+    logFile->Open();
+
+    wxString newMiddleHTML;
+    wxString newWakeHTML;
+
+    topHTML.Replace( wxT( "#TYPE#" ),Export::replaceNewLine( mode,dialog->boatType->GetValue(),false ) );
+    topHTML.Replace( wxT( "#BOATNAME#" ),Export::replaceNewLine( mode,dialog->boatName->GetValue(),false ) );
+    topHTML.Replace( wxT( "#HOMEPORT#" ),Export::replaceNewLine( mode,dialog->homeport->GetValue(),false ) );
+    topHTML.Replace( wxT( "#CALLSIGN#" ),Export::replaceNewLine( mode,dialog->callsign->GetValue(),false ) );
+    topHTML.Replace( wxT( "#REGISTRATION#" ),Export::replaceNewLine( mode,dialog->registration->GetValue(),false ) );
+
+    topHTML.Replace( wxT( "#LTYPE#" ),Export::replaceNewLine( mode,dialog->m_staticText128->GetLabel(),true ) );
+    topHTML.Replace( wxT( "#LBOATNAME#" ),Export::replaceNewLine( mode,dialog->bname->GetLabel(),true ) );
+    topHTML.Replace( wxT( "#LHOMEPORT#" ),Export::replaceNewLine( mode,dialog->m_staticText114->GetLabel(),true ) );
+    topHTML.Replace( wxT( "#LCALLSIGN#" ),Export::replaceNewLine( mode,dialog->m_staticText115->GetLabel(),true ) );
+    topHTML.Replace( wxT( "#LREGISTRATION#" ),Export::replaceNewLine( mode,dialog->m_staticText118->GetLabel(),true ) );
+    topHTML.Replace( wxT( "#LCREWLIST#" ),Export::replaceNewLine( mode,dialog->m_logbook->GetPageText( 2 ),true ) );
+
+    if ( html.Contains( _T( "<!--Repeat -->" ) ) )
+    {
+        htmlFile << topHTML;
+
+        int rowsMax = dialog->m_gridCrew->GetNumberRows();
+        int colsMax = dialog->m_gridCrew->GetNumberCols();
+        for ( int row = 0; row < rowsMax; row++ )
+        {
+            if ( dialog->m_menu2->IsChecked( MENUCREWONBOARD ) && dialog->m_gridCrew->GetCellValue( row,ONBOARD ) == _T( "" ) )
+                continue;
+            newMiddleHTML = middleHTML;
+            for ( int col = 0; col < colsMax; col++ )
+                newMiddleHTML = replacePlaceholder( newMiddleHTML,headerHTML,0,row,col,0,watch,0 );
+            htmlFile << newMiddleHTML;
+        }
+        htmlFile << bottomHTML;
+        topHTML = _T( "" );
+    }
+
+    if ( html.Contains( _T( "<!--Repeat Wake -->" ) ) )
+    {
+        htmlFile << topHTML;
+
+        int lineno;
+        wxString s;
+        int col = 1;
+        unsigned int actDay = 0,lastday = 1;
+        wxString tmp;
+        int colTotal = 0;
+        unsigned int maxDay = dialog->m_choiceWakeDisplay->GetSelection();
+        unsigned int lineCount = watchListFile->GetLineCount();
+
+        if ( day == 0 )
+            day = 1;
+
+        if ( maxDay == 0 )
+            maxDay = -1;
+        else
+            maxDay = ( day+maxDay );
 
-	path = data_locn;
-	wxTextFile *logFile = new wxTextFile(path);
-	if(mode != 0)
-		path.Replace(wxT("txt"),wxT("html"));
-	else 
-		path = savePath;
-
-	if(::wxFileExists(path))
-		::wxRemoveFile(path);
-
-	wxFileOutputStream output( path );
-	wxTextOutputStream htmlFile(output);
-
-	logFile->Open();
-
-	wxString newMiddleHTML;
-	wxString newWakeHTML;
-
-	topHTML.Replace(wxT("#TYPE#"),Export::replaceNewLine(mode,dialog->boatType->GetValue(),false));
-	topHTML.Replace(wxT("#BOATNAME#"),Export::replaceNewLine(mode,dialog->boatName->GetValue(),false));
-	topHTML.Replace(wxT("#HOMEPORT#"),Export::replaceNewLine(mode,dialog->homeport->GetValue(),false));
-	topHTML.Replace(wxT("#CALLSIGN#"),Export::replaceNewLine(mode,dialog->callsign->GetValue(),false));
-	topHTML.Replace(wxT("#REGISTRATION#"),Export::replaceNewLine(mode,dialog->registration->GetValue(),false));
-
-	topHTML.Replace(wxT("#LTYPE#"),Export::replaceNewLine(mode,dialog->m_staticText128->GetLabel(),true));
-	topHTML.Replace(wxT("#LBOATNAME#"),Export::replaceNewLine(mode,dialog->bname->GetLabel(),true));
-	topHTML.Replace(wxT("#LHOMEPORT#"),Export::replaceNewLine(mode,dialog->m_staticText114->GetLabel(),true));
-	topHTML.Replace(wxT("#LCALLSIGN#"),Export::replaceNewLine(mode,dialog->m_staticText115->GetLabel(),true));
-	topHTML.Replace(wxT("#LREGISTRATION#"),Export::replaceNewLine(mode,dialog->m_staticText118->GetLabel(),true));
-	topHTML.Replace(wxT("#LCREWLIST#"),Export::replaceNewLine(mode,dialog->m_logbook->GetPageText(2),true));
-
-	if(html.Contains(_T("<!--Repeat -->")))
-	{	
-		htmlFile << topHTML;
-
-		int rowsMax = dialog->m_gridCrew->GetNumberRows();
-		int colsMax = dialog->m_gridCrew->GetNumberCols();
-		for(int row = 0; row < rowsMax; row++)
-		{
-			if(dialog->m_menu2->IsChecked(MENUCREWONBOARD) && dialog->m_gridCrew->GetCellValue(row,ONBOARD) == _T(""))
-				continue;
-			newMiddleHTML = middleHTML;
-			for(int col = 0; col < colsMax; col++)
-				newMiddleHTML = replacePlaceholder(newMiddleHTML,headerHTML,0,row,col,0,watch,0);
-			htmlFile << newMiddleHTML;
-		}
-		htmlFile << bottomHTML;
-		topHTML = _T("");
-	}
+        if ( ( lineno = getDayOne( day ) ) == -1 ) return;
 
-	if(html.Contains(_T("<!--Repeat Wake -->")))
-	{	
-		htmlFile << topHTML;
-
-		int lineno; 
-		wxString s;
-		int col = 1;
-		unsigned int actDay = 0,lastday = 1;
-		wxString tmp;
-		int colTotal = 0;
-		unsigned int maxDay = dialog->m_choiceWakeDisplay->GetSelection();
-		unsigned int lineCount = watchListFile->GetLineCount();
-
-		if(day == 0)
-			day = 1;
-
-		if(maxDay == 0)
-			maxDay = -1;
-		else
-			maxDay = (day+maxDay);
-
-		if((lineno = getDayOne(day)) == -1) return;
-
-
-		do{
-			int offset = 0; colTotal = 0; col = 1;
-			watch.clear();
-			do{
-				if(lineno >= (int) lineCount)
-					break;
-				s = watchListFile->GetLine(lineno);
-				s = dialog->restoreDangerChar(s);
-				wxStringTokenizer tkz(s,_T("\t"));
-				wxString t = tkz.GetNextToken();
-				actDay = wxAtoi(t);
-				if(actDay != lastday || actDay == maxDay) 
-					break;
-				watch.Add(t);					// day
-				tkz.GetNextToken();
-				watch.Add(tkz.GetNextToken());  // watchlength
-
-				wxString date = Logbook::makeDateFromFile(tkz.GetNextToken(),dialog->logbookPlugIn->opt->sdateformat);
-				watch.Add(date);  // date
-
-				wxString time = Logbook::makeWatchtimeFromFile(tkz.GetNextToken(),dialog->logbookPlugIn->opt->stimeformat);
-				watch.Add(time);                // watch start/end
-				watch.Add(tkz.GetNextToken());  // member
-
-				lineno++; colTotal++; offset += 5; 
-			}while(!watchListFile->Eof());
-
-			if(!watch.IsEmpty())
-			{
-				tmp  = middleWakeHTML;
-
-				for(int row = 0; row < 5; row++)
-				{
-					tmp += _T("<tr>");
-					for(int i = 0, offset = 0; i != colTotal; i++, offset += 5)
-					{
-						switch(row)
-						{
-						case 0: 
-							tmp  += replacePlaceholder(columnWake0HTML,headerHTML,1,row,col++,0,watch,offset);
-							break;
-						case 1:
-							tmp  += replacePlaceholder(columnWake1HTML,headerHTML,1,row,col++,0,watch,offset);
-							break;
-						case 2:
-							tmp  += replacePlaceholder(columnWake2HTML,headerHTML,1,row,col++,0,watch,offset);
-							break;
-						case 3:
-							tmp  += replacePlaceholder(columnWake3HTML,headerHTML,1,row,col++,0,watch,offset);
-							break;
-						case 4:
-							tmp  += replacePlaceholder(columnWake4HTML,headerHTML,1,row,col++,0,watch,offset);
-							break;
-						}
-					}
-					tmp += _T("</tr>");
-				}
-				tmp += middleWake1HTML;
-				htmlFile << tmp;
-			}
-			lastday++;
-						
-			if(actDay == maxDay) break;
-		}while(lineno < (int) lineCount);
-		htmlFile << bottomWakeHTML;
-	}
-	
-	logFile->Close();
-	output.Close();
-}
-
-wxString CrewList::replacePlaceholder(wxString html,wxString s, int nGrid, int row, int col, bool mode, wxArrayString watch, int offset)
-{
-		wxGrid* grid = dialog->m_gridCrew;	
-
-			switch(nGrid) 
-			{
-			case 0:
-				switch(col)
-				{
-				case NAME:				html.Replace(wxT("#NAME#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LNAME#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case BIRTHNAME:		html.Replace(wxT("#BIRTHNAME#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LBIRTHNAME#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case FIRSTNAME:		html.Replace(wxT("#FIRSTNAME#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LFIRSTNAME#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case TITLE:			html.Replace(wxT("#TITLE#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LTITLE#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));		
-										break;
-					case BIRTHPLACE:	html.Replace(wxT("#BIRTHPLACE#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LBIRTHPLACE#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case BIRTHDATE:		html.Replace(wxT("#BIRTHDATE#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LBIRTHDATE#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case NATIONALITY:	html.Replace(wxT("#NATIONALITY#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LNATIONALITY#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));	
-										break;
-					case PASSPORT:		html.Replace(wxT("#PASSPORT#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LPASSPORT#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case EST_IN:		html.Replace(wxT("#EST_IN#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LEST_IN#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case EST_ON:		html.Replace(wxT("#EST_ON#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LEST_ON#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case ZIP:			html.Replace(wxT("#ZIP#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LZIP#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case COUNTRY:		html.Replace(wxT("#COUNTRY#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LCOUNTRY#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));	
-										break;
-					case TOWN:			html.Replace(wxT("#TOWN#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LTOWN#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));
-										break;
-					case STREET:		html.Replace(wxT("#STREET#"),Export::replaceNewLine(mode,grid->GetCellValue(row,col),false));
-										html.Replace(wxT("#LSTREET#"),Export::replaceNewLine(mode,grid->GetColLabelValue(col),true));	
-										break;
-				}
-				break;
-			case 1:
-				{
-					html.Replace(wxT("#N#"),wxString::Format(_T("%i"),col));
-					html.Replace(wxT("#LWATCH#"),dialog->m_gridGlobal->GetColLabelValue(4));
-					html.Replace(wxT("#LENGTH#"),Export::replaceNewLine(mode,watch[1+offset],false));
-					html.Replace(wxT("#DATE#"),Export::replaceNewLine(mode,watch[2+offset],false));
-					html.Replace(wxT("#TIME#"),Export::replaceNewLine(mode,watch[3+offset],false));
-					html.Replace(wxT("#MEMBER#"),Export::replaceNewLine(mode,watch[4+offset],false));
-				}
-			case 2:
-				{
-					wxString no     = wxString::Format(_T("#N%i#"),col);
-					wxString length = wxString::Format(_T("#LENGTH%i#"),col);
-					wxString date   = wxString::Format(_T("#DATE%i#"),col); 
-					wxString time   = wxString::Format(_T("#TIME%i#"),col);
-					wxString member = wxString::Format(_T("#MEMBER%i#"),col);
-
-					html.Replace(no,    wxString::Format(_T("%i"),col),false);
-					html.Replace(length,Export::replaceNewLine(mode,watch[1],false),false);
-					html.Replace(date,  Export::replaceNewLine(mode,watch[2],false),false);
-					html.Replace(time,  Export::replaceNewLine(mode,watch[3],false),false);
-					html.Replace(member,Export::replaceNewLine(mode,watch[4],false),false);
-				}
-				break;
-			}
-	html.Replace(wxT("#LADRESS#"),_("Adress"));
-
-	wxString str(html);
-	return str;
-}
-
-wxString CrewList::readLayout(wxString layoutFileName)
-{
-	wxString html, path;
-
-	path = layout_locn + layoutFileName + wxT(".html");;
-	wxTextFile layout(path);
-	
-	layout.Open();
 
-	for(unsigned int i = 0; i < layout.GetLineCount(); i++)
-	{
-		html += layout.GetLine(i);
-	}
+        do
+        {
+            int offset = 0;
+            colTotal = 0;
+            col = 1;
+            watch.clear();
+            do
+            {
+                if ( lineno >= ( int ) lineCount )
+                    break;
+                s = watchListFile->GetLine( lineno );
+                s = dialog->restoreDangerChar( s );
+                wxStringTokenizer tkz( s,_T( "\t" ) );
+                wxString t = tkz.GetNextToken();
+                actDay = wxAtoi( t );
+                if ( actDay != lastday || actDay == maxDay )
+                    break;
+                watch.Add( t );					// day
+                tkz.GetNextToken();
+                watch.Add( tkz.GetNextToken() ); // watchlength
+
+                wxString date = Logbook::makeDateFromFile( tkz.GetNextToken(),dialog->logbookPlugIn->opt->sdateformat );
+                watch.Add( date ); // date
+
+                wxString time = Logbook::makeWatchtimeFromFile( tkz.GetNextToken(),dialog->logbookPlugIn->opt->stimeformat );
+                watch.Add( time );              // watch start/end
+                watch.Add( tkz.GetNextToken() ); // member
+
+                lineno++;
+                colTotal++;
+                offset += 5;
+            }
+            while ( !watchListFile->Eof() );
+
+            if ( !watch.IsEmpty() )
+            {
+                tmp  = middleWakeHTML;
+
+                for ( int row = 0; row < 5; row++ )
+                {
+                    tmp += _T( "<tr>" );
+                    for ( int i = 0, offset = 0; i != colTotal; i++, offset += 5 )
+                    {
+                        switch ( row )
+                        {
+                        case 0:
+                            tmp  += replacePlaceholder( columnWake0HTML,headerHTML,1,row,col++,0,watch,offset );
+                            break;
+                        case 1:
+                            tmp  += replacePlaceholder( columnWake1HTML,headerHTML,1,row,col++,0,watch,offset );
+                            break;
+                        case 2:
+                            tmp  += replacePlaceholder( columnWake2HTML,headerHTML,1,row,col++,0,watch,offset );
+                            break;
+                        case 3:
+                            tmp  += replacePlaceholder( columnWake3HTML,headerHTML,1,row,col++,0,watch,offset );
+                            break;
+                        case 4:
+                            tmp  += replacePlaceholder( columnWake4HTML,headerHTML,1,row,col++,0,watch,offset );
+                            break;
+                        }
+                    }
+                    tmp += _T( "</tr>" );
+                }
+                tmp += middleWake1HTML;
+                htmlFile << tmp;
+            }
+            lastday++;
 
-	layout.Close();
+            if ( actDay == maxDay ) break;
+        }
+        while ( lineno < ( int ) lineCount );
+        htmlFile << bottomWakeHTML;
+    }
 
-	return html;
+    logFile->Close();
+    output.Close();
 }
 
-void CrewList::viewHTML(wxString path, wxString layout)
+wxString CrewList::replacePlaceholder( wxString html,wxString s, int nGrid, int row, int col, bool mode, wxArrayString watch, int offset )
 {
-	if(opt->filterLayout[LogbookDialog::CREW])
-        layout.Prepend(opt->layoutPrefix[LogbookDialog::CREW]);
-
-    saveHTML(path, layout, true);
+    wxGrid* grid = dialog->m_gridCrew;
 
-	if(layout != _T("") && wxFile::Exists(html_locn))
-		dialog->startBrowser(html_locn);
-}
+    switch ( nGrid )
+    {
+    case 0:
+        switch ( col )
+        {
+        case NAME:
+            html.Replace( wxT( "#NAME#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LNAME#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case BIRTHNAME:
+            html.Replace( wxT( "#BIRTHNAME#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LBIRTHNAME#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case FIRSTNAME:
+            html.Replace( wxT( "#FIRSTNAME#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LFIRSTNAME#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case TITLE:
+            html.Replace( wxT( "#TITLE#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LTITLE#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case BIRTHPLACE:
+            html.Replace( wxT( "#BIRTHPLACE#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LBIRTHPLACE#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case BIRTHDATE:
+            html.Replace( wxT( "#BIRTHDATE#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LBIRTHDATE#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case NATIONALITY:
+            html.Replace( wxT( "#NATIONALITY#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LNATIONALITY#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case PASSPORT:
+            html.Replace( wxT( "#PASSPORT#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LPASSPORT#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case EST_IN:
+            html.Replace( wxT( "#EST_IN#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LEST_IN#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case EST_ON:
+            html.Replace( wxT( "#EST_ON#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LEST_ON#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case ZIP:
+            html.Replace( wxT( "#ZIP#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LZIP#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case COUNTRY:
+            html.Replace( wxT( "#COUNTRY#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LCOUNTRY#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case TOWN:
+            html.Replace( wxT( "#TOWN#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LTOWN#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        case STREET:
+            html.Replace( wxT( "#STREET#" ),Export::replaceNewLine( mode,grid->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LSTREET#" ),Export::replaceNewLine( mode,grid->GetColLabelValue( col ),true ) );
+            break;
+        }
+        break;
+    case 1:
+    {
+        html.Replace( wxT( "#N#" ),wxString::Format( _T( "%i" ),col ) );
+        html.Replace( wxT( "#LWATCH#" ),dialog->m_gridGlobal->GetColLabelValue( 4 ) );
+        html.Replace( wxT( "#LENGTH#" ),Export::replaceNewLine( mode,watch[1+offset],false ) );
+        html.Replace( wxT( "#DATE#" ),Export::replaceNewLine( mode,watch[2+offset],false ) );
+        html.Replace( wxT( "#TIME#" ),Export::replaceNewLine( mode,watch[3+offset],false ) );
+        html.Replace( wxT( "#MEMBER#" ),Export::replaceNewLine( mode,watch[4+offset],false ) );
+    }
+    case 2:
+    {
+        wxString no     = wxString::Format( _T( "#N%i#" ),col );
+        wxString length = wxString::Format( _T( "#LENGTH%i#" ),col );
+        wxString date   = wxString::Format( _T( "#DATE%i#" ),col );
+        wxString time   = wxString::Format( _T( "#TIME%i#" ),col );
+        wxString member = wxString::Format( _T( "#MEMBER%i#" ),col );
+
+        html.Replace( no,    wxString::Format( _T( "%i" ),col ),false );
+        html.Replace( length,Export::replaceNewLine( mode,watch[1],false ),false );
+        html.Replace( date,  Export::replaceNewLine( mode,watch[2],false ),false );
+        html.Replace( time,  Export::replaceNewLine( mode,watch[3],false ),false );
+        html.Replace( member,Export::replaceNewLine( mode,watch[4],false ),false );
+    }
+    break;
+    }
+    html.Replace( wxT( "#LADRESS#" ),_( "Adress" ) );
+
+    wxString str( html );
+    return str;
+}
+
+wxString CrewList::readLayout( wxString layoutFileName )
+{
+    wxString html, path;
+
+    path = layout_locn + layoutFileName + wxT( ".html" );;
+    wxTextFile layout( path );
+
+    layout.Open();
+
+    for ( unsigned int i = 0; i < layout.GetLineCount(); i++ )
+    {
+        html += layout.GetLine( i );
+    }
+
+    layout.Close();
+
+    return html;
+}
+
+void CrewList::viewHTML( wxString path, wxString layout )
+{
+    if ( opt->filterLayout[LogbookDialog::CREW] )
+        layout.Prepend( opt->layoutPrefix[LogbookDialog::CREW] );
+
+    saveHTML( path, layout, true );
+
+    if ( layout != _T( "" ) && wxFile::Exists( html_locn ) )
+        dialog->startBrowser( html_locn );
+}
+
+void CrewList::viewODT( wxString path, wxString layout )
+{
+    if ( opt->filterLayout[LogbookDialog::CREW] )
+        layout.Prepend( opt->layoutPrefix[LogbookDialog::CREW] );
+
+    saveODT( path, layout, true );
+
+    if ( layout != _T( "" ) && wxFile::Exists( ODT_locn ) )
+        dialog->startApplication( ODT_locn,_T( ".odt" ) );
+}
+
+void CrewList::saveODT( wxString savePath,wxString layout, bool mode )
+{
+    wxString path;
+
+    if ( layout == _T( "" ) )
+    {
+        wxMessageBox( _( "Sorry, no Layout installed" ),_( "Information" ),wxOK );
+        return;
+    }
+
+    saveData();
+
+    wxString odt = readLayoutODT( layout );
+
+    int indexTop;
+    int indexBottom;
+    int indexWakeTop;
+    int indexWakeBottom;
+    int indexTop1;
+    int indexBottom1;
+    int indexWakeTop1;
+    int indexWakeBottom1;
+
+    wxString topODT;
+    wxString bottomODT;
+    wxString middleODT;
+    wxString topWakeODT;
+    wxString bottomWakeODT;
+    wxString middleWakeODT;
+    wxString headerODT;
+    wxString middleData = _T( "" );
+
+    wxString seperatorTop        = wxT( "[[" );
+    wxString seperatorBottom     = wxT( "]]" );
+    wxString seperatorWakeTop    = wxT( "{{" );
+    wxString seperatorWakeBottom = wxT( "}}" );
+
+    if ( !odt.Contains( seperatorWakeTop ) )
+    {
+        indexTop        = odt.First( seperatorTop );
+        topODT          = odt.substr( 0,indexTop );
+        indexTop1        = topODT.find_last_of( '<' );
+        topODT          = odt.substr( 0,indexTop1 );
+        indexBottom     = odt.First( seperatorBottom );
+        bottomODT       = odt.substr( indexBottom );
+        indexBottom1     = bottomODT.find_first_of( '>' );
+        bottomODT       = bottomODT.substr( indexBottom1+1 );
+        middleODT       = odt.substr( indexTop+11,indexBottom );
+        indexTop		= middleODT.First( seperatorBottom );
+        middleODT       = middleODT.substr( 0,indexTop );
+        indexTop	    = middleODT.find_last_of( '<' );
+        middleODT       = middleODT.substr( 0,indexTop );
+    }
+    else if ( !odt.Contains( seperatorTop ) )
+    {
+        indexWakeTop        = odt.First( seperatorWakeTop );
+        topODT				= odt.substr( 0,indexWakeTop );
+        indexWakeTop1		= topODT.find_last_of( '<' );
+        topODT				= topODT.substr( 0,indexWakeTop1 );
+        indexWakeBottom     = odt.First( seperatorWakeBottom );
+        bottomWakeODT		= odt.substr( indexWakeBottom );
+        indexWakeBottom1	= bottomWakeODT.find_first_of( '>' );
+        bottomODT	    = bottomWakeODT.substr( indexWakeBottom1+1 );
+        middleODT			= odt.substr( indexWakeTop+11,indexWakeBottom );
+        indexWakeTop		= middleODT.First( seperatorWakeBottom );
+        middleODT			= middleODT.substr( 0,indexWakeTop );
+        indexWakeTop	    = middleODT.find_last_of( '<' );
+        middleWakeODT		= middleODT.substr( 0,indexWakeTop );
+        topODT.Replace( wxT( "#LFROM#" ),_( "from" ) );
+        topODT.Replace( wxT( "#LTO#" ),_( "to" ) );
+        topODT.Replace( wxT( "#LWATCH#" ),Export::replaceNewLine( mode,dialog->m_gridGlobal->GetColLabelValue( 4 ),true ) );
+    }
+    else
+    {
+        indexTop        = odt.First( seperatorTop );
+        topODT          = odt.substr( 0,indexTop );
+        indexTop1       = topODT.find_last_of( '<' );
+        topODT          = topODT.substr( 0,indexTop1 );
+        indexBottom     = odt.First( seperatorBottom );
+        bottomODT       = odt.substr( indexBottom );
+        indexBottom1     = bottomODT.find_first_of( '>' );
+        bottomODT       = bottomODT.substr( indexBottom1+1 );
+
+        middleODT       = odt.substr( indexTop+11,indexBottom );
+        indexTop		= middleODT.First( seperatorBottom );
+        middleODT       = middleODT.substr( 0,indexTop );
+        indexTop	    = middleODT.find_last_of( '<' );
+        middleODT       = middleODT.substr( 0,indexTop );
+
+        middleData			= bottomODT;
+        indexTop			= middleData.Find( seperatorWakeTop );
+        middleData			= middleData.substr( 0,indexTop );
+        middleData			= middleData.substr( 0,middleData.find_last_of( '<' ) );
+        indexWakeTop        = odt.First( seperatorWakeTop );
+
+        indexWakeBottom     = odt.First( seperatorWakeBottom );
+        bottomWakeODT		= odt.substr( indexWakeBottom );
+        indexWakeBottom1	= bottomWakeODT.find_first_of( '>' );
+        bottomODT			= bottomWakeODT.substr( indexWakeBottom1+1 );
+        middleWakeODT		= odt.substr( indexWakeTop+11,indexWakeBottom );
+        indexWakeTop		= middleWakeODT.First( seperatorWakeBottom );
+        middleWakeODT		= middleWakeODT.substr( 0,indexWakeTop );
+        indexWakeTop	    = middleWakeODT.find_last_of( '<' );
+        middleWakeODT		= middleWakeODT.substr( 0,indexWakeTop );
+
+        middleData.Replace( wxT( "#LFROM#" ),_( "from" ) );
+        middleData.Replace( wxT( "#LTO#" ),_( "to" ) );
+        middleData.Replace( wxT( "#LWATCH#" ),Export::replaceNewLine( mode,dialog->m_gridGlobal->GetColLabelValue( 4 ),true ) );
+    }
+
+    topODT.Replace( wxT( "#TYPE#" ),Export::replaceNewLine( mode,dialog->boatType->GetValue(),false ) );
+    topODT.Replace( wxT( "#BOATNAME#" ),Export::replaceNewLine( mode,dialog->boatName->GetValue(),false ) );
+    topODT.Replace( wxT( "#HOMEPORT#" ),Export::replaceNewLine( mode,dialog->homeport->GetValue(),false ) );
+    topODT.Replace( wxT( "#CALLSIGN#" ),Export::replaceNewLine( mode,dialog->callsign->GetValue(),false ) );
+    topODT.Replace( wxT( "#REGISTRATION#" ),Export::replaceNewLine( mode,dialog->registration->GetValue(),false ) );
+
+    topODT.Replace( wxT( "#LTYPE#" ),Export::replaceNewLine( mode,dialog->m_staticText128->GetLabel(),true ) );
+    topODT.Replace( wxT( "#LBOATNAME#" ),Export::replaceNewLine( mode,dialog->bname->GetLabel(),true ) );
+    topODT.Replace( wxT( "#LHOMEPORT#" ),Export::replaceNewLine( mode,dialog->m_staticText114->GetLabel(),true ) );
+    topODT.Replace( wxT( "#LCALLSIGN#" ),Export::replaceNewLine( mode,dialog->m_staticText115->GetLabel(),true ) );
+    topODT.Replace( wxT( "#LREGISTRATION#" ),Export::replaceNewLine( mode,dialog->m_staticText118->GetLabel(),true ) );
+    topODT.Replace( wxT( "#LCREWLIST#" ),Export::replaceNewLine( mode,dialog->m_logbook->GetPageText( 2 ),true ) );
+
+    path = data_locn;
+    wxTextFile *logFile = new wxTextFile( path );
+    if ( mode != 0 )
+        path.Replace( wxT( "txt" ),wxT( "odt" ) );
+    else
+        path = savePath;
+
+    if ( ::wxFileExists( path ) )
+        ::wxRemoveFile( path );
+
+    ODT_locn = path;
+
+    logFile->Open();
+
+    wxString newMiddleODT;
+    wxString newWakeODT;
+
+    auto_ptr<wxFFileInputStream> in( new wxFFileInputStream( layout_locn + layout + _T( ".odt" ) ) );
+    wxTempFileOutputStream out( path );
+
+    wxZipInputStream inzip( *in );
+    wxZipOutputStream outzip( out );
+    wxTextOutputStream odtFile( outzip );
+    auto_ptr<wxZipEntry> entry;
 
-void CrewList::viewODT(wxString path, wxString layout)
-{
-	if(opt->filterLayout[LogbookDialog::CREW])
-        layout.Prepend(opt->layoutPrefix[LogbookDialog::CREW]);
+    outzip.CopyArchiveMetaData( inzip );
 
-    saveODT(path, layout, true);
-	
-	if(layout != _T("") && wxFile::Exists(ODT_locn))
-		dialog->startApplication(ODT_locn,_T(".odt"));
-}
-
-void CrewList::saveODT(wxString savePath,wxString layout, bool mode)
-{
-	wxString path;
+    while ( entry.reset( inzip.GetNextEntry() ), entry.get() != NULL )
+        if ( !entry->GetName().Matches( _T( "content.xml" ) ) )
+            if ( !outzip.CopyEntry( entry.release(), inzip ) )
+                break;
 
-	if(layout == _T(""))
-	{
-		wxMessageBox(_("Sorry, no Layout installed"),_("Information"),wxOK);
-		return;
-	}
+    in.reset();
 
-	saveData();
+    outzip.PutNextEntry( _T( "content.xml" ) );
 
-	wxString odt = readLayoutODT(layout);
+    odtFile << topODT;
 
-	int indexTop;
-	int indexBottom;
-	int indexWakeTop;
-	int indexWakeBottom;
-	int indexTop1;
-	int indexBottom1;
-	int indexWakeTop1;
-	int indexWakeBottom1;
-
-	wxString topODT;
-	wxString bottomODT;
-	wxString middleODT;
-	wxString topWakeODT;
-	wxString bottomWakeODT;
-	wxString middleWakeODT;
-	wxString headerODT;
-	wxString middleData = _T("");
-
-	wxString seperatorTop        = wxT("[[");
-	wxString seperatorBottom     = wxT("]]");
-	wxString seperatorWakeTop    = wxT("{{");
-	wxString seperatorWakeBottom = wxT("}}");
+    if ( odt.Contains( seperatorTop ) )
+    {
+        int rowsMax = dialog->m_gridCrew->GetNumberRows();
+        int colsMax = dialog->m_gridCrew->GetNumberCols();
+        for ( int row = 0; row < rowsMax; row++ )
+        {
+            if ( dialog->m_menu2->IsChecked( MENUCREWONBOARD ) && dialog->m_gridCrew->GetCellValue( row,ONBOARD ) == _T( "" ) )
+                continue;
+            newMiddleODT = middleODT;
+#ifdef __WXOSX__
+            wxArrayString watch;
+            for ( int col = 0; col < colsMax; col++ )
+                newMiddleODT = replacePlaceholder( newMiddleODT,headerODT,0,row,col,mode,watch,0 );
+#else
+            for ( int col = 0; col < colsMax; col++ )
+                newMiddleODT = replacePlaceholder( newMiddleODT,headerODT,0,row,col,mode,( wxArrayString )0,0 );
+#endif
+            odtFile << newMiddleODT;
+        }
+    }
 
-	if(!odt.Contains(seperatorWakeTop))
-	{
-		indexTop        = odt.First(seperatorTop);
-		topODT          = odt.substr(0,indexTop);
-		indexTop1        = topODT.find_last_of('<');
-		topODT          = odt.substr(0,indexTop1);
-		indexBottom     = odt.First(seperatorBottom);
-		bottomODT       = odt.substr(indexBottom);
-		indexBottom1     = bottomODT.find_first_of('>');
-		bottomODT       = bottomODT.substr(indexBottom1+1);
-		middleODT       = odt.substr(indexTop+11,indexBottom);
-		indexTop		= middleODT.First(seperatorBottom);
-		middleODT       = middleODT.substr(0,indexTop);
-		indexTop	    = middleODT.find_last_of('<');
-		middleODT       = middleODT.substr(0,indexTop);
-	}
-	else if(!odt.Contains(seperatorTop))
-	{
-		indexWakeTop        = odt.First(seperatorWakeTop);
-		topODT				= odt.substr(0,indexWakeTop);
-		indexWakeTop1		= topODT.find_last_of('<');
-		topODT				= topODT.substr(0,indexWakeTop1);
-		indexWakeBottom     = odt.First(seperatorWakeBottom);
-		bottomWakeODT		= odt.substr(indexWakeBottom);
-		indexWakeBottom1	= bottomWakeODT.find_first_of('>');
-		bottomODT	    = bottomWakeODT.substr(indexWakeBottom1+1);
-		middleODT			= odt.substr(indexWakeTop+11,indexWakeBottom);
-		indexWakeTop		= middleODT.First(seperatorWakeBottom);
-		middleODT			= middleODT.substr(0,indexWakeTop);
-		indexWakeTop	    = middleODT.find_last_of('<');
-		middleWakeODT		= middleODT.substr(0,indexWakeTop);
-		topODT.Replace(wxT("#LFROM#"),_("from"));
-		topODT.Replace(wxT("#LTO#"),_("to"));
-		topODT.Replace(wxT("#LWATCH#"),Export::replaceNewLine(mode,dialog->m_gridGlobal->GetColLabelValue(4),true));
-	}
-	else
-	{
-		indexTop        = odt.First(seperatorTop);
-		topODT          = odt.substr(0,indexTop);
-		indexTop1       = topODT.find_last_of('<');
-		topODT          = topODT.substr(0,indexTop1);
-		indexBottom     = odt.First(seperatorBottom);
-		bottomODT       = odt.substr(indexBottom);
-		indexBottom1     = bottomODT.find_first_of('>');
-		bottomODT       = bottomODT.substr(indexBottom1+1);
-
-		middleODT       = odt.substr(indexTop+11,indexBottom);
-		indexTop		= middleODT.First(seperatorBottom);
-		middleODT       = middleODT.substr(0,indexTop);
-		indexTop	    = middleODT.find_last_of('<');
-		middleODT       = middleODT.substr(0,indexTop);
-
-		middleData			= bottomODT;
-		indexTop			= middleData.Find(seperatorWakeTop);
-		middleData			= middleData.substr(0,indexTop);
-		middleData			= middleData.substr(0,middleData.find_last_of('<'));
-		indexWakeTop        = odt.First(seperatorWakeTop);
-
-		indexWakeBottom     = odt.First(seperatorWakeBottom);
-		bottomWakeODT		= odt.substr(indexWakeBottom);
-		indexWakeBottom1	= bottomWakeODT.find_first_of('>');
-		bottomODT			= bottomWakeODT.substr(indexWakeBottom1+1);
-		middleWakeODT		= odt.substr(indexWakeTop+11,indexWakeBottom);
-		indexWakeTop		= middleWakeODT.First(seperatorWakeBottom);
-		middleWakeODT		= middleWakeODT.substr(0,indexWakeTop);
-		indexWakeTop	    = middleWakeODT.find_last_of('<');
-		middleWakeODT		= middleWakeODT.substr(0,indexWakeTop);
-
-		middleData.Replace(wxT("#LFROM#"),_("from"));
-		middleData.Replace(wxT("#LTO#"),_("to"));
-		middleData.Replace(wxT("#LWATCH#"),Export::replaceNewLine(mode,dialog->m_gridGlobal->GetColLabelValue(4),true));
-	}
+    if ( !middleData.IsEmpty() )
+        odtFile << middleData;
 
-	topODT.Replace(wxT("#TYPE#"),Export::replaceNewLine(mode,dialog->boatType->GetValue(),false));
-	topODT.Replace(wxT("#BOATNAME#"),Export::replaceNewLine(mode,dialog->boatName->GetValue(),false));
-	topODT.Replace(wxT("#HOMEPORT#"),Export::replaceNewLine(mode,dialog->homeport->GetValue(),false));
-	topODT.Replace(wxT("#CALLSIGN#"),Export::replaceNewLine(mode,dialog->callsign->GetValue(),false));
-	topODT.Replace(wxT("#REGISTRATION#"),Export::replaceNewLine(mode,dialog->registration->GetValue(),false));
-
-	topODT.Replace(wxT("#LTYPE#"),Export::replaceNewLine(mode,dialog->m_staticText128->GetLabel(),true));
-	topODT.Replace(wxT("#LBOATNAME#"),Export::replaceNewLine(mode,dialog->bname->GetLabel(),true));
-	topODT.Replace(wxT("#LHOMEPORT#"),Export::replaceNewLine(mode,dialog->m_staticText114->GetLabel(),true));
-	topODT.Replace(wxT("#LCALLSIGN#"),Export::replaceNewLine(mode,dialog->m_staticText115->GetLabel(),true));
-	topODT.Replace(wxT("#LREGISTRATION#"),Export::replaceNewLine(mode,dialog->m_staticText118->GetLabel(),true));
-	topODT.Replace(wxT("#LCREWLIST#"),Export::replaceNewLine(mode,dialog->m_logbook->GetPageText(2),true));
-
-	path = data_locn;
-	wxTextFile *logFile = new wxTextFile(path);
-	if(mode != 0)
-		path.Replace(wxT("txt"),wxT("odt"));
-	else 
-		path = savePath;
-
-	if(::wxFileExists(path))
-		::wxRemoveFile(path);
-
-	ODT_locn = path;
-
-	logFile->Open();
-
-	wxString newMiddleODT;
-	wxString newWakeODT;
-
-    auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(layout_locn + layout + _T(".odt")));
-    wxTempFileOutputStream out(path);
-
-    wxZipInputStream inzip(*in);
-    wxZipOutputStream outzip(out);
-	wxTextOutputStream odtFile(outzip);
-    auto_ptr<wxZipEntry> entry;
+    if ( odt.Contains( seperatorWakeTop ) )
+    {
+        int lineno;
+        unsigned int dDay = dialog->m_choiceWakeDisplay->GetSelection();
+        unsigned int lineCount = watchListFile->GetLineCount();
+        wxString s;
+        int col = 1;
+        unsigned int lastday = 1;
+        wxString tmp;
+        wxArrayString watch;
+
+        middleWakeODT.Replace( wxT( "#LWATCH#" ),dialog->m_gridGlobal->GetColLabelValue( 4 ) );
+        newWakeODT = middleWakeODT;
+
+        if ( day == 0 )
+            day = 1;
+
+        if ( dDay == 0 )
+            dDay = -1;
+        else
+            dDay = ( day+dDay );
+
+        if ( ( lineno = getDayOne( day ) ) == -1 ) return;
+
+        s = watchListFile->GetLine( lineno );
+        wxStringTokenizer tkz( s,_T( "\t" ) );
+        wxString t = tkz.GetNextToken();
+        lastday = wxAtoi( t );
 
-    outzip.CopyArchiveMetaData(inzip);
+        do
+        {
+            watch.clear();
 
-    while (entry.reset(inzip.GetNextEntry()), entry.get() != NULL)
-        if (!entry->GetName().Matches(_T("content.xml")))
-            if (!outzip.CopyEntry(entry.release(), inzip))
+            if ( lineno >= ( int ) lineCount )
                 break;
+            s = watchListFile->GetLine( lineno );
+            s = dialog->restoreDangerChar( s );
 
-    in.reset();
-
-	outzip.PutNextEntry(_T("content.xml"));
-
-	odtFile << topODT;
+            wxStringTokenizer tkz( s,_T( "\t" ) );
+            wxString t = tkz.GetNextToken();
+            unsigned int z = wxAtoi( t );
+            if ( dDay == z ) break;
+            if ( z != lastday )
+            {
+                col = 1;
+                lastday++;
+                newWakeODT = deleteODTCols( newWakeODT );
+                odtFile << newWakeODT;
+                newWakeODT = middleWakeODT;
+            }
+
+            watch.Add( t );					// day
+            tkz.GetNextToken();
+            watch.Add( tkz.GetNextToken() ); // watchlength
+
+            wxString date = Logbook::makeDateFromFile( tkz.GetNextToken(),dialog->logbookPlugIn->opt->sdateformat );
+            watch.Add( date ); // date
 
-	if(odt.Contains(seperatorTop))
-	{
-		int rowsMax = dialog->m_gridCrew->GetNumberRows();
-		int colsMax = dialog->m_gridCrew->GetNumberCols();
-		for(int row = 0; row < rowsMax; row++)
-		{
-			if(dialog->m_menu2->IsChecked(MENUCREWONBOARD) && dialog->m_gridCrew->GetCellValue(row,ONBOARD) == _T(""))
-				continue;
-			newMiddleODT = middleODT;
-#ifdef __WXOSX__
-			wxArrayString watch;
-			for(int col = 0; col < colsMax; col++)
-				newMiddleODT = replacePlaceholder(newMiddleODT,headerODT,0,row,col,mode,watch,0);
-#else
-			for(int col = 0; col < colsMax; col++)
-				newMiddleODT = replacePlaceholder(newMiddleODT,headerODT,0,row,col,mode,(wxArrayString)0,0);
-#endif
-			odtFile << newMiddleODT;
-		}
-	}
+            wxString time = Logbook::makeWatchtimeFromFile( tkz.GetNextToken(),dialog->logbookPlugIn->opt->stimeformat );
+            watch.Add( time );              // watch start/end
 
-	if(!middleData.IsEmpty())
-		odtFile << middleData;
+            watch.Add( tkz.GetNextToken() ); // member
 
-	if(odt.Contains(seperatorWakeTop))
-	{
-		int lineno;
-		unsigned int dDay = dialog->m_choiceWakeDisplay->GetSelection();
-		unsigned int lineCount = watchListFile->GetLineCount();
-		wxString s;
-		int col = 1;
-		unsigned int lastday = 1;
-		wxString tmp;
-		wxArrayString watch;
-
-		middleWakeODT.Replace(wxT("#LWATCH#"),dialog->m_gridGlobal->GetColLabelValue(4));
-		newWakeODT = middleWakeODT;
-
-		if(day == 0)
-			day = 1;
-
-		if(dDay == 0)
-			dDay = -1;
-		else
-			dDay = (day+dDay);
-
-		if((lineno = getDayOne(day)) == -1) return;
-
-		s = watchListFile->GetLine(lineno);
-		wxStringTokenizer tkz(s,_T("\t"));
-		wxString t = tkz.GetNextToken();
-		lastday = wxAtoi(t);
-
-		do{
-			watch.clear();
-
-				if(lineno >= (int) lineCount)
-					break;
-				s = watchListFile->GetLine(lineno);
-				s = dialog->restoreDangerChar(s);
-
-				wxStringTokenizer tkz(s,_T("\t"));
-				wxString t = tkz.GetNextToken();
-				unsigned int z = wxAtoi(t);
-				if(dDay == z) break;
-				if(z != lastday) 
-				{ 
-					col = 1; lastday++; 
-					newWakeODT = deleteODTCols(newWakeODT);
-					odtFile << newWakeODT;
-					newWakeODT = middleWakeODT;
-				}
-
-				watch.Add(t);					// day
-				tkz.GetNextToken();
-				watch.Add(tkz.GetNextToken());  // watchlength
-
-				wxString date = Logbook::makeDateFromFile(tkz.GetNextToken(),dialog->logbookPlugIn->opt->sdateformat);
-				watch.Add(date);  // date
-
-				wxString time = Logbook::makeWatchtimeFromFile(tkz.GetNextToken(),dialog->logbookPlugIn->opt->stimeformat);
-				watch.Add(time);                // watch start/end
-
-				watch.Add(tkz.GetNextToken());  // member
-
-				lineno++; 
-				newWakeODT = replacePlaceholder(newWakeODT,headerODT,2,0,col++,mode,watch,0);
-		}while(!watchListFile->Eof());
-		newWakeODT = deleteODTCols(newWakeODT);
-		odtFile << newWakeODT;
-	}
-	odtFile << bottomODT;
-	inzip.Eof() && outzip.Close() && out.Commit();
-	logFile->Close();
+            lineno++;
+            newWakeODT = replacePlaceholder( newWakeODT,headerODT,2,0,col++,mode,watch,0 );
+        }
+        while ( !watchListFile->Eof() );
+        newWakeODT = deleteODTCols( newWakeODT );
+        odtFile << newWakeODT;
+    }
+    odtFile << bottomODT;
+    inzip.Eof() && outzip.Close() && out.Commit();
+    logFile->Close();
 }
 
-wxString CrewList::deleteODTCols(wxString newWakeODT)
+wxString CrewList::deleteODTCols( wxString newWakeODT )
 {
-	if(!newWakeODT.Contains(_T("#"))) return newWakeODT;
+    if ( !newWakeODT.Contains( _T( "#" ) ) ) return newWakeODT;
 
-	int first = 1;
-	int last;
-	wxString del;
-	wxString w = dialog->m_gridGlobal->GetColLabelValue(4); 
+    int first = 1;
+    int last;
+    wxString del;
+    wxString w = dialog->m_gridGlobal->GetColLabelValue( 4 );
 
-	while(true)
-	{
-		first = newWakeODT.find_first_of('#',first);
-		if(first < 0) break;
-		last  = newWakeODT.find_first_of('#',first+1);
-		del = newWakeODT.substr(first,(last-first)+1);
-		if(del.Contains(_T("#N")))
-			del += _T(".")+w;
-		first = last;
-		newWakeODT.Replace(del,wxEmptyString,false);
-	}
+    while ( true )
+    {
+        first = newWakeODT.find_first_of( '#',first );
+        if ( first < 0 ) break;
+        last  = newWakeODT.find_first_of( '#',first+1 );
+        del = newWakeODT.substr( first,( last-first )+1 );
+        if ( del.Contains( _T( "#N" ) ) )
+            del += _T( "." )+w;
+        first = last;
+        newWakeODT.Replace( del,wxEmptyString,false );
+    }
 
-	return newWakeODT;
+    return newWakeODT;
 }
 
-wxString CrewList::readLayoutODT(wxString layout)
+wxString CrewList::readLayoutODT( wxString layout )
 {
-	wxString odt = _T("");
+    wxString odt = _T( "" );
 
-	wxString filename = layout_locn + layout + _T(".odt");
+    wxString filename = layout_locn + layout + _T( ".odt" );
 
-	if(wxFileExists(filename))
-	{
+    if ( wxFileExists( filename ) )
+    {
 #ifdef __WXOSX__
         auto_ptr<wxZipEntry> entry;
-        static const wxString fn = _T("content.xml");
-        wxString name = wxZipEntry::GetInternalName(fn);
-        wxFFileInputStream in(filename);
-        wxZipInputStream zip(in);
+        static const wxString fn = _T( "content.xml" );
+        wxString name = wxZipEntry::GetInternalName( fn );
+        wxFFileInputStream in( filename );
+        wxZipInputStream zip( in );
         do
         {
-            entry.reset(zip.GetNextEntry());
+            entry.reset( zip.GetNextEntry() );
         }
-        while (entry.get() != NULL && entry->GetInternalName() != name);
-        if (entry.get() != NULL)
+        while ( entry.get() != NULL && entry->GetInternalName() != name );
+        if ( entry.get() != NULL )
         {
-            wxTextInputStream txt(zip,_T("\n"),wxConvUTF8);
-            while(!zip.Eof())
+            wxTextInputStream txt( zip,_T( "\n" ),wxConvUTF8 );
+            while ( !zip.Eof() )
                 odt += txt.ReadLine();
         }
 #else
-		/*static const wxString fn = _T("content.xml");
-		wxFileInputStream in(filename);
-		wxZipInputStream zip(in);
-		wxTextInputStream txt(zip);
-		while(!zip.Eof())
-			odt += txt.ReadLine();*/
+        /*static const wxString fn = _T("content.xml");
+        wxFileInputStream in(filename);
+        wxZipInputStream zip(in);
+        wxTextInputStream txt(zip);
+        while(!zip.Eof())
+        	odt += txt.ReadLine();*/
 #endif
-	}
-	return odt;
+    }
+    return odt;
 }
 
-void CrewList::deleteRow(int row)
+void CrewList::deleteRow( int row )
 {
-	int answer = wxMessageBox(wxString::Format(_("Delete Row Nr. %i ?"),row+1), _("Confirm"),
-                              wxYES_NO | wxCANCEL, dialog);
-	if (answer == wxYES)
-	{
-		gridCrew->DeleteRows(row);
-		modified = true;
-	}
+    int answer = wxMessageBox( wxString::Format( _( "Delete Row Nr. %i ?" ),row+1 ), _( "Confirm" ),
+                               wxYES_NO | wxCANCEL, dialog );
+    if ( answer == wxYES )
+    {
+        gridCrew->DeleteRows( row );
+        modified = true;
+    }
 }
 
-void CrewList::saveXML(wxString path)
+void CrewList::saveXML( wxString path )
 {
-	wxString s = _T("");
-	wxString line;
-	wxString temp;
+    wxString s = _T( "" );
+    wxString line;
+    wxString temp;
 
-	wxTextFile* xmlFile = new wxTextFile(path);
+    wxTextFile* xmlFile = new wxTextFile( path );
 
-	if(xmlFile->Exists())
-	{
-		::wxRemoveFile(path);
-		xmlFile->Create();
-	}
+    if ( xmlFile->Exists() )
+    {
+        ::wxRemoveFile( path );
+        xmlFile->Create();
+    }
 
-	crewListFile->Open();
+    crewListFile->Open();
 
-	if(crewListFile->GetLineCount() <= 0)
-	{
-		wxMessageBox(_("Sorry, Logbook has no lines"),_("Information"),wxOK);
-		return;
-	}
+    if ( crewListFile->GetLineCount() <= 0 )
+    {
+        wxMessageBox( _( "Sorry, Logbook has no lines" ),_( "Information" ),wxOK );
+        return;
+    }
 
-	xmlFile->AddLine(dialog->xmlHead);
-	for(unsigned int i = 0; i < crewListFile->GetLineCount(); i++)
-	{
-		line = crewListFile->GetLine(i);
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY );
-		s = wxString::Format(_T("<Row ss:Height=\"%u\">"),dialog->m_gridGlobal->GetRowHeight(i));
-
-		while ( tkz.HasMoreTokens() )
-		{ 
-			s += _T("<Cell>\n");
-			s += _T("<Data ss:Type=\"String\">#DATA#</Data>\n");
-			temp = tkz.GetNextToken().RemoveLast();
-			temp.Replace(_T("\\n"),_T("&#10;"));
-			temp.Replace(_T("&"),_T("&amp;"));
-			temp.Replace(_T("\""),_T("&quot;"));
-			temp.Replace(_T("<"),_T("&lt;"));
-			temp.Replace(_T(">"),_T("&gt;"));
-			temp.Replace(_T("'"),_T("&apos;"));
-			s.Replace(_T("#DATA#"),temp);
-			s += _T("</Cell>");
-		}
-		s += _T("</Row>>");
-		xmlFile->AddLine(s);
-	}
+    xmlFile->AddLine( dialog->xmlHead );
+    for ( unsigned int i = 0; i < crewListFile->GetLineCount(); i++ )
+    {
+        line = crewListFile->GetLine( i );
+        wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        s = wxString::Format( _T( "<Row ss:Height=\"%u\">" ),dialog->m_gridGlobal->GetRowHeight( i ) );
 
-	xmlFile->AddLine(dialog->xmlEnd);
-	xmlFile->Write();
-	crewListFile->Close();
-	xmlFile->Close();
+        while ( tkz.HasMoreTokens() )
+        {
+            s += _T( "<Cell>\n" );
+            s += _T( "<Data ss:Type=\"String\">#DATA#</Data>\n" );
+            temp = tkz.GetNextToken().RemoveLast();
+            temp.Replace( _T( "\\n" ),_T( "&#10;" ) );
+            temp.Replace( _T( "&" ),_T( "&amp;" ) );
+            temp.Replace( _T( "\"" ),_T( "&quot;" ) );
+            temp.Replace( _T( "<" ),_T( "&lt;" ) );
+            temp.Replace( _T( ">" ),_T( "&gt;" ) );
+            temp.Replace( _T( "'" ),_T( "&apos;" ) );
+            s.Replace( _T( "#DATA#" ),temp );
+            s += _T( "</Cell>" );
+        }
+        s += _T( "</Row>>" );
+        xmlFile->AddLine( s );
+    }
+
+    xmlFile->AddLine( dialog->xmlEnd );
+    xmlFile->Write();
+    crewListFile->Close();
+    xmlFile->Close();
 }
 
-void CrewList::backup(wxString path)
+void CrewList::backup( wxString path )
 {
-	wxCopyFile(data_locn,path);
+    wxCopyFile( data_locn,path );
 }
 
-void CrewList::saveODS(wxString path)
+void CrewList::saveODS( wxString path )
 {
-	wxString s = _T("");
-	wxString line;
-	wxString temp;
+    wxString s = _T( "" );
+    wxString line;
+    wxString temp;
 
-	wxFileInputStream input( data_locn );
-	wxTextInputStream* stream = new wxTextInputStream (input);
+    wxFileInputStream input( data_locn );
+    wxTextInputStream* stream = new wxTextInputStream ( input );
 
-	wxFFileOutputStream out(path);
-	wxZipOutputStream zip(out);
-	wxTextOutputStream txt(zip);
-	wxString sep(wxFileName::GetPathSeparator());
+    wxFFileOutputStream out( path );
+    wxZipOutputStream zip( out );
+    wxTextOutputStream txt( zip );
+    wxString sep( wxFileName::GetPathSeparator() );
 
-	temp = dialog->content;
-	temp.Replace(_T("table:number-columns-repeated=\"33\""),_T("table:number-columns-repeated=\"14\""));
-	temp.Replace(_T("Logbook"),_T("CrewList"));
-	zip.PutNextEntry(wxT("content.xml"));
-	txt << temp;
+    temp = dialog->content;
+    temp.Replace( _T( "table:number-columns-repeated=\"33\"" ),_T( "table:number-columns-repeated=\"14\"" ) );
+    temp.Replace( _T( "Logbook" ),_T( "CrewList" ) );
+    zip.PutNextEntry( wxT( "content.xml" ) );
+    txt << temp;
 
-	txt << _T("<table:table-row table:style-name=\"ro2\">");
+    txt << _T( "<table:table-row table:style-name=\"ro2\">" );
 
-	for(int i = 0; i < dialog->m_gridCrew->GetNumberCols(); i++)
-	{
-		txt << _T("<table:table-cell office:value-type=\"string\">");
-		txt << _T("<text:p>");
-		txt << dialog->m_gridCrew->GetColLabelValue(i);
-		txt << _T("</text:p>");
-		txt << _T("</table:table-cell>");
-	}
+    for ( int i = 0; i < dialog->m_gridCrew->GetNumberCols(); i++ )
+    {
+        txt << _T( "<table:table-cell office:value-type=\"string\">" );
+        txt << _T( "<text:p>" );
+        txt << dialog->m_gridCrew->GetColLabelValue( i );
+        txt << _T( "</text:p>" );
+        txt << _T( "</table:table-cell>" );
+    }
 
-	txt << _T("</table:table-row>");
+    txt << _T( "</table:table-row>" );
 
-	long emptyCol = 0;
+    long emptyCol = 0;
 
-       while(input.Eof())
-       {
+    while ( input.Eof() )
+    {
         line = stream->ReadLine();
-		while(true)
-		{
-		wxString line = stream->ReadLine();
-		if(input.Eof()) break;
-		txt << _T("<table:table-row table:style-name=\"ro2\">");
-		wxStringTokenizer tkz(line, _T("\t"),wxTOKEN_RET_EMPTY);
-
-		while ( tkz.HasMoreTokens() )
-		{ 
-			wxString s = dialog->restoreDangerChar(tkz.GetNextToken().RemoveLast());
-			if(s == _T(""))
-			{
-				txt <<  _T("<table:table-cell />");
-				emptyCol++;
-				continue;
-			}
-
-			txt << _T("<table:table-cell office:value-type=\"string\">");
-
-			wxStringTokenizer str(s, _T("\n"));
-			while(str.HasMoreTokens())
-			{
-				wxString e = str.GetNextToken();
-				e.Replace(_T("&"),_T("&amp;"));
-				e.Replace(_T("\""),_T("&quot;"));
-				e.Replace(_T("<"),_T("&lt;"));
-				e.Replace(_T(">"),_T("&gt;"));
-				e.Replace(_T("'"),_T("&apos;"));
-				txt << _T("<text:p>");
-				txt << e;
-				txt << _T("</text:p>");
-			}
-			txt << _T("</table:table-cell>");
-		}
-		txt << _T("</table:table-row>");;
+        while ( true )
+        {
+            wxString line = stream->ReadLine();
+            if ( input.Eof() ) break;
+            txt << _T( "<table:table-row table:style-name=\"ro2\">" );
+            wxStringTokenizer tkz( line, _T( "\t" ),wxTOKEN_RET_EMPTY );
+
+            while ( tkz.HasMoreTokens() )
+            {
+                wxString s = dialog->restoreDangerChar( tkz.GetNextToken().RemoveLast() );
+                if ( s == _T( "" ) )
+                {
+                    txt <<  _T( "<table:table-cell />" );
+                    emptyCol++;
+                    continue;
+                }
+
+                txt << _T( "<table:table-cell office:value-type=\"string\">" );
+
+                wxStringTokenizer str( s, _T( "\n" ) );
+                while ( str.HasMoreTokens() )
+                {
+                    wxString e = str.GetNextToken();
+                    e.Replace( _T( "&" ),_T( "&amp;" ) );
+                    e.Replace( _T( "\"" ),_T( "&quot;" ) );
+                    e.Replace( _T( "<" ),_T( "&lt;" ) );
+                    e.Replace( _T( ">" ),_T( "&gt;" ) );
+                    e.Replace( _T( "'" ),_T( "&apos;" ) );
+                    txt << _T( "<text:p>" );
+                    txt << e;
+                    txt << _T( "</text:p>" );
+                }
+                txt << _T( "</table:table-cell>" );
+            }
+            txt << _T( "</table:table-row>" );;
 
-	}
-	   }
-	txt << dialog->contentEnd;
+        }
+    }
+    txt << dialog->contentEnd;
 
-	zip.PutNextEntry(wxT("mimetype"));
-	txt << wxT("application/vnd.oasis.opendocument.spreadsheet");
+    zip.PutNextEntry( wxT( "mimetype" ) );
+    txt << wxT( "application/vnd.oasis.opendocument.spreadsheet" );
 
-	zip.PutNextEntry(wxT("styles.xml"));
-	txt << dialog->styles;
+    zip.PutNextEntry( wxT( "styles.xml" ) );
+    txt << dialog->styles;
 
-	zip.PutNextEntry(wxT("meta.xml"));
-	txt << dialog->meta;
+    zip.PutNextEntry( wxT( "meta.xml" ) );
+    txt << dialog->meta;
 
-	zip.PutNextEntry(wxT("META-INF") + sep + wxT("manifest.xml"));
-	txt << dialog->manifest;
+    zip.PutNextEntry( wxT( "META-INF" ) + sep + wxT( "manifest.xml" ) );
+    txt << dialog->manifest;
 
-	zip.PutNextEntry(wxT("Thumbnails") + sep);
+    zip.PutNextEntry( wxT( "Thumbnails" ) + sep );
 
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("floater"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("menubar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("popupmenu"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("progressbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("statusbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("toolbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("images") + sep + wxT("Bitmaps"));
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "floater" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "menubar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "popupmenu" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "progressbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "statusbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "toolbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "images" ) + sep + wxT( "Bitmaps" ) );
 
-	zip.Close();
-	out.Close();
+    zip.Close();
+    out.Close();
 }
 
 void LogbookDialog::OnGridBeginDragWatch( wxGridEvent& event )
 {
-	int row = event.GetRow();
-	int col = event.GetCol();
-	((DnDWatch*)m_gridCrewWake->GetGridWindow()->GetDropTarget())->col = col;
+    int row = event.GetRow();
+    int col = event.GetCol();
+    ( ( DnDWatch* )m_gridCrewWake->GetGridWindow()->GetDropTarget() )->col = col;
 
-	if(row != 3) return;
+    if ( row != 3 ) return;
 
-	wxString s= m_gridCrewWake->GetCellValue(row,col);
+    wxString s= m_gridCrewWake->GetCellValue( row,col );
 
-    if (s.IsEmpty()) return;
+    if ( s.IsEmpty() ) return;
 
-    wxTextDataObject txtData(s);
-    wxDropSource src(txtData,m_gridCrewWake);
-	((DnDWatch*)m_gridCrewWake->GetGridWindow()->GetDropTarget())->source = m_gridCrewWake;
-	((DnDCrew*)m_gridCrew->GetGridWindow()->GetDropTarget())->source = m_gridCrewWake;
-    wxDragResult res=src.DoDragDrop(wxDrag_AllowMove);
+    wxTextDataObject txtData( s );
+    wxDropSource src( txtData,m_gridCrewWake );
+    ( ( DnDWatch* )m_gridCrewWake->GetGridWindow()->GetDropTarget() )->source = m_gridCrewWake;
+    ( ( DnDCrew* )m_gridCrew->GetGridWindow()->GetDropTarget() )->source = m_gridCrewWake;
+    wxDragResult res=src.DoDragDrop( wxDrag_AllowMove );
 
-	if(res != wxDragNone && ((DnDWatch*)m_gridCrewWake->GetGridWindow()->GetDropTarget())->col != col) 
-		m_gridCrewWake->SetCellValue(row,col,_T(" "));	
+    if ( res != wxDragNone && ( ( DnDWatch* )m_gridCrewWake->GetGridWindow()->GetDropTarget() )->col != col )
+        m_gridCrewWake->SetCellValue( row,col,_T( " " ) );
 
-	m_gridCrewWake->SetGridCursor(3,((DnDWatch*)m_gridCrewWake->GetGridWindow()->GetDropTarget())->col);
+    m_gridCrewWake->SetGridCursor( 3,( ( DnDWatch* )m_gridCrewWake->GetGridWindow()->GetDropTarget() )->col );
 }
 
 void LogbookDialog::OnGridBeginDragCrew( wxGridEvent& event )
 {
-	wxString s;
-	int row = crewList->selRow;
+    wxString s;
+    int row = crewList->selRow;
 
-	for (int i = 0; i < m_gridCrew->GetNumberCols(); i++)
-		s += m_gridCrew->GetCellValue(row,i)+ _T("#");
-	s.RemoveLast();
-	s.RemoveLast();
-    if (s.IsEmpty()) return;
+    for ( int i = 0; i < m_gridCrew->GetNumberCols(); i++ )
+        s += m_gridCrew->GetCellValue( row,i )+ _T( "#" );
+    s.RemoveLast();
+    s.RemoveLast();
+    if ( s.IsEmpty() ) return;
 
 #ifdef __WXOSX__
-	// OSX needs it or textcttrl is droptarget, too
-	m_textCtrlWatchStartDate->Enable(false);
-	m_textCtrlWatchStartTime->Enable(false);
-	m_textCtrlWakeDay->Enable(false);
-	m_textCtrlWakeTrip->Enable(false);
+    // OSX needs it or textcttrl is droptarget, too
+    m_textCtrlWatchStartDate->Enable( false );
+    m_textCtrlWatchStartTime->Enable( false );
+    m_textCtrlWakeDay->Enable( false );
+    m_textCtrlWakeTrip->Enable( false );
 #endif
-    wxTextDataObject txtData(s);
-    wxDropSource src(txtData,m_gridCrew);
-	((DnDWatch*)m_gridCrewWake->GetGridWindow()->GetDropTarget())->source = m_gridCrew;
-	((DnDCrew*)m_gridCrew->GetGridWindow()->GetDropTarget())->source = m_gridCrew;
-    wxDragResult res=src.DoDragDrop(wxDrag_AllowMove);
-	
-	s = ((DnDCrew*)m_gridCrew->GetGridWindow()->GetDropTarget())->moveStr;
-	if ((res==wxDragMove || res == wxDragCopy) && !s.IsEmpty())
-	{
-		for (int i = 0; i < m_gridCrew->GetNumberCols(); i++)
-			m_gridCrew->SetCellValue(row,i,wxEmptyString);
-		int i = 0;
-		wxStringTokenizer tkz(s,_T("#"));
-		while(tkz.HasMoreTokens())
-			m_gridCrew->SetCellValue(row,i++,tkz.GetNextToken());
-		((DnDCrew*)m_gridCrew->GetGridWindow()->GetDropTarget())->moveStr = wxEmptyString;
-	}
+    wxTextDataObject txtData( s );
+    wxDropSource src( txtData,m_gridCrew );
+    ( ( DnDWatch* )m_gridCrewWake->GetGridWindow()->GetDropTarget() )->source = m_gridCrew;
+    ( ( DnDCrew* )m_gridCrew->GetGridWindow()->GetDropTarget() )->source = m_gridCrew;
+    wxDragResult res=src.DoDragDrop( wxDrag_AllowMove );
+
+    s = ( ( DnDCrew* )m_gridCrew->GetGridWindow()->GetDropTarget() )->moveStr;
+    if ( ( res==wxDragMove || res == wxDragCopy ) && !s.IsEmpty() )
+    {
+        for ( int i = 0; i < m_gridCrew->GetNumberCols(); i++ )
+            m_gridCrew->SetCellValue( row,i,wxEmptyString );
+        int i = 0;
+        wxStringTokenizer tkz( s,_T( "#" ) );
+        while ( tkz.HasMoreTokens() )
+            m_gridCrew->SetCellValue( row,i++,tkz.GetNextToken() );
+        ( ( DnDCrew* )m_gridCrew->GetGridWindow()->GetDropTarget() )->moveStr = wxEmptyString;
+    }
 
-	if(((DnDWatch*)m_gridCrewWake->GetGridWindow()->GetDropTarget())->col != -1)
-		m_gridCrewWake->SetGridCursor(3,((DnDWatch*)m_gridCrewWake->GetGridWindow()->GetDropTarget())->col);
+    if ( ( ( DnDWatch* )m_gridCrewWake->GetGridWindow()->GetDropTarget() )->col != -1 )
+        m_gridCrewWake->SetGridCursor( 3,( ( DnDWatch* )m_gridCrewWake->GetGridWindow()->GetDropTarget() )->col );
 
 #ifdef __WXOSX__
-	// OSX needs it or textcttrl is droptarget, too
-	m_textCtrlWatchStartDate->Enable(true);
-	m_textCtrlWatchStartTime->Enable(true);
-	m_textCtrlWakeDay->Enable(true);
-	m_textCtrlWakeTrip->Enable(true);
+    // OSX needs it or textcttrl is droptarget, too
+    m_textCtrlWatchStartDate->Enable( true );
+    m_textCtrlWatchStartTime->Enable( true );
+    m_textCtrlWakeDay->Enable( true );
+    m_textCtrlWakeTrip->Enable( true );
 #endif
 }
 
-bool DnDWatch::OnDropText(wxCoord x, wxCoord y, const wxString &text)
+bool DnDWatch::OnDropText( wxCoord x, wxCoord y, const wxString &text )
 {
-    if (m_pOwner==NULL) return false;
+    if ( m_pOwner==NULL ) return false;
 
-	int xx,yy;
-	wxString fname,name,oldTxt;
+    int xx,yy;
+    wxString fname,name,oldTxt;
 
-	m_pOwner->CalcUnscrolledPosition(x,y,&xx,&yy);
+    m_pOwner->CalcUnscrolledPosition( x,y,&xx,&yy );
 
-	int col = m_pOwner->XToCol(xx);
-	int row = m_pOwner->YToRow(yy);
+    int col = m_pOwner->XToCol( xx );
+    int row = m_pOwner->YToRow( yy );
 
-	if(this->col == col && source == crewList->gridWake) return false;
-	this->col = col;
-	this->row = row; 
+    if ( this->col == col && source == crewList->gridWake ) return false;
+    this->col = col;
+    this->row = row;
 
-	if(col == wxNOT_FOUND || row == wxNOT_FOUND) return false;
+    if ( col == wxNOT_FOUND || row == wxNOT_FOUND ) return false;
 
-	oldTxt = m_pOwner->GetCellValue(3,col);
-	if(oldTxt.Length() == 1 && oldTxt.GetChar(0) == ' ')
-		oldTxt.RemoveLast();
+    oldTxt = m_pOwner->GetCellValue( 3,col );
+    if ( oldTxt.Length() == 1 && oldTxt.GetChar( 0 ) == ' ' )
+        oldTxt.RemoveLast();
 
-	if(text.Contains(_T("#")))
-	{
-		wxStringTokenizer tkz(text,_T("#"));
-		tkz.GetNextToken(),
-		name = tkz.GetNextToken();
-		tkz.GetNextToken();
-		fname = tkz.GetNextToken();
-
-		if(!oldTxt.IsEmpty())
-			oldTxt += _T("\n");
-
-		int sel = crewList->dialog->m_choiceCrewNames->GetSelection();
-
-		switch(sel)
-		{
-		case 0:
-			if(oldTxt.Contains((fname+_T(" ")+name))) return false;
-			if(!fname.IsEmpty())
-			{
-				m_pOwner->SetCellValue(3,col,oldTxt+fname+_T(" ")+name);
-				crewList->checkMemberIsInMenu(fname+_T(" ")+name);
-			}
-			else
-			{
-				m_pOwner->SetCellValue(3,col,oldTxt+name);
-				crewList->checkMemberIsInMenu(name);
-			}
-			break;
-		case 1:
-			if(oldTxt.Contains(fname)) return false;
-			m_pOwner->SetCellValue(3,col,oldTxt+fname);
-			crewList->checkMemberIsInMenu(oldTxt+fname);
-			break;
-		case 2:
-			if(oldTxt.Contains(name)) return false;
-			m_pOwner->SetCellValue(3,col,oldTxt+name);
-			crewList->checkMemberIsInMenu(oldTxt+name);
-			break;
-		}
-	}
-	else if(text.Contains(_T("\n")))
-	{
-		if(oldTxt.IsEmpty())
-			oldTxt += text;
-		else
-			oldTxt += _T("\n")+text;
+    if ( text.Contains( _T( "#" ) ) )
+    {
+        wxStringTokenizer tkz( text,_T( "#" ) );
+        tkz.GetNextToken(),
+                         name = tkz.GetNextToken();
+        tkz.GetNextToken();
+        fname = tkz.GetNextToken();
 
-		m_pOwner->SetCellValue(3,col,oldTxt);
-		m_pOwner->SetCellValue(3,crewList->selColWake,_T(" "));
+        if ( !oldTxt.IsEmpty() )
+            oldTxt += _T( "\n" );
 
-		if(crewList->day == ActuellWatch::day && crewList->selColWake)
-			ActuellWatch::member =  wxEmptyString;
-	}
-	else
-	{
-		wxString t = text;
-		t.Replace(_T("\n"),_T(" "));
-		if(oldTxt.IsEmpty())
-			oldTxt += t;
-		else
-			oldTxt += _T("\n")+t;
-
-		m_pOwner->SetCellValue(3,col,oldTxt);
-
-		oldTxt = m_pOwner->GetCellValue(3,crewList->selColWake);
-		if(oldTxt.Contains(_T("\n")+text))
-			oldTxt.Replace(_T("\n")+text,_T(""));
-		else if(oldTxt.Contains(text+_T("\n")))
-			oldTxt.Replace(text+_T("\n"),_T(""));
-		else
-			oldTxt.Replace(text,_T(" "));
-
-		m_pOwner->SetCellValue(3,crewList->selColWake,oldTxt);
-
-		if(crewList->day == ActuellWatch::day && ActuellWatch::col != -1)
-		{
-			wxString m = m_pOwner->GetCellValue(3,ActuellWatch::col);
-			ActuellWatch::member =  m;
-		}
-	}
+        int sel = crewList->dialog->m_choiceCrewNames->GetSelection();
+
+        switch ( sel )
+        {
+        case 0:
+            if ( oldTxt.Contains( ( fname+_T( " " )+name ) ) ) return false;
+            if ( !fname.IsEmpty() )
+            {
+                m_pOwner->SetCellValue( 3,col,oldTxt+fname+_T( " " )+name );
+                crewList->checkMemberIsInMenu( fname+_T( " " )+name );
+            }
+            else
+            {
+                m_pOwner->SetCellValue( 3,col,oldTxt+name );
+                crewList->checkMemberIsInMenu( name );
+            }
+            break;
+        case 1:
+            if ( oldTxt.Contains( fname ) ) return false;
+            m_pOwner->SetCellValue( 3,col,oldTxt+fname );
+            crewList->checkMemberIsInMenu( oldTxt+fname );
+            break;
+        case 2:
+            if ( oldTxt.Contains( name ) ) return false;
+            m_pOwner->SetCellValue( 3,col,oldTxt+name );
+            crewList->checkMemberIsInMenu( oldTxt+name );
+            break;
+        }
+    }
+    else if ( text.Contains( _T( "\n" ) ) )
+    {
+        if ( oldTxt.IsEmpty() )
+            oldTxt += text;
+        else
+            oldTxt += _T( "\n" )+text;
+
+        m_pOwner->SetCellValue( 3,col,oldTxt );
+        m_pOwner->SetCellValue( 3,crewList->selColWake,_T( " " ) );
+
+        if ( crewList->day == ActualWatch::day && crewList->selColWake )
+            ActualWatch::member =  wxEmptyString;
+    }
+    else
+    {
+        wxString t = text;
+        t.Replace( _T( "\n" ),_T( " " ) );
+        if ( oldTxt.IsEmpty() )
+            oldTxt += t;
+        else
+            oldTxt += _T( "\n" )+t;
+
+        m_pOwner->SetCellValue( 3,col,oldTxt );
+
+        oldTxt = m_pOwner->GetCellValue( 3,crewList->selColWake );
+        if ( oldTxt.Contains( _T( "\n" )+text ) )
+            oldTxt.Replace( _T( "\n" )+text,_T( "" ) );
+        else if ( oldTxt.Contains( text+_T( "\n" ) ) )
+            oldTxt.Replace( text+_T( "\n" ),_T( "" ) );
+        else
+            oldTxt.Replace( text,_T( " " ) );
+
+        m_pOwner->SetCellValue( 3,crewList->selColWake,oldTxt );
 
-	m_pOwner->AutoSizeRow(3);
-	m_pOwner->AutoSizeColumn(col);
-	m_pOwner->SetRowHeight(	3, m_pOwner->GetRowHeight(3)+10);
-
-	crewList->updateLine();
-	if(ActuellWatch::col == col && ActuellWatch::day == crewList->day)
-		ActuellWatch::member = m_pOwner->GetCellValue(3,col);
-	if(row == 3)
-		crewList->statusText(CrewList::HITCALCULATE);
+        if ( crewList->day == ActualWatch::day && ActualWatch::col != -1 )
+        {
+            wxString m = m_pOwner->GetCellValue( 3,ActualWatch::col );
+            ActualWatch::member =  m;
+        }
+    }
+
+    m_pOwner->AutoSizeRow( 3 );
+    m_pOwner->AutoSizeColumn( col );
+    m_pOwner->SetRowHeight(	3, m_pOwner->GetRowHeight( 3 )+10 );
+
+    crewList->updateLine();
+    if ( ActualWatch::col == col && ActualWatch::day == crewList->day )
+        ActualWatch::member = m_pOwner->GetCellValue( 3,col );
+    if ( row == 3 )
+        crewList->statusText( CrewList::HITCALCULATE );
 
-	m_pOwner->Refresh();
+    m_pOwner->Refresh();
     return true;
 }
 
-wxDragResult DnDWatch::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
+wxDragResult DnDWatch::OnDragOver( wxCoord x, wxCoord y, wxDragResult def )
 {
-	int xx,yy;
-	m_pOwner->CalcUnscrolledPosition(x,y,&xx,&yy);
+    int xx,yy;
+    m_pOwner->CalcUnscrolledPosition( x,y,&xx,&yy );
 
-	int col = m_pOwner->XToCol(xx);
-	int row = m_pOwner->YToRow(yy);
+    int col = m_pOwner->XToCol( xx );
+    int row = m_pOwner->YToRow( yy );
 
-	if (row == wxNOT_FOUND || col == wxNOT_FOUND) return def;
+    if ( row == wxNOT_FOUND || col == wxNOT_FOUND ) return def;
 
-	m_pOwner->SetFocus();
-	m_pOwner->SetGridCursor(3,col);
-	return wxDragCopy;
+    m_pOwner->SetFocus();
+    m_pOwner->SetGridCursor( 3,col );
+    return wxDragCopy;
 }
 
-wxDragResult DnDCrew::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
+wxDragResult DnDCrew::OnDragOver( wxCoord x, wxCoord y, wxDragResult def )
 {
-	int xx,yy;
-	m_pOwner->CalcUnscrolledPosition(x,y,&xx,&yy);
+    int xx,yy;
+    m_pOwner->CalcUnscrolledPosition( x,y,&xx,&yy );
 
-	int col = m_pOwner->XToCol(xx);
-	int row = m_pOwner->YToRow(yy);
+    int col = m_pOwner->XToCol( xx );
+    int row = m_pOwner->YToRow( yy );
 
-	if (row == wxNOT_FOUND || col == wxNOT_FOUND) return def;
-	m_pOwner->SetFocus();
-    m_pOwner->SetGridCursor(row,col);
-	if(m_pOwner == crewList->gridWake)
-		return wxDragCopy;
-	else
-		return def;
+    if ( row == wxNOT_FOUND || col == wxNOT_FOUND ) return def;
+    m_pOwner->SetFocus();
+    m_pOwner->SetGridCursor( row,col );
+    if ( m_pOwner == crewList->gridWake )
+        return wxDragCopy;
+    else
+        return def;
 }
 
-bool DnDCrew::OnDropText(wxCoord x, wxCoord y, const wxString& text)
+bool DnDCrew::OnDropText( wxCoord x, wxCoord y, const wxString& text )
 {
-	this->col = -1;
+    this->col = -1;
+
+    if ( m_pOwner==NULL || source == crewList->gridWake ) return false;
+
+    int xx,yy;
+    m_pOwner->CalcUnscrolledPosition( x,y,&xx,&yy );
 
-	if (m_pOwner==NULL || source == crewList->gridWake) return false;
-	
-	int xx,yy;
-	m_pOwner->CalcUnscrolledPosition(x,y,&xx,&yy);
-	
-	int col = m_pOwner->XToCol(xx);
-    int row = m_pOwner->YToRow(yy);
+    int col = m_pOwner->XToCol( xx );
+    int row = m_pOwner->YToRow( yy );
 
-    if ((row == wxNOT_FOUND)||(col == wxNOT_FOUND)) return false;
-	this->col = col;
+    if ( ( row == wxNOT_FOUND )||( col == wxNOT_FOUND ) ) return false;
+    this->col = col;
 
-	moveStr = wxEmptyString;
-	for (int i = 0; i < m_pOwner->GetNumberCols(); i++)
-		moveStr += m_pOwner->GetCellValue(row,i)+ _T("#");
-	moveStr.RemoveLast();
-	moveStr.RemoveLast();
+    moveStr = wxEmptyString;
+    for ( int i = 0; i < m_pOwner->GetNumberCols(); i++ )
+        moveStr += m_pOwner->GetCellValue( row,i )+ _T( "#" );
+    moveStr.RemoveLast();
+    moveStr.RemoveLast();
 
-	wxStringTokenizer tkz(text,_T("#"));
-	int n = 0;
-	while(tkz.HasMoreTokens())
-		m_pOwner->SetCellValue(row,n++,tkz.GetNextToken());
+    wxStringTokenizer tkz( text,_T( "#" ) );
+    int n = 0;
+    while ( tkz.HasMoreTokens() )
+        m_pOwner->SetCellValue( row,n++,tkz.GetNextToken() );
 
-	m_pOwner->Refresh();
+    m_pOwner->Refresh();
     return true;
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/CrewList.h opencpn-plugin-logbookkonni-1.2024/src/CrewList.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/CrewList.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/CrewList.h	2016-02-25 13:06:29.000000000 +0000
@@ -1,9 +1,9 @@
 #pragma once
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
-#include <wx/textfile.h> 
+#include <wx/textfile.h>
 #include <wx/grid.h>
 #include <wx/object.h>
 #include <wx/arrstr.h>
@@ -11,128 +11,129 @@
 #include <wx/tokenzr.h>
 #include "Options.h"
 
-#define CREWFIELDS 13 
+#define CREWFIELDS 13
 
 class LogbookDialog;
 
-/////////////////////////////// holds actuell Watch ///////////////
-class ActuellWatch
+/////////////////////////////// holds actual Watch ///////////////
+class ActualWatch
 {
 public:
-	static bool          active;
-	static unsigned int  day;
-	static int			 col;
-	static wxTimeSpan	 time;
-	static wxDateTime	 start, end;
-	static wxString		 member; 
-	static wxArrayString menuMembers;
+    static bool          active;
+    static unsigned int  day;
+    static int			 col;
+    static wxTimeSpan	 time;
+    static wxDateTime	 start, end;
+    static wxString		 member;
+    static wxArrayString menuMembers;
 };
 
 class CrewList
 {
 public:
-	enum fields{ONBOARD,NAME,BIRTHNAME,FIRSTNAME,TITLE,BIRTHDATE,BIRTHPLACE,NATIONALITY,
-				PASSPORT,EST_IN,EST_ON,ZIP,COUNTRY,TOWN,STREET};
+    enum fields {ONBOARD,NAME,BIRTHNAME,FIRSTNAME,TITLE,BIRTHDATE,BIRTHPLACE,NATIONALITY,
+                 PASSPORT,EST_IN,EST_ON,ZIP,COUNTRY,TOWN,STREET
+                };
+
+    enum status {DEFAULTWATCH,ALTERWATCH,HITCALCULATE,ALTERDAY};
+
+    CrewList( LogbookDialog* d, wxString data, wxString lay, wxString layoutODT );
+    ~CrewList( void );
+
+    void loadData();
+    void addCrew( wxGrid* grid, wxGrid* wake );
+    void changeCrew( wxGrid* grid, int row, int col, int offset );
+    void changeCrewWake( wxGrid* grid, int row, int col, bool* toggle );
+    void saveCSV( wxString path );
+    void saveHTML( wxString path,wxString layout, bool mode );
+    void saveODT( wxString path,wxString layout, bool mode );
+    void saveXML( wxString path );
+    void saveODS( wxString path );
+    void backup( wxString path );
+    void viewHTML( wxString path,wxString layout );
+    void viewODT( wxString path,wxString layout );
+    void deleteRow( int row );
+    void saveData();
+    void setLayoutLocation( wxString loc );
+    void filterCrewMembers();
+    void showAllCrewMembers();
+    void clearWake();
+    void insertDefaultCols( bool* insertCols );
+    wxString updateWatchTime( unsigned int day, int col, bool* insertCols );
+    void Calculate();
+    void Reset();
+    void readRecord( int nr );
+    void dayPlus();
+    void dayMinus();
+    void dayNow( bool mode );
+    void dateTextCtrlClicked();
+    void timeTextCtrlTextEntered( wxCommandEvent& event );
+    void wakeMemberDrag( int row, int col );
+    void watchEditorCreated( int row, int col );
+    void watchEditorShown( int row, int col );
+    void watchEditorHidden( int row, int col );
+    void watchEditorHighlight( wxMouseEvent& event );
+    void updateLine();
+    void OnGridBeginDragCrew( wxGridEvent& event );
+    void setMembersInMenu();
+    void mergeWatches();
+    void splitWatch();
+    void setAsNewWatchbase();
+    void enterDay();
+    void deleteMembers();
+    void checkMemberIsInMenu( wxString member );
+    void rightClickMenu( int row, int col );
+    int	 getDayOne( int day );
+    void firstColumn();
+    void statusText( int i );
+    void flipWatches();
+
+    LogbookDialog*	dialog;
+    wxGrid*			gridCrew;
+    wxGrid*			gridWake;
+
+    wxString		layout_locn;
+    wxString		layout;
+    wxString		ODTLayout;
+
+    wxString        lastSelectedName;
+    wxString        lastSelectedFirstName;
+    int				selRow,selCol,selRowWake,selColWake;
+    wxString        selstr;
 
-	enum status {DEFAULTWATCH,ALTERWATCH,HITCALCULATE,ALTERDAY};
-
-	CrewList(LogbookDialog* d, wxString data, wxString lay, wxString layoutODT);
-	~CrewList(void);
-
-	void loadData();
-	void addCrew(wxGrid* grid, wxGrid* wake);
-	void changeCrew(wxGrid* grid, int row, int col, int offset);
-	void changeCrewWake(wxGrid* grid, int row, int col, bool* toggle);
-	void saveCSV(wxString path);
-	void saveHTML(wxString path,wxString layout, bool mode);
-	void saveODT(wxString path,wxString layout, bool mode);
-	void saveXML(wxString path);
-	void saveODS(wxString path);
-	void backup(wxString path);
-	void viewHTML(wxString path,wxString layout);
-	void viewODT(wxString path,wxString layout);
-	void deleteRow(int row);
-	void saveData();
-	void setLayoutLocation(wxString loc);
-	void filterCrewMembers();
-	void showAllCrewMembers();
-	void clearWake();
-	void insertDefaultCols(bool* insertCols);
-	wxString updateWatchTime(unsigned int day, int col, bool* insertCols);
-	void Calculate();
-	void Reset();
-	void readRecord(int nr);
-	void dayPlus();
-	void dayMinus();
-	void dayNow(bool mode);
-	void dateTextCtrlClicked();
-	void timeTextCtrlTextEntered(wxCommandEvent& event);
-	void wakeMemberDrag(int row, int col);
-	void watchEditorCreated(int row, int col);
-	void watchEditorShown(int row, int col);
-	void watchEditorHidden(int row, int col);
-	void watchEditorHighlight(wxMouseEvent& event);
-	void updateLine();
-	void OnGridBeginDragCrew( wxGridEvent& event );
-	void setMembersInMenu();
-	void mergeWatches();
-	void splitWatch();
-	void setAsNewWatchbase();
-	void enterDay();
-	void deleteMembers();
-	void checkMemberIsInMenu(wxString member);
-	void rightClickMenu(int row, int col);
-	int	 getDayOne(int day);
-	void firstColumn();
-	void statusText(int i);
-	void flipWatches();
-
-	LogbookDialog*	dialog;
-	wxGrid*			gridCrew;
-	wxGrid*			gridWake;
-
-	wxString		layout_locn;
-	wxString		layout;
-	wxString		ODTLayout;
-
-	wxString        lastSelectedName;
-	wxString        lastSelectedFirstName;
-	int				selRow,selCol,selRowWake,selColWake;
-	wxString        selstr;
-	
-	bool			modified;
-	unsigned int	day;
+    bool			modified;
+    unsigned int	day;
 
 private:
-	wxString	readLayout(wxString layoutFileName);
-	wxString	readLayoutODT(wxString layoutFileName);
-	wxString	replacePlaceholder(wxString html, wxString s, int ngrid, int row, int col, bool mode, wxArrayString watch, int offset);
-	bool		checkHourFormat(wxString s, int row, int col, wxDateTime *dt);
-	void		insertWatchColumn(int col, wxString time, wxDateTime wtime, wxDateTime dt, wxDateTime dtend, bool* insertCols);
-	wxDateTime	stringToDateTime(wxString date, wxString time,bool mode);
-	void		gridWakeInit();
-	void		writeWatchTimeForDay(int i);
-	wxDateTime	getStartTimeWatch(wxString s);
-	wxDateTime	getEndTimeWatch(wxString s);
-	wxDateTime	getAbsEndTimeWatch(wxDateTime);
-	void		getStartEndDate(wxString date, wxDateTime &dtstart, wxDateTime &dtend);
-	wxTimeSpan	createDefaultDateTime(wxDateTime &dt, wxDateTime &dtend, wxDateTime &time);
-	void		setDayButtons(bool shift);
-	wxString	deleteODTCols(wxString odt);
-
-	wxTextFile* crewListFile;
-	wxTextFile* watchListFile;
-	int			linenoStart,linenoEnd;
+    wxString	readLayout( wxString layoutFileName );
+    wxString	readLayoutODT( wxString layoutFileName );
+    wxString	replacePlaceholder( wxString html, wxString s, int ngrid, int row, int col, bool mode, wxArrayString watch, int offset );
+    bool		checkHourFormat( wxString s, int row, int col, wxDateTime *dt );
+    void		insertWatchColumn( int col, wxString time, wxDateTime wtime, wxDateTime dt, wxDateTime dtend, bool* insertCols );
+    wxDateTime	stringToDateTime( wxString date, wxString time,bool mode );
+    void		gridWakeInit();
+    void		writeWatchTimeForDay( int i );
+    wxDateTime	getStartTimeWatch( wxString s );
+    wxDateTime	getEndTimeWatch( wxString s );
+    wxDateTime	getAbsEndTimeWatch( wxDateTime );
+    void		getStartEndDate( wxString date, wxDateTime &dtstart, wxDateTime &dtend );
+    wxTimeSpan	createDefaultDateTime( wxDateTime &dt, wxDateTime &dtend, wxDateTime &time );
+    void		setDayButtons( bool shift );
+    wxString	deleteODTCols( wxString odt );
+
+    wxTextFile* crewListFile;
+    wxTextFile* watchListFile;
+    int			linenoStart,linenoEnd;
 
-	int			rowHeight;
-	wxString	statustext[4];
+    int			rowHeight;
+    wxString	statustext[4];
 
 private:
-	Options*		opt;
+    Options*		opt;
     wxArrayString	crewFields;
-	wxString		data_locn;
-	wxString 		html_locn;
-	wxString		ODT_locn;
+    wxString		data_locn;
+    wxString 		html_locn;
+    wxString		ODT_locn;
 };
 
 
@@ -141,17 +142,22 @@
 class DnDWatch : public wxTextDropTarget
 {
 public:
-    DnDWatch(wxGrid* pOwner, CrewList* pcrewList) { m_pOwner = pOwner; crewList = pcrewList; row = -1, col = -1;}
-	
-    bool OnDropText(wxCoord x, wxCoord y, const wxString &text);
-	wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
+    DnDWatch( wxGrid* pOwner, CrewList* pcrewList )
+    {
+        m_pOwner = pOwner;
+        crewList = pcrewList;
+        row = -1, col = -1;
+    }
+
+    bool OnDropText( wxCoord x, wxCoord y, const wxString &text );
+    wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def );
 
-	wxGrid* source;
-	int		row,col;
+    wxGrid* source;
+    int		row,col;
 
 private:
-	wxGrid*   m_pOwner;
-	CrewList* crewList;
+    wxGrid*   m_pOwner;
+    CrewList* crewList;
 };
 
 /////////// Drag n Drop for Crewlist //////////
@@ -159,43 +165,48 @@
 class DnDCrew : public wxTextDropTarget
 {
 public:
-    DnDCrew(wxGrid* pOwner, CrewList* pcrewList) { m_pOwner = pOwner; crewList = pcrewList;  row = -1, col = -1;}
-
-    bool OnDropText(wxCoord x, wxCoord y, const wxString& text);
-	wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-
-	wxGrid*  source;
-	wxString moveStr;
-	int		 row,col;
+    DnDCrew( wxGrid* pOwner, CrewList* pcrewList )
+    {
+        m_pOwner = pOwner;
+        crewList = pcrewList;
+        row = -1, col = -1;
+    }
+
+    bool OnDropText( wxCoord x, wxCoord y, const wxString& text );
+    wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def );
+
+    wxGrid*  source;
+    wxString moveStr;
+    int		 row,col;
 
 private:
-	wxGrid* m_pOwner;
-	CrewList* crewList;
+    wxGrid* m_pOwner;
+    CrewList* crewList;
 };
 
 ///// Immediate change in Grid when bool value changes //////////
 class myGridCellBoolEditor : public wxGridCellBoolEditor
 {
 public:
-/*	void BeginEdit (int row, int col, wxGrid* grid)
-	{
-		wxGridCellBoolEditor::BeginEdit(row, col, grid);
- 
-		wxFocusEvent event (wxEVT_KILL_FOCUS);
-		if (m_control)
-		{
-			m_control->GetEventHandler()->AddPendingEvent(event);
-		}
-	}
-*/
-	void StartingClick()
-	{		
-		this->CBox()->SetValue(!this->CBox()->GetValue());
-		wxFocusEvent event (wxEVT_KILL_FOCUS);
-		if (m_control)
-		{
-			m_control->GetEventHandler()->AddPendingEvent(event);
-		}
-	}
+    /*	void BeginEdit (int row, int col, wxGrid* grid)
+    	{
+    		wxGridCellBoolEditor::BeginEdit(row, col, grid);
+
+    		wxFocusEvent event (wxEVT_KILL_FOCUS);
+    		if (m_control)
+    		{
+    			m_control->GetEventHandler()->AddPendingEvent(event);
+    		}
+    	}
+    */
+    void StartingClick()
+    {
+        this->CBox()->SetValue( !this->CBox()->GetValue() );
+        wxFocusEvent event ( wxEVT_KILL_FOCUS );
+        if ( m_control )
+        {
+            m_control->GetEventHandler()->AddPendingEvent( event );
+        }
+    }
 };
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Export.cpp opencpn-plugin-logbookkonni-1.2024/src/Export.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/Export.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Export.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -1,240 +1,248 @@
 #ifndef WX_PRECOMP
-      #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 
 #include "Export.h"
 #include "LogbookDialog.h"
 #include "boat.h"
 
-#include <wx/filename.h> 
+#include <wx/filename.h>
 #include <wx/mimetype.h>
-#include <wx/wfstream.h> 
-#include <wx/txtstrm.h> 
-#include <wx/zipstrm.h> 
+#include <wx/wfstream.h>
+#include <wx/txtstrm.h>
+#include <wx/zipstrm.h>
 #include <wx/generic/gridctrl.h>
 
 #include <memory>
 using namespace std;
 
-Export::Export(LogbookDialog *dialog)
+Export::Export( LogbookDialog *dialog )
 {
-	this->dialog = dialog;
+    this->dialog = dialog;
 }
 
-Export::~Export(void)
+Export::~Export( void )
 {
 }
 
-wxString Export::readLayoutODT(wxString path,wxString layout)
+wxString Export::readLayoutODT( wxString path,wxString layout )
 {
-	wxString odt = _T("");
+    wxString odt = _T( "" );
 
-	wxString filename = path + layout + _T(".odt");
+    wxString filename = path + layout + _T( ".odt" );
 
-	if(wxFileExists(filename))
-	{
+    if ( wxFileExists( filename ) )
+    {
 //#ifdef __WXOSX__
         auto_ptr<wxZipEntry> entry;
-        static const wxString fn = _T("content.xml");
-        wxString name = wxZipEntry::GetInternalName(fn);
-        wxFFileInputStream in(filename);
-        wxZipInputStream zip(in);
+        static const wxString fn = _T( "content.xml" );
+        wxString name = wxZipEntry::GetInternalName( fn );
+        wxFFileInputStream in( filename );
+        wxZipInputStream zip( in );
         do
         {
-            entry.reset(zip.GetNextEntry());
+            entry.reset( zip.GetNextEntry() );
         }
-        while (entry.get() != NULL && entry->GetInternalName() != name);
-        if (entry.get() != NULL)
+        while ( entry.get() != NULL && entry->GetInternalName() != name );
+        if ( entry.get() != NULL )
         {
-            wxTextInputStream txt(zip,_T("\n"),wxConvUTF8);
-            while(!zip.Eof())
-	            odt += txt.ReadLine();
+            wxTextInputStream txt( zip,_T( "\n" ),wxConvUTF8 );
+            while ( !zip.Eof() )
+                odt += txt.ReadLine();
         }
 //#else
-	/*	static const wxString fn = _T("content.xml");
-		wxFileInputStream in(filename);
-		wxZipInputStream zip(in);
-		wxTextInputStream txt(zip);
-		while(!zip.Eof())
-			odt += txt.ReadLine();*/
+        /*	static const wxString fn = _T("content.xml");
+        	wxFileInputStream in(filename);
+        	wxZipInputStream zip(in);
+        	wxTextInputStream txt(zip);
+        	while(!zip.Eof())
+        		odt += txt.ReadLine();*/
 //#endif
-	}
-	return odt;
+    }
+    return odt;
 }
 
-bool Export::cutInPartsODT(wxString odt, wxString* top, wxString* header, 
-						wxString* middle, wxString* bottom)
+bool Export::cutInPartsODT( wxString odt, wxString* top, wxString* header,
+                            wxString* middle, wxString* bottom )
 {
-	int indexTop;
-	int indexBottom;
-	wxString seperatorTop        = wxT("[[");
-	wxString seperatorBottom     = wxT("]]");
+    int indexTop;
+    int indexBottom;
+    wxString seperatorTop        = wxT( "[[" );
+    wxString seperatorBottom     = wxT( "]]" );
 
-	if(odt.Contains(seperatorTop))
-	{
-		indexTop    = odt.Find(seperatorTop);
-		indexBottom = odt.Find(seperatorBottom);
-		*top				= odt.substr(0,indexTop);
-		*top				= (*top).substr(0,(*top).find_last_of('<'));
-		*bottom			= odt.substr(indexBottom+1);
-		*bottom			= (*bottom).substr((*bottom).find_first_of('>')+1);
-		*middle			= odt.substr(indexTop+11);
-		*middle			= (*middle).substr(0,(*middle).Find(seperatorBottom));
-		*middle			= (*middle).substr(0,(*middle).find_last_of('<'));
-		return _T("OK");
-	}
-	else
-		return _T("");
+    if ( odt.Contains( seperatorTop ) )
+    {
+        indexTop    = odt.Find( seperatorTop );
+        indexBottom = odt.Find( seperatorBottom );
+        *top				= odt.substr( 0,indexTop );
+        *top				= ( *top ).substr( 0,( *top ).find_last_of( '<' ) );
+        *bottom			= odt.substr( indexBottom+1 );
+        *bottom			= ( *bottom ).substr( ( *bottom ).find_first_of( '>' )+1 );
+        *middle			= odt.substr( indexTop+11 );
+        *middle			= ( *middle ).substr( 0,( *middle ).Find( seperatorBottom ) );
+        *middle			= ( *middle ).substr( 0,( *middle ).find_last_of( '<' ) );
+        return _T( "OK" );
+    }
+    else
+        return _T( "" );
 
 }
 
-bool Export::writeToHTML(wxTextFile* logFile, wxGrid* grid, wxString filenameOut,wxString filenameIn, 
-		wxString top,wxString header,wxString middle,wxString bottom, int mode)
+bool Export::writeToHTML( wxTextFile* logFile, wxGrid* grid, wxString filenameOut,wxString filenameIn,
+                          wxString top,wxString header,wxString middle,wxString bottom, int mode )
 {
-	wxFileInputStream input( filenameIn );
-	
-	wxFileOutputStream output( filenameOut);
-	wxTextOutputStream htmlFile(output);
+    wxFileInputStream input( filenameIn );
 
-	top.Replace(wxT("#TYPE#"),dialog->boatType->GetValue());
-	top.Replace(wxT("#BOATNAME#"),dialog->boatName->GetValue());
-	top.Replace(wxT("#HOMEPORT#"),dialog->homeport->GetValue());
-	top.Replace(wxT("#CALLSIGN#"),dialog->callsign->GetValue());
-	top.Replace(wxT("#REGISTRATION#"),dialog->registration->GetValue());
+    wxFileOutputStream output( filenameOut );
+    wxTextOutputStream htmlFile( output );
 
-	htmlFile << top;
+    top.Replace( wxT( "#TYPE#" ),dialog->boatType->GetValue() );
+    top.Replace( wxT( "#BOATNAME#" ),dialog->boatName->GetValue() );
+    top.Replace( wxT( "#HOMEPORT#" ),dialog->homeport->GetValue() );
+    top.Replace( wxT( "#CALLSIGN#" ),dialog->callsign->GetValue() );
+    top.Replace( wxT( "#REGISTRATION#" ),dialog->registration->GetValue() );
 
-	wxString newMiddle = middle;
-	for(int row = 0; row < grid->GetNumberRows(); row++)
-		{
-		  newMiddle = setPlaceHolders(mode,grid, row, middle);
-		  htmlFile << newMiddle;
-		}
-	
-	htmlFile << bottom;
+    htmlFile << top;
 
-	output.Close();
-	return true;
+    wxString newMiddle = middle;
+    for ( int row = 0; row < grid->GetNumberRows(); row++ )
+    {
+        newMiddle = setPlaceHolders( mode,grid, row, middle );
+        htmlFile << newMiddle;
+    }
+
+    htmlFile << bottom;
+
+    output.Close();
+    return true;
 }
 
-wxString Export::readLayoutHTML(wxString path,wxString layoutFileName)
+wxString Export::readLayoutHTML( wxString path,wxString layoutFileName )
 {
-	wxString html, path1;
+    wxString html, path1;
 
-	path1 = path + layoutFileName + wxT(".html");;
-	wxTextFile layout(path1);
-	
-	layout.Open();
+    path1 = path + layoutFileName + wxT( ".html" );;
+    wxTextFile layout( path1 );
 
-	for(unsigned int i = 0; i < layout.GetLineCount(); i++)
-	{
-		html += layout.GetLine(i)+_T("\n");
-	}
+    layout.Open();
 
-	layout.Close();
+    for ( unsigned int i = 0; i < layout.GetLineCount(); i++ )
+    {
+        html += layout.GetLine( i )+_T( "\n" );
+    }
 
-	return html;
+    layout.Close();
+
+    return html;
 }
 
-bool Export::cutInPartsHTML(wxString html, wxString* top, wxString* header, wxString* middle, wxString* bottom)
+bool Export::cutInPartsHTML( wxString html, wxString* top, wxString* header, wxString* middle, wxString* bottom )
 {
-	wxString seperatorTop = _T("<!-- Repeat -->");
-	wxString seperatorBottom = _T("<!-- Repeat End -->");
+    wxString seperatorTop = _T( "<!-- Repeat -->" );
+    wxString seperatorBottom = _T( "<!-- Repeat End -->" );
 
-	int indexTop = html.Find(seperatorTop);
-	indexTop += seperatorTop.Len();
-	int indexBottom = html.Find(seperatorBottom);
-	indexBottom += seperatorBottom.Len();
+    int indexTop = html.Find( seperatorTop );
+    indexTop += seperatorTop.Len();
+    int indexBottom = html.Find( seperatorBottom );
+    indexBottom += seperatorBottom.Len();
 
-	*top = html.substr(0,indexTop);
-	*bottom = html.substr(indexBottom);
-	*middle = html.substr(indexTop,(indexBottom-indexTop)-seperatorBottom.Len());
+    *top = html.substr( 0,indexTop );
+    *bottom = html.substr( indexBottom );
+    *middle = html.substr( indexTop,( indexBottom-indexTop )-seperatorBottom.Len() );
 
-	return true;
+    return true;
 }
 
-wxTextFile* Export::setFiles(wxString savePath, wxString *path, int mode)
+wxTextFile* Export::setFiles( wxString savePath, wxString *path, int mode )
 {
-	if(mode == 0 )
-	{	(*path).Replace(wxT("txt"),wxT("html")); }
-	else if(mode == 1)
-	{	(*path).Replace(wxT("txt"),wxT("odt")); }
-	else 
-	{	(*path) = savePath; }
+    if ( mode == 0 )
+    {
+        ( *path ).Replace( wxT( "txt" ),wxT( "html" ) );
+    }
+    else if ( mode == 1 )
+    {
+        ( *path ).Replace( wxT( "txt" ),wxT( "odt" ) );
+    }
+    else
+    {
+        ( *path ) = savePath;
+    }
 
-	if(::wxFileExists(*path))
-		::wxRemoveFile(*path);
+    if ( ::wxFileExists( *path ) )
+        ::wxRemoveFile( *path );
 
-	wxTextFile *logFile = new wxTextFile(*path);
-	return logFile;
+    wxTextFile *logFile = new wxTextFile( *path );
+    return logFile;
 }
 
-bool Export::writeToODT(wxTextFile* logFile,wxGrid* grid, wxString filenameOut,wxString filenameIn, wxString top,wxString header,
-				wxString middle,wxString bottom, int mode)
+bool Export::writeToODT( wxTextFile* logFile,wxGrid* grid, wxString filenameOut,wxString filenameIn, wxString top,wxString header,
+                         wxString middle,wxString bottom, int mode )
 {
-	auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(filenameIn));
-    wxTempFileOutputStream out(filenameOut);
+    auto_ptr<wxFFileInputStream> in( new wxFFileInputStream( filenameIn ) );
+    wxTempFileOutputStream out( filenameOut );
 
-    wxZipInputStream inzip(*in);
-    wxZipOutputStream outzip(out);
-    wxTextOutputStream odtFile(outzip);
+    wxZipInputStream inzip( *in );
+    wxZipOutputStream outzip( out );
+    wxTextOutputStream odtFile( outzip );
     auto_ptr<wxZipEntry> entry;
 
-    outzip.CopyArchiveMetaData(inzip);
+    outzip.CopyArchiveMetaData( inzip );
 
-    while (entry.reset(inzip.GetNextEntry()), entry.get() != NULL)
-        if (!entry->GetName().Matches(_T("content.xml")))
-            if (!outzip.CopyEntry(entry.release(), inzip))
+    while ( entry.reset( inzip.GetNextEntry() ), entry.get() != NULL )
+        if ( !entry->GetName().Matches( _T( "content.xml" ) ) )
+            if ( !outzip.CopyEntry( entry.release(), inzip ) )
                 break;
 
     in.reset();
 
-    outzip.PutNextEntry(_T("content.xml"));
+    outzip.PutNextEntry( _T( "content.xml" ) );
 
     odtFile << top;
 
-	wxString newMiddle;
-	for(int row = 0; row < grid->GetNumberRows(); row++)
-		{
-		  newMiddle = setPlaceHolders(mode,grid, row, middle);
-		  odtFile << newMiddle;
-		}
+    wxString newMiddle;
+    for ( int row = 0; row < grid->GetNumberRows(); row++ )
+    {
+        newMiddle = setPlaceHolders( mode,grid, row, middle );
+        odtFile << newMiddle;
+    }
 
-	odtFile << bottom;
+    odtFile << bottom;
 
-	inzip.Eof() && outzip.Close() && out.Commit();
-	logFile->Close();
+    inzip.Eof() && outzip.Close() && out.Commit();
+    logFile->Close();
 
-	return true;
+    return true;
 }
 
 
-wxString Export::replaceNewLine(int mode, wxString str, bool label)
+wxString Export::replaceNewLine( int mode, wxString str, bool label )
 {
-	str.Replace(wxT("&"),wxT("&amp;"));
-	str.Replace(wxT("<"),wxT("&lt;"));
-	str.Replace(wxT(">"),wxT("&gt;"));
-	str.Replace(wxT("'"),wxT("&apos;"));
-	str.Replace(wxT("\""),wxT("&quot;"));
+    str.Replace( wxT( "&" ),wxT( "&amp;" ) );
+    str.Replace( wxT( "<" ),wxT( "&lt;" ) );
+    str.Replace( wxT( ">" ),wxT( "&gt;" ) );
+    str.Replace( wxT( "'" ),wxT( "&apos;" ) );
+    str.Replace( wxT( "\"" ),wxT( "&quot;" ) );
 //	str.Replace(wxT("�"),wxT("&deg;"));
 
-	if(mode == 0)
-		{// HTML
-		  str.Replace(wxT("\n"),wxT("<br>"));
-		} 
-	else
-		{// ODT
-		  if(!label)
-		  {
-		  str.Replace(wxT("\n"),wxT("<text:line-break/>"));
-		  str.Replace(wxT("\xD\xA"),wxT("<text:line-break/>"));
-		  }
-		  else
-		  {
-		  str.Replace(wxT("\n"),wxT(" "));
-		  str.Replace(wxT("\xD\xA"),wxT(" "));
-		  }
-		}
+    if ( mode == 0 )
+    {
+        // HTML
+        str.Replace( wxT( "\n" ),wxT( "<br>" ) );
+    }
+    else
+    {
+        // ODT
+        if ( !label )
+        {
+            str.Replace( wxT( "\n" ),wxT( "<text:line-break/>" ) );
+            str.Replace( wxT( "\xD\xA" ),wxT( "<text:line-break/>" ) );
+        }
+        else
+        {
+            str.Replace( wxT( "\n" ),wxT( " " ) );
+            str.Replace( wxT( "\xD\xA" ),wxT( " " ) );
+        }
+    }
 
-	return str;
+    return str;
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Export.h opencpn-plugin-logbookkonni-1.2024/src/Export.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/Export.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Export.h	2016-02-25 13:06:29.000000000 +0000
@@ -3,7 +3,7 @@
 #define _EXPORT_H_
 
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
 #include <wx/textfile.h>
@@ -15,26 +15,29 @@
 class Export
 {
 public:
-	Export(LogbookDialog *dialog);
-	~Export(void);
+    Export( LogbookDialog *dialog );
+    ~Export( void );
 
-	wxString readLayoutODT(wxString path,wxString layout);
-	wxString readLayoutHTML(wxString path,wxString layoutFileName);
+    wxString readLayoutODT( wxString path,wxString layout );
+    wxString readLayoutHTML( wxString path,wxString layoutFileName );
 
-	bool cutInPartsODT(wxString odt, wxString* top, wxString* header, wxString* middle, wxString* bottom);
-	bool cutInPartsHTML(wxString html, wxString* top, wxString* header, wxString* middle, wxString* bottom);
+    bool cutInPartsODT( wxString odt, wxString* top, wxString* header, wxString* middle, wxString* bottom );
+    bool cutInPartsHTML( wxString html, wxString* top, wxString* header, wxString* middle, wxString* bottom );
 
-	bool writeToODT(wxTextFile* logFile, wxGrid* grid, wxString filenameOut,wxString filenameIn, 
-		wxString top,wxString header,wxString middle,wxString bottom, int mode);
-	bool writeToHTML(wxTextFile* logFile, wxGrid* grid, wxString filenameOut,wxString filenameIn, 
-		wxString top,wxString header,wxString middle,wxString bottom, int mode);
-
-	wxTextFile* setFiles(wxString savePath, wxString* path, int mode);
-	virtual wxString setPlaceHolders(int mode, wxGrid *grid, int row, wxString middle){ return _T("");}
-	static wxString replaceNewLine(int mode, wxString str, bool label);
+    bool writeToODT( wxTextFile* logFile, wxGrid* grid, wxString filenameOut,wxString filenameIn,
+                     wxString top,wxString header,wxString middle,wxString bottom, int mode );
+    bool writeToHTML( wxTextFile* logFile, wxGrid* grid, wxString filenameOut,wxString filenameIn,
+                      wxString top,wxString header,wxString middle,wxString bottom, int mode );
+
+    wxTextFile* setFiles( wxString savePath, wxString* path, int mode );
+    virtual wxString setPlaceHolders( int mode, wxGrid *grid, int row, wxString middle )
+    {
+        return _T( "" );
+    }
+    static wxString replaceNewLine( int mode, wxString str, bool label );
 
 private:
-	LogbookDialog* dialog;
+    LogbookDialog* dialog;
 
 };
 #endif
\ No newline at end of file
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/EzGrid.cpp opencpn-plugin-logbookkonni-1.2024/src/EzGrid.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/EzGrid.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/EzGrid.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -1,35 +1,35 @@
 #ifndef WX_PRECOMP
-      #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 #include "EzGrid.h"
 #include "FastComboEditor.h"
 #include <wx/config.h>
 
 
-BEGIN_EVENT_TABLE(EzGrid, wxGrid)
-	EVT_GRID_CELL_LEFT_CLICK(EzGrid::OnCellLeftClick )
+BEGIN_EVENT_TABLE( EzGrid, wxGrid )
+    EVT_GRID_CELL_LEFT_CLICK( EzGrid::OnCellLeftClick )
 #ifdef __WXGTK__
-    EVT_MOUSEWHEEL(EzGrid::OnMouseWheel)
+    EVT_MOUSEWHEEL( EzGrid::OnMouseWheel )
 #endif
 END_EVENT_TABLE()
 
 
-EzGrid::EzGrid(wxWindow *parent,
-	wxWindowID id,	const wxPoint& pos,
-	const wxSize& size, long style,
-	const wxString& name) : wxGrid(parent, id, pos, size, style, name),
-	m_selTemp(NULL)
-{
-	// Adjust the default row height to be more compact
-	wxFont font = GetLabelFont();
-	int nWidth = 0;
-	int nHeight = 18;
-	GetTextExtent(_T("W"), &nWidth, &nHeight, NULL, NULL, &font);
-	SetColLabelSize(nHeight+6);
+EzGrid::EzGrid( wxWindow *parent,
+                wxWindowID id,	const wxPoint& pos,
+                const wxSize& size, long style,
+                const wxString& name ) : wxGrid( parent, id, pos, size, style, name ),
+    m_selTemp( NULL )
+{
+    // Adjust the default row height to be more compact
+    wxFont font = GetLabelFont();
+    int nWidth = 0;
+    int nHeight = 18;
+    GetTextExtent( _T( "W" ), &nWidth, &nHeight, NULL, NULL, &font );
+    SetColLabelSize( nHeight+6 );
 #ifdef __WXPOSIX__
-	SetDefaultRowSize(nHeight+8, TRUE);
+    SetDefaultRowSize( nHeight+8, TRUE );
 #else
-	SetDefaultRowSize(nHeight+4, TRUE);
+    SetDefaultRowSize( nHeight+4, TRUE );
 #endif
 }
 
@@ -39,30 +39,30 @@
 
 #include <wx/window.h>
 #include <typeinfo>
-void EzGrid::OnCellLeftClick(wxGridEvent& ev)
+void EzGrid::OnCellLeftClick( wxGridEvent& ev )
 {
 
-	// Store the click co-ordinates in the editor if possible
-	// if an editor has created a ClientData area, we presume it's
-	// a wxPoint and we store the click co-ordinates
-	wxGridCellEditor* pEditor  = GetCellEditor(ev.GetRow(), ev.GetCol());
-	wxFastComboEditor* ed = NULL;
-	ed = dynamic_cast<wxFastComboEditor*>(pEditor);
-
-	if (ed) 
-	{
-		m_waitForSlowClick = TRUE;
-		SetGridCursor(ev.GetRow(), ev.GetCol());
-		wxPoint* pClickPoint = (wxPoint*)pEditor->GetClientData();
-		if (pClickPoint)
-		{
-			*pClickPoint = ClientToScreen(ev.GetPosition());
+    // Store the click co-ordinates in the editor if possible
+    // if an editor has created a ClientData area, we presume it's
+    // a wxPoint and we store the click co-ordinates
+    wxGridCellEditor* pEditor  = GetCellEditor( ev.GetRow(), ev.GetCol() );
+    wxFastComboEditor* ed = NULL;
+    ed = dynamic_cast<wxFastComboEditor*>( pEditor );
+
+    if ( ed )
+    {
+        m_waitForSlowClick = TRUE;
+        SetGridCursor( ev.GetRow(), ev.GetCol() );
+        wxPoint* pClickPoint = ( wxPoint* )pEditor->GetClientData();
+        if ( pClickPoint )
+        {
+            *pClickPoint = ClientToScreen( ev.GetPosition() );
 #ifndef __WXMSW__
-			EnableCellEditControl(true);
+            EnableCellEditControl( true );
 #endif
-		}
-	}
-	ev.Skip();
+        }
+    }
+    ev.Skip();
 }
 
 #ifdef __WXGTK__
@@ -70,11 +70,11 @@
 {
     int nWheelRotation = event.GetWheelRotation();
 //    int lines = nWheelRotation / event.GetWheelDelta();
-	int x, y;
-	GetViewStart(&x, &y);
-	if (nWheelRotation < 0) y+=5;
-	else y -= 5;
-	Scroll(x, y);
+    int x, y;
+    GetViewStart( &x, &y );
+    if ( nWheelRotation < 0 ) y+=5;
+    else y -= 5;
+    Scroll( x, y );
 }
 #endif
 
@@ -84,31 +84,31 @@
 
 wxSize EzGrid::DoGetBestSize() const
 {
-	return wxSize(100, 80);
+    return wxSize( 100, 80 );
 }
 
-void EzGrid::SetNumberRows(int nRows)
+void EzGrid::SetNumberRows( int nRows )
 {
-	if (GetRows() > 0) DeleteRows(0, GetRows());
-	if (nRows > 0) AppendRows(nRows);
+    if ( GetRows() > 0 ) DeleteRows( 0, GetRows() );
+    if ( nRows > 0 ) AppendRows( nRows );
 }
 
 void EzGrid::RecalcRowLabel()
 {
-	wxFont font = GetLabelFont();
-	int nWidth = 0;
-	int nHeight = 0;
-	GetTextExtent(wxString::Format(_T("%d"), GetRows()),
-								&nWidth, &nHeight, NULL, NULL, &font);
-	if (nWidth < 12) nWidth = 12;
-	SetRowLabelSize(nWidth+6);
+    wxFont font = GetLabelFont();
+    int nWidth = 0;
+    int nHeight = 0;
+    GetTextExtent( wxString::Format( _T( "%d" ), GetRows() ),
+                   &nWidth, &nHeight, NULL, NULL, &font );
+    if ( nWidth < 12 ) nWidth = 12;
+    SetRowLabelSize( nWidth+6 );
 }
 
 
 void EzGrid::UpdateNumRows()
 {
-	m_numRows = m_table->GetNumberRows();
-	m_numCols = m_table->GetNumberCols();
+    m_numRows = m_table->GetNumberRows();
+    m_numCols = m_table->GetNumberCols();
 }
 
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/EzGrid.h opencpn-plugin-logbookkonni-1.2024/src/EzGrid.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/EzGrid.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/EzGrid.h	2016-02-25 13:06:29.000000000 +0000
@@ -8,33 +8,33 @@
 class EzGrid : public wxGrid
 {
 public:
-	EzGrid(wxWindow *parent,
-		wxWindowID id,	const wxPoint& pos = wxDefaultPosition,
-		const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS,
-		const wxString& name = wxPanelNameStr);
-	~EzGrid();
-	void PreviousState();
-	void SetNumberRows(int nRows);
-	void RecalcRowLabel();
-	void UpdateNumRows();
-	void ClearSelection();
-	void RevertSel()
-	{
-		if (m_selTemp) 
-		{
-			wxASSERT(m_selection == NULL);
-			m_selection = m_selTemp;
-			m_selTemp = NULL;
-		}
-	}
+    EzGrid( wxWindow *parent,
+            wxWindowID id,	const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS,
+            const wxString& name = wxPanelNameStr );
+    ~EzGrid();
+    void PreviousState();
+    void SetNumberRows( int nRows );
+    void RecalcRowLabel();
+    void UpdateNumRows();
+    void ClearSelection();
+    void RevertSel()
+    {
+        if ( m_selTemp )
+        {
+            wxASSERT( m_selection == NULL );
+            m_selection = m_selTemp;
+            m_selTemp = NULL;
+        }
+    }
 protected:
-	wxSize DoGetBestSize() const;
-	DECLARE_EVENT_TABLE()
-	void OnCellLeftClick(wxGridEvent& event);
+    wxSize DoGetBestSize() const;
+    DECLARE_EVENT_TABLE()
+    void OnCellLeftClick( wxGridEvent& event );
 #ifdef __WXGTK__
     void OnMouseWheel( wxMouseEvent& event );
 #endif
-	wxGridSelection *m_selTemp;
+    wxGridSelection *m_selTemp;
 };
 
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/FastComboEditor.cpp opencpn-plugin-logbookkonni-1.2024/src/FastComboEditor.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/FastComboEditor.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/FastComboEditor.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -1,5 +1,5 @@
 #ifndef WX_PRECOMP
-      #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 #include "FastComboEditor.h"
 #ifdef __WXGTK__
@@ -8,201 +8,201 @@
 #include <wx/tokenzr.h>
 #include "EzGrid.h"
 
-wxSComboBox::wxSComboBox(wxWindow *parent, wxWindowID id,
-		const wxString& value,
-		const wxPoint& pos,
-		const wxSize& size,
-		int n, const wxString choices[],
-		long style,
-		const wxValidator& validator,
-		const wxString& name)
+wxSComboBox::wxSComboBox( wxWindow *parent, wxWindowID id,
+                          const wxString& value,
+                          const wxPoint& pos,
+                          const wxSize& size,
+                          int n, const wxString choices[],
+                          long style,
+                          const wxValidator& validator,
+                          const wxString& name )
 {
-	Create(parent, id, value, pos, size, n, choices, style, validator, name);
+    Create( parent, id, value, pos, size, n, choices, style, validator, name );
 }
 
-wxSComboBox::wxSComboBox() : m_pGrid(NULL)
-{ 
+wxSComboBox::wxSComboBox() : m_pGrid( NULL )
+{
 }
 
-BEGIN_EVENT_TABLE(wxSComboBox, wxComboBox)
-   EVT_COMBOBOX(-1, wxSComboBox::OnChange)
+BEGIN_EVENT_TABLE( wxSComboBox, wxComboBox )
+    EVT_COMBOBOX( -1, wxSComboBox::OnChange )
 END_EVENT_TABLE()
 
-void wxSComboBox::OnChange(wxCommandEvent& event)
+void wxSComboBox::OnChange( wxCommandEvent& event )
 {
-	if (m_pGrid) 
-	{
+    if ( m_pGrid )
+    {
 //		m_pGrid->GetTable()->SetValue(m_nRow, m_nCol, event.GetString());
-		m_pGrid->SetCellValue(m_nRow, m_nCol, event.GetString());
+        m_pGrid->SetCellValue( m_nRow, m_nCol, event.GetString() );
 
-		wxGridEvent gridEvt(m_pGrid->GetId(),
-			wxEVT_GRID_CELL_CHANGE, m_pGrid, m_nRow, m_nCol);
-		gridEvt.SetString(event.GetString());
-		GetEventHandler()->ProcessEvent(gridEvt);
-	}
-	event.Skip();
-}
-
-wxFastComboEditor::wxFastComboEditor(size_t count,
-											   const wxString choices[],
-											   bool allowOthers)
-					  : m_allowOthers(allowOthers)
-{
-	SetClientData((void*)&m_pointActivate);
-	if ( count )
-	{
-		m_choices.Alloc(count);
-		for (size_t n = 0; n < count; n++ )
-		{
-			m_choices.Add(choices[n]);
-		}
-	}
+        wxGridEvent gridEvt( m_pGrid->GetId(),
+                             wxEVT_GRID_CELL_CHANGE, m_pGrid, m_nRow, m_nCol );
+        gridEvt.SetString( event.GetString() );
+        GetEventHandler()->ProcessEvent( gridEvt );
+    }
+    event.Skip();
+}
+
+wxFastComboEditor::wxFastComboEditor( size_t count,
+                                      const wxString choices[],
+                                      bool allowOthers )
+    : m_allowOthers( allowOthers )
+{
+    SetClientData( ( void* )&m_pointActivate );
+    if ( count )
+    {
+        m_choices.Alloc( count );
+        for ( size_t n = 0; n < count; n++ )
+        {
+            m_choices.Add( choices[n] );
+        }
+    }
 }
 
 wxString wxFastComboEditor::GetValue() const
 {
-    return Combo()->GetValue();   
+    return Combo()->GetValue();
 }
 
 wxGridCellEditor *wxFastComboEditor::Clone() const
 {
-	wxFastComboEditor *editor = new wxFastComboEditor;
-	editor->m_allowOthers = m_allowOthers;
-	editor->m_choices = m_choices;
-	return editor;
-}
-
-void wxFastComboEditor::Create(wxWindow* parent,
-									wxWindowID id,
-									wxEvtHandler* evtHandler)
-{
-	size_t count = m_choices.GetCount();
-	wxString *choices = new wxString[count];
-	for ( size_t n = 0; n < count; n++ )
-	{
-	  choices[n] = m_choices[n];
-	}
-	m_control = new wxSComboBox(parent, id, wxEmptyString,
-									 wxDefaultPosition, wxDefaultSize,
-									 count, choices,
-									 m_allowOthers ? 0 : wxCB_READONLY);
-	delete [] choices;
-	wxGridCellEditor::Create(parent, id, evtHandler);
-}
-
-void wxFastComboEditor::PaintBackground(const wxRect& rectCell,
-											 wxGridCellAttr * attr)
-{
-	wxGridCellEditor::PaintBackground(rectCell, attr);
-}
-
-void wxFastComboEditor::BeginEdit(int row, int col, wxGrid* grid)
-{
-	wxASSERT_MSG(m_control,
-				 wxT("The wxGridCellEditor must be Created first!"));
-
-	EzGrid* pEzGrid = (EzGrid*)grid;
-	pEzGrid->RevertSel();
-
-	m_startValue = grid->GetCellValue(row, col);
-
-	if (m_allowOthers)
-		Combo()->SetValue(m_startValue);
-	else
-	{
-		// find the right position, or default to the first if not found
-		int pos = Combo()->FindString(m_startValue);
-		if (pos == -1)
-			pos = 0;
-		Combo()->SetSelection(pos);
-	}
-	Combo()->SetInsertionPointEnd();
-	Combo()->SetFocus();
-	Combo()->SetCellData(row, col, grid);
-	if (m_pointActivate.x > -1 && m_pointActivate.y > -1)
-	{
-		m_pointActivate = Combo()->ScreenToClient(m_pointActivate);
+    wxFastComboEditor *editor = new wxFastComboEditor;
+    editor->m_allowOthers = m_allowOthers;
+    editor->m_choices = m_choices;
+    return editor;
+}
+
+void wxFastComboEditor::Create( wxWindow* parent,
+                                wxWindowID id,
+                                wxEvtHandler* evtHandler )
+{
+    size_t count = m_choices.GetCount();
+    wxString *choices = new wxString[count];
+    for ( size_t n = 0; n < count; n++ )
+    {
+        choices[n] = m_choices[n];
+    }
+    m_control = new wxSComboBox( parent, id, wxEmptyString,
+                                 wxDefaultPosition, wxDefaultSize,
+                                 count, choices,
+                                 m_allowOthers ? 0 : wxCB_READONLY );
+    delete [] choices;
+    wxGridCellEditor::Create( parent, id, evtHandler );
+}
+
+void wxFastComboEditor::PaintBackground( const wxRect& rectCell,
+        wxGridCellAttr * attr )
+{
+    wxGridCellEditor::PaintBackground( rectCell, attr );
+}
+
+void wxFastComboEditor::BeginEdit( int row, int col, wxGrid* grid )
+{
+    wxASSERT_MSG( m_control,
+                  wxT( "The wxGridCellEditor must be Created first!" ) );
+
+    EzGrid* pEzGrid = ( EzGrid* )grid;
+    pEzGrid->RevertSel();
+
+    m_startValue = grid->GetCellValue( row, col );
+
+    if ( m_allowOthers )
+        Combo()->SetValue( m_startValue );
+    else
+    {
+        // find the right position, or default to the first if not found
+        int pos = Combo()->FindString( m_startValue );
+        if ( pos == -1 )
+            pos = 0;
+        Combo()->SetSelection( pos );
+    }
+    Combo()->SetInsertionPointEnd();
+    Combo()->SetFocus();
+    Combo()->SetCellData( row, col, grid );
+    if ( m_pointActivate.x > -1 && m_pointActivate.y > -1 )
+    {
+        m_pointActivate = Combo()->ScreenToClient( m_pointActivate );
 #ifdef __WXMSW__
-		SendMessage((HWND)Combo()->GetHandle(), WM_LBUTTONDOWN, 0,
-			MAKELPARAM(m_pointActivate.x, m_pointActivate.y));
-		SendMessage((HWND)Combo()->GetHandle(), WM_LBUTTONUP, 0,
-			MAKELPARAM(m_pointActivate.x, m_pointActivate.y));
+        SendMessage( ( HWND )Combo()->GetHandle(), WM_LBUTTONDOWN, 0,
+                     MAKELPARAM( m_pointActivate.x, m_pointActivate.y ) );
+        SendMessage( ( HWND )Combo()->GetHandle(), WM_LBUTTONUP, 0,
+                     MAKELPARAM( m_pointActivate.x, m_pointActivate.y ) );
 #else
-/*		GtkCombo *combo = GTK_COMBO(Combo()->m_widget);
-		combo->current_button = 0;
-		GtkWidget *button = GTK_COMBO(Combo()->m_widget)->button;
-		GdkEventButton eventb;
-		memset(&event, 0, sizeof(event));
-		gdk_window_ref (button->window);
-		// to do: only call when the click point is on the button
-//		event.x = m_pointActivate.x;
-//		event.y = m_pointActivate.y;
-		eventb.x = 0;
-		eventb.y = 0;
-		event.deviceid = GDK_CORE_POINTER;
-		event.type = GDK_BUTTON_PRESS;
-		event.source = GDK_SOURCE_MOUSE;
-		event.time = 0; 
-		event.window = button->window;
-		event.send_event = TRUE;
-		event.button = 1;
-		gtk_widget_event (button, (GdkEvent *)&event);
-		gdk_window_unref (button->window);
-		while (gtk_events_pending())
-			gtk_main_iteration();
-	*/	
+        /*		GtkCombo *combo = GTK_COMBO(Combo()->m_widget);
+        		combo->current_button = 0;
+        		GtkWidget *button = GTK_COMBO(Combo()->m_widget)->button;
+        		GdkEventButton eventb;
+        		memset(&event, 0, sizeof(event));
+        		gdk_window_ref (button->window);
+        		// to do: only call when the click point is on the button
+        //		event.x = m_pointActivate.x;
+        //		event.y = m_pointActivate.y;
+        		eventb.x = 0;
+        		eventb.y = 0;
+        		event.deviceid = GDK_CORE_POINTER;
+        		event.type = GDK_BUTTON_PRESS;
+        		event.source = GDK_SOURCE_MOUSE;
+        		event.time = 0;
+        		event.window = button->window;
+        		event.send_event = TRUE;
+        		event.button = 1;
+        		gtk_widget_event (button, (GdkEvent *)&event);
+        		gdk_window_unref (button->window);
+        		while (gtk_events_pending())
+        			gtk_main_iteration();
+        	*/
 #endif
-	}
+    }
 //	Combo()->SetSelection(0);
 }
 
-bool wxFastComboEditor::EndEdit(int row, int col,
-									 wxGrid* grid)
+bool wxFastComboEditor::EndEdit( int row, int col,
+                                 wxGrid* grid )
 {
-	wxString value = Combo()->GetValue();
-	bool changed = value != grid->GetCellValue(row, col);
+    wxString value = Combo()->GetValue();
+    bool changed = value != grid->GetCellValue( row, col );
 
-	if ( changed )
-		grid->SetCellValue(row, col, value);
+    if ( changed )
+        grid->SetCellValue( row, col, value );
 
-/*	m_startValue = wxEmptyString;
-	if (m_allowOthers)
-		Combo()->SetValue(m_startValue);
-	else
-		Combo()->SetSelection(0);
-*/
-	return changed;
+    /*	m_startValue = wxEmptyString;
+    	if (m_allowOthers)
+    		Combo()->SetValue(m_startValue);
+    	else
+    		Combo()->SetSelection(0);
+    */
+    return changed;
 }
 
 void wxFastComboEditor::Reset()
 {
-	Combo()->SetValue(m_startValue);
-	Combo()->SetInsertionPointEnd();
+    Combo()->SetValue( m_startValue );
+    Combo()->SetInsertionPointEnd();
 }
 
-void wxFastComboEditor::SetParameters(const wxString& params)
+void wxFastComboEditor::SetParameters( const wxString& params )
 {
-	if ( !params )
-	{
-		return;
-	}
-	m_choices.Empty();
-	wxStringTokenizer tk(params, _T(','));
-	while ( tk.HasMoreTokens() )
-	{
-		m_choices.Add(tk.GetNextToken());
-	}
-}
-
-void wxFastComboEditor::SetParameters(size_t count, const wxString choices[])
-{
-	m_choices.Empty();
-	if ( count )
-	{
-		m_choices.Alloc(count);
-		for ( size_t n = 0; n < count; n++ )
-		{
-			m_choices.Add(choices[n]);
-		}
-	}
+    if ( !params )
+    {
+        return;
+    }
+    m_choices.Empty();
+    wxStringTokenizer tk( params, _T( ',' ) );
+    while ( tk.HasMoreTokens() )
+    {
+        m_choices.Add( tk.GetNextToken() );
+    }
+}
+
+void wxFastComboEditor::SetParameters( size_t count, const wxString choices[] )
+{
+    m_choices.Empty();
+    if ( count )
+    {
+        m_choices.Alloc( count );
+        for ( size_t n = 0; n < count; n++ )
+        {
+            m_choices.Add( choices[n] );
+        }
+    }
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/FastComboEditor.h opencpn-plugin-logbookkonni-1.2024/src/FastComboEditor.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/FastComboEditor.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/FastComboEditor.h	2016-02-25 13:06:29.000000000 +0000
@@ -8,56 +8,59 @@
 class wxFastComboEditor : public wxGridCellEditor
 {
 public:
-	wxFastComboEditor(size_t count = 0,
-		const wxString choices[] = NULL,	bool allowOthers = FALSE);
-	~wxFastComboEditor(void){}
-	void Create(wxWindow* parent,
-							wxWindowID id,
-							wxEvtHandler* evtHandler);
-	void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr);
+    wxFastComboEditor( size_t count = 0,
+                       const wxString choices[] = NULL,	bool allowOthers = FALSE );
+    ~wxFastComboEditor( void ) {}
+    void Create( wxWindow* parent,
+                 wxWindowID id,
+                 wxEvtHandler* evtHandler );
+    void PaintBackground( const wxRect& rectCell, wxGridCellAttr *attr );
 
-	void BeginEdit(int row, int col, wxGrid* grid);
-	bool EndEdit(int row, int col, wxGrid* grid);
+    void BeginEdit( int row, int col, wxGrid* grid );
+    bool EndEdit( int row, int col, wxGrid* grid );
 
-	void Reset();
+    void Reset();
+
+    // parameters string format is "item1[,item2[...,itemN]]"
+    void SetParameters( const wxString& params );
+    void SetParameters( size_t count, const wxString choices[] );
+    wxGridCellEditor *Clone() const;
+    wxString GetValue() const;
+    wxSComboBox *Combo() const
+    {
+        return ( wxSComboBox* )m_control;
+    }
 
-	// parameters string format is "item1[,item2[...,itemN]]"
-	void SetParameters(const wxString& params);
-	void SetParameters(size_t count, const wxString choices[]);
-	wxGridCellEditor *Clone() const;
-	wxString GetValue() const;
-	wxSComboBox *Combo() const { return (wxSComboBox*)m_control; }	
-	
 protected:
-	wxPoint m_pointActivate;
-	wxString        m_startValue;
-	wxArrayString   m_choices;
-	bool            m_allowOthers;
+    wxPoint m_pointActivate;
+    wxString        m_startValue;
+    wxArrayString   m_choices;
+    bool            m_allowOthers;
 };
 
 class wxSComboBox : public wxComboBox
 {
 public:
-   wxSComboBox();
-	wxSComboBox(wxWindow *parent, wxWindowID id,
-			const wxString& value = wxEmptyString,
-			const wxPoint& pos = wxDefaultPosition,
-			const wxSize& size = wxDefaultSize,
-			int n = 0, const wxString choices[] = NULL,
-			long style = 0,
-			const wxValidator& validator = wxDefaultValidator,
-			const wxString& name = wxComboBoxNameStr);
-	void SetCellData(int nRow, int nCol, wxGrid* pGrid)
-	{
-		m_nRow = nRow;
-		m_nCol = nCol;
-		m_pGrid = pGrid;
-	}
+    wxSComboBox();
+    wxSComboBox( wxWindow *parent, wxWindowID id,
+                 const wxString& value = wxEmptyString,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 int n = 0, const wxString choices[] = NULL,
+                 long style = 0,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxComboBoxNameStr );
+    void SetCellData( int nRow, int nCol, wxGrid* pGrid )
+    {
+        m_nRow = nRow;
+        m_nCol = nCol;
+        m_pGrid = pGrid;
+    }
 private:
-	DECLARE_EVENT_TABLE()
-	void OnChange(wxCommandEvent& event);
-	int m_nRow;
-	int m_nCol; 
-	wxGrid* m_pGrid;
+    DECLARE_EVENT_TABLE()
+    void OnChange( wxCommandEvent& event );
+    int m_nRow;
+    int m_nCol;
+    wxGrid* m_pGrid;
 };
 #endif // _FASTCOMBOEDITOR_H_INCLUDED_
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/GridCellChoiceRenderer.cpp opencpn-plugin-logbookkonni-1.2024/src/GridCellChoiceRenderer.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/GridCellChoiceRenderer.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/GridCellChoiceRenderer.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -1,76 +1,76 @@
 #ifndef WX_PRECOMP
-      #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 #include "GridCellChoiceRenderer.h"
 
-void wxGridCellChoiceRenderer::Draw(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
-	const wxRect& rectCell, int row, int col, bool isSelected)
+void wxGridCellChoiceRenderer::Draw( wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
+                                     const wxRect& rectCell, int row, int col, bool isSelected )
 {
-    wxGridCellRenderer::Draw(grid, attr, dc, rectCell, row, col, isSelected);
-	// first calculate button size
-	// don't draw outside the cell
-	int nButtonWidth = 17;
-	if (rectCell.height < 2) return;	
-	wxRect rectButton;
-	rectButton.x = rectCell.x + rectCell.width - nButtonWidth;
-	rectButton.y = rectCell.y + 1;
-	int cell_rows, cell_cols;
-	attr.GetSize(&cell_rows, &cell_cols);
-	rectButton.width = nButtonWidth;
-	if (cell_rows == 1)
-		rectButton.height = rectCell.height-2;
-	else
-		rectButton.height = nButtonWidth;
+    wxGridCellRenderer::Draw( grid, attr, dc, rectCell, row, col, isSelected );
+    // first calculate button size
+    // don't draw outside the cell
+    int nButtonWidth = 17;
+    if ( rectCell.height < 2 ) return;
+    wxRect rectButton;
+    rectButton.x = rectCell.x + rectCell.width - nButtonWidth;
+    rectButton.y = rectCell.y + 1;
+    int cell_rows, cell_cols;
+    attr.GetSize( &cell_rows, &cell_cols );
+    rectButton.width = nButtonWidth;
+    if ( cell_rows == 1 )
+        rectButton.height = rectCell.height-2;
+    else
+        rectButton.height = nButtonWidth;
 
-	SetTextColoursAndFont(grid, attr, dc, isSelected);
-	int hAlign, vAlign;
-	attr.GetAlignment(&hAlign, &vAlign);
-	// leave room for button
-	wxRect rect = rectCell;
-	rect.SetWidth(rectCell.GetWidth() - rectButton.GetWidth()-2);
-	rect.Inflate(-1);
-	grid.DrawTextRectangle(dc, grid.GetCellValue(row, col), rect, hAlign, vAlign);
+    SetTextColoursAndFont( grid, attr, dc, isSelected );
+    int hAlign, vAlign;
+    attr.GetAlignment( &hAlign, &vAlign );
+    // leave room for button
+    wxRect rect = rectCell;
+    rect.SetWidth( rectCell.GetWidth() - rectButton.GetWidth()-2 );
+    rect.Inflate( -1 );
+    grid.DrawTextRectangle( dc, grid.GetCellValue( row, col ), rect, hAlign, vAlign );
 
-	// don't bother drawing if the cell is too small
-	if (rectButton.height < 4 || rectButton.width < 4) return;
-	// draw 3-d button
-	wxColour colourBackGround = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
-	dc.SetBrush(wxBrush(colourBackGround, wxSOLID));
-	dc.SetPen(wxPen(colourBackGround, 1, wxSOLID));
-	dc.DrawRectangle(rectButton);
-	dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxSOLID));
-	dc.DrawLine(rectButton.GetLeft(), rectButton.GetBottom(), 
-		rectButton.GetRight(), rectButton.GetBottom());
-	dc.DrawLine(rectButton.GetRight(), rectButton.GetBottom(), 
-		rectButton.GetRight(), rectButton.GetTop()-1);
-	dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW), 
-		1, wxSOLID));
-	dc.DrawLine(rectButton.GetLeft()+1, rectButton.GetBottom()-1, 
-		rectButton.GetRight()-1, rectButton.GetBottom()-1);
-	dc.DrawLine(rectButton.GetRight()-1, rectButton.GetBottom()-1, 
-		rectButton.GetRight()-1, rectButton.GetTop());
-	dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT), 
-		1, wxSOLID));
-	dc.DrawLine(rectButton.GetRight()-2, rectButton.GetTop()+1, 
-		rectButton.GetLeft()+1, rectButton.GetTop()+1);
-	dc.DrawLine(rectButton.GetLeft()+1, rectButton.GetTop()+1, 
-		rectButton.GetLeft()+1, rectButton.GetBottom()-1);
-	// Draw little triangle
-	int nTriWidth = 7;
-	int nTriHeight = 4;
-	wxPoint point[3];
-	point[0] = wxPoint(rectButton.GetLeft() + (rectButton.GetWidth()-nTriWidth)/2, 
-		rectButton.GetTop()+(rectButton.GetHeight()-nTriHeight)/2);
-	point[1] = wxPoint(point[0].x+nTriWidth-1, point[0].y);
-	point[2] = wxPoint(point[0].x+3, point[0].y+nTriHeight-1);
-	dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), wxSOLID));
-	dc.SetPen(wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT), 1, wxSOLID));
-	dc.DrawPolygon(3, point);
-	if (m_border == wxLAYOUT_TOP)
-	{
-		dc.SetPen(wxPen(*wxBLACK, 1, wxDOT));
-		dc.DrawLine(rectCell.GetRight(), rectCell.GetTop(), 
-			rectCell.GetLeft(), rectCell.GetTop());
-	}
+    // don't bother drawing if the cell is too small
+    if ( rectButton.height < 4 || rectButton.width < 4 ) return;
+    // draw 3-d button
+    wxColour colourBackGround = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
+    dc.SetBrush( wxBrush( colourBackGround, wxSOLID ) );
+    dc.SetPen( wxPen( colourBackGround, 1, wxSOLID ) );
+    dc.DrawRectangle( rectButton );
+    dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ), 1, wxSOLID ) );
+    dc.DrawLine( rectButton.GetLeft(), rectButton.GetBottom(),
+                 rectButton.GetRight(), rectButton.GetBottom() );
+    dc.DrawLine( rectButton.GetRight(), rectButton.GetBottom(),
+                 rectButton.GetRight(), rectButton.GetTop()-1 );
+    dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNSHADOW ),
+                      1, wxSOLID ) );
+    dc.DrawLine( rectButton.GetLeft()+1, rectButton.GetBottom()-1,
+                 rectButton.GetRight()-1, rectButton.GetBottom()-1 );
+    dc.DrawLine( rectButton.GetRight()-1, rectButton.GetBottom()-1,
+                 rectButton.GetRight()-1, rectButton.GetTop() );
+    dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNHIGHLIGHT ),
+                      1, wxSOLID ) );
+    dc.DrawLine( rectButton.GetRight()-2, rectButton.GetTop()+1,
+                 rectButton.GetLeft()+1, rectButton.GetTop()+1 );
+    dc.DrawLine( rectButton.GetLeft()+1, rectButton.GetTop()+1,
+                 rectButton.GetLeft()+1, rectButton.GetBottom()-1 );
+    // Draw little triangle
+    int nTriWidth = 7;
+    int nTriHeight = 4;
+    wxPoint point[3];
+    point[0] = wxPoint( rectButton.GetLeft() + ( rectButton.GetWidth()-nTriWidth )/2,
+                        rectButton.GetTop()+( rectButton.GetHeight()-nTriHeight )/2 );
+    point[1] = wxPoint( point[0].x+nTriWidth-1, point[0].y );
+    point[2] = wxPoint( point[0].x+3, point[0].y+nTriHeight-1 );
+    dc.SetBrush( wxBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ), wxSOLID ) );
+    dc.SetPen( wxPen( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ), 1, wxSOLID ) );
+    dc.DrawPolygon( 3, point );
+    if ( m_border == wxLAYOUT_TOP )
+    {
+        dc.SetPen( wxPen( *wxBLACK, 1, wxDOT ) );
+        dc.DrawLine( rectCell.GetRight(), rectCell.GetTop(),
+                     rectCell.GetLeft(), rectCell.GetTop() );
+    }
 }
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/GridCellChoiceRenderer.h opencpn-plugin-logbookkonni-1.2024/src/GridCellChoiceRenderer.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/GridCellChoiceRenderer.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/GridCellChoiceRenderer.h	2016-02-25 13:06:29.000000000 +0000
@@ -7,19 +7,21 @@
 class wxGridCellChoiceRenderer : public wxGridCellStringRenderer
 {
 public:
-	wxGridCellChoiceRenderer(wxLayoutAlignment border = wxLAYOUT_NONE) : 
-		m_border(border) {}
-		~wxGridCellChoiceRenderer(void){}
-	void Draw(wxGrid& grid,
-		wxGridCellAttr& attr,
-		wxDC& dc,
-		const wxRect& rect,
-		int row, int col,
-		bool isSelected);
-	wxGridCellRenderer *Clone() const
-		{ return new wxGridCellChoiceRenderer; }
+    wxGridCellChoiceRenderer( wxLayoutAlignment border = wxLAYOUT_NONE ) :
+        m_border( border ) {}
+    ~wxGridCellChoiceRenderer( void ) {}
+    void Draw( wxGrid& grid,
+               wxGridCellAttr& attr,
+               wxDC& dc,
+               const wxRect& rect,
+               int row, int col,
+               bool isSelected );
+    wxGridCellRenderer *Clone() const
+    {
+        return new wxGridCellChoiceRenderer;
+    }
 private:
-	wxLayoutAlignment m_border;
+    wxLayoutAlignment m_border;
 };
 
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/icons.cpp opencpn-plugin-logbookkonni-1.2024/src/icons.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/icons.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/icons.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -12,408 +12,415 @@
 const wxBitmap *_img_Bullet_red;
 const wxBitmap *_img_Bullet_yellow;
 
-void initialize_images(void)
+void initialize_images( void )
 {
-/* logbook_pi.png - 3327 bytes */
-static const unsigned char logbook_pi_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
-  0xf4, 0x00, 0x00, 0x0a, 0x43, 0x69, 0x43, 0x43, 0x50, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6f,
-  0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x78, 0xda, 0x9d, 0x53, 0x77, 0x58, 0x93, 0xf7, 0x16, 0x3e,
-  0xdf, 0xf7, 0x65, 0x0f, 0x56, 0x42, 0xd8, 0xf0, 0xb1, 0x97, 0x6c, 0x81, 0x00, 0x22, 0x23, 0xac,
-  0x08, 0xc8, 0x10, 0x59, 0xa2, 0x10, 0x92, 0x00, 0x61, 0x84, 0x10, 0x12, 0x40, 0xc5, 0x85, 0x88,
-  0x0a, 0x56, 0x14, 0x15, 0x11, 0x9c, 0x48, 0x55, 0xc4, 0x82, 0xd5, 0x0a, 0x48, 0x9d, 0x88, 0xe2,
-  0xa0, 0x28, 0xb8, 0x67, 0x41, 0x8a, 0x88, 0x5a, 0x8b, 0x55, 0x5c, 0x38, 0xee, 0x1f, 0xdc, 0xa7,
-  0xb5, 0x7d, 0x7a, 0xef, 0xed, 0xed, 0xfb, 0xd7, 0xfb, 0xbc, 0xe7, 0x9c, 0xe7, 0xfc, 0xce, 0x79,
-  0xcf, 0x0f, 0x80, 0x11, 0x12, 0x26, 0x91, 0xe6, 0xa2, 0x6a, 0x00, 0x39, 0x52, 0x85, 0x3c, 0x3a,
-  0xd8, 0x1f, 0x8f, 0x4f, 0x48, 0xc4, 0xc9, 0xbd, 0x80, 0x02, 0x15, 0x48, 0xe0, 0x04, 0x20, 0x10,
-  0xe6, 0xcb, 0xc2, 0x67, 0x05, 0xc5, 0x00, 0x00, 0xf0, 0x03, 0x79, 0x78, 0x7e, 0x74, 0xb0, 0x3f,
-  0xfc, 0x01, 0xaf, 0x6f, 0x00, 0x02, 0x00, 0x70, 0xd5, 0x2e, 0x24, 0x12, 0xc7, 0xe1, 0xff, 0x83,
-  0xba, 0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xe0, 0x22, 0x12, 0xe7, 0x0b, 0x01, 0x90, 0x52,
-  0x00, 0xc8, 0x2e, 0x54, 0xc8, 0x14, 0x00, 0xc8, 0x18, 0x00, 0xb0, 0x53, 0xb3, 0x64, 0x0a, 0x00,
-  0x94, 0x00, 0x00, 0x6c, 0x79, 0x7c, 0x42, 0x22, 0x00, 0xaa, 0x0d, 0x00, 0xec, 0xf4, 0x49, 0x3e,
-  0x05, 0x00, 0xd8, 0xa9, 0x93, 0xdc, 0x17, 0x00, 0xd8, 0xa2, 0x1c, 0xa9, 0x08, 0x00, 0x8d, 0x01,
-  0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, 0xbb, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2c, 0x02, 0xc0,
-  0xc2, 0x00, 0xa0, 0xac, 0x40, 0x22, 0x2e, 0x04, 0xc0, 0xae, 0x01, 0x80, 0x59, 0xb6, 0x32, 0x47,
-  0x02, 0x80, 0xbd, 0x05, 0x00, 0x76, 0x8e, 0x58, 0x90, 0x0f, 0x40, 0x60, 0x00, 0x80, 0x99, 0x42,
-  0x2c, 0xcc, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1e, 0x13, 0xcd, 0x03, 0x20, 0x4c, 0x03, 0xa0,
-  0x30, 0xd2, 0xbf, 0xe0, 0xa9, 0x5f, 0x70, 0x85, 0xb8, 0x48, 0x01, 0x00, 0xc0, 0xcb, 0x95, 0xcd,
-  0x97, 0x4b, 0xd2, 0x33, 0x14, 0xb8, 0x95, 0xd0, 0x1a, 0x77, 0xf2, 0xf0, 0xe0, 0xe2, 0x21, 0xe2,
-  0xc2, 0x6c, 0xb1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xe4, 0x22, 0x9c, 0x97, 0x9b, 0x23,
-  0x13, 0x48, 0xe7, 0x03, 0x4c, 0xce, 0x0c, 0x00, 0x00, 0x1a, 0xf9, 0xd1, 0xc1, 0xfe, 0x38, 0x3f,
-  0x90, 0xe7, 0xe6, 0xe4, 0xe1, 0xe6, 0x66, 0xe7, 0x6c, 0xef, 0xf4, 0xc5, 0xa2, 0xfe, 0x6b, 0xf0,
-  0x6f, 0x22, 0x3e, 0x21, 0xf1, 0xdf, 0xfe, 0xbc, 0x8c, 0x02, 0x04, 0x00, 0x10, 0x4e, 0xcf, 0xef,
-  0xda, 0x5f, 0xe5, 0xe5, 0xd6, 0x03, 0x70, 0xc7, 0x01, 0xb0, 0x75, 0xbf, 0x6b, 0xa9, 0x5b, 0x00,
-  0xda, 0x56, 0x00, 0x68, 0xdf, 0xf9, 0x5d, 0x33, 0xdb, 0x09, 0xa0, 0x5a, 0x0a, 0xd0, 0x7a, 0xf9,
-  0x8b, 0x79, 0x38, 0xfc, 0x40, 0x1e, 0x9e, 0xa1, 0x50, 0xc8, 0x3c, 0x1d, 0x1c, 0x0a, 0x0b, 0x0b,
-  0xed, 0x25, 0x62, 0xa1, 0xbd, 0x30, 0xe3, 0x8b, 0x3e, 0xff, 0x33, 0xe1, 0x6f, 0xe0, 0x8b, 0x7e,
-  0xf6, 0xfc, 0x40, 0x1e, 0xfe, 0xdb, 0x7a, 0xf0, 0x00, 0x71, 0x9a, 0x40, 0x99, 0xad, 0xc0, 0xa3,
-  0x83, 0xfd, 0x71, 0x61, 0x6e, 0x76, 0xae, 0x52, 0x8e, 0xe7, 0xcb, 0x04, 0x42, 0x31, 0x6e, 0xf7,
-  0xe7, 0x23, 0xfe, 0xc7, 0x85, 0x7f, 0xfd, 0x8e, 0x29, 0xd1, 0xe2, 0x34, 0xb1, 0x5c, 0x2c, 0x15,
-  0x8a, 0xf1, 0x58, 0x89, 0xb8, 0x50, 0x22, 0x4d, 0xc7, 0x79, 0xb9, 0x52, 0x91, 0x44, 0x21, 0xc9,
-  0x95, 0xe2, 0x12, 0xe9, 0x7f, 0x32, 0xf1, 0x1f, 0x96, 0xfd, 0x09, 0x93, 0x77, 0x0d, 0x00, 0xac,
-  0x86, 0x4f, 0xc0, 0x4e, 0xb6, 0x07, 0xb5, 0xcb, 0x6c, 0xc0, 0x7e, 0xee, 0x01, 0x02, 0x8b, 0x0e,
-  0x58, 0xd2, 0x76, 0x00, 0x40, 0x7e, 0xf3, 0x2d, 0x8c, 0x1a, 0x0b, 0x91, 0x00, 0x10, 0x67, 0x34,
-  0x32, 0x79, 0xf7, 0x00, 0x00, 0x93, 0xbf, 0xf9, 0x8f, 0x40, 0x2b, 0x01, 0x00, 0xcd, 0x97, 0xa4,
-  0xe3, 0x00, 0x00, 0xbc, 0xe8, 0x18, 0x5c, 0xa8, 0x94, 0x17, 0x4c, 0xc6, 0x08, 0x00, 0x00, 0x44,
-  0xa0, 0x81, 0x2a, 0xb0, 0x41, 0x07, 0x0c, 0xc1, 0x14, 0xac, 0xc0, 0x0e, 0x9c, 0xc1, 0x1d, 0xbc,
-  0xc0, 0x17, 0x02, 0x61, 0x06, 0x44, 0x40, 0x0c, 0x24, 0xc0, 0x3c, 0x10, 0x42, 0x06, 0xe4, 0x80,
-  0x1c, 0x0a, 0xa1, 0x18, 0x96, 0x41, 0x19, 0x54, 0xc0, 0x3a, 0xd8, 0x04, 0xb5, 0xb0, 0x03, 0x1a,
-  0xa0, 0x11, 0x9a, 0xe1, 0x10, 0xb4, 0xc1, 0x31, 0x38, 0x0d, 0xe7, 0xe0, 0x12, 0x5c, 0x81, 0xeb,
-  0x70, 0x17, 0x06, 0x60, 0x18, 0x9e, 0xc2, 0x18, 0xbc, 0x86, 0x09, 0x04, 0x41, 0xc8, 0x08, 0x13,
-  0x61, 0x21, 0x3a, 0x88, 0x11, 0x62, 0x8e, 0xd8, 0x22, 0xce, 0x08, 0x17, 0x99, 0x8e, 0x04, 0x22,
-  0x61, 0x48, 0x34, 0x92, 0x80, 0xa4, 0x20, 0xe9, 0x88, 0x14, 0x51, 0x22, 0xc5, 0xc8, 0x72, 0xa4,
-  0x02, 0xa9, 0x42, 0x6a, 0x91, 0x5d, 0x48, 0x23, 0xf2, 0x2d, 0x72, 0x14, 0x39, 0x8d, 0x5c, 0x40,
-  0xfa, 0x90, 0xdb, 0xc8, 0x20, 0x32, 0x8a, 0xfc, 0x8a, 0xbc, 0x47, 0x31, 0x94, 0x81, 0xb2, 0x51,
-  0x03, 0xd4, 0x02, 0x75, 0x40, 0xb9, 0xa8, 0x1f, 0x1a, 0x8a, 0xc6, 0xa0, 0x73, 0xd1, 0x74, 0x34,
-  0x0f, 0x5d, 0x80, 0x96, 0xa2, 0x6b, 0xd1, 0x1a, 0xb4, 0x1e, 0x3d, 0x80, 0xb6, 0xa2, 0xa7, 0xd1,
-  0x4b, 0xe8, 0x75, 0x74, 0x00, 0x7d, 0x8a, 0x8e, 0x63, 0x80, 0xd1, 0x31, 0x0e, 0x66, 0x8c, 0xd9,
-  0x61, 0x5c, 0x8c, 0x87, 0x45, 0x60, 0x89, 0x58, 0x1a, 0x26, 0xc7, 0x16, 0x63, 0xe5, 0x58, 0x35,
-  0x56, 0x8f, 0x35, 0x63, 0x1d, 0x58, 0x37, 0x76, 0x15, 0x1b, 0xc0, 0x9e, 0x61, 0xef, 0x08, 0x24,
-  0x02, 0x8b, 0x80, 0x13, 0xec, 0x08, 0x5e, 0x84, 0x10, 0xc2, 0x6c, 0x82, 0x90, 0x90, 0x47, 0x58,
-  0x4c, 0x58, 0x43, 0xa8, 0x25, 0xec, 0x23, 0xb4, 0x12, 0xba, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31,
-  0xc2, 0x27, 0x22, 0x93, 0xa8, 0x4f, 0xb4, 0x25, 0x7a, 0x12, 0xf9, 0xc4, 0x78, 0x62, 0x3a, 0xb1,
-  0x90, 0x58, 0x46, 0xac, 0x26, 0xee, 0x21, 0x1e, 0x21, 0x9e, 0x25, 0x5e, 0x27, 0x0e, 0x13, 0x5f,
-  0x93, 0x48, 0x24, 0x0e, 0xc9, 0x92, 0xe4, 0x4e, 0x0a, 0x21, 0x25, 0x90, 0x32, 0x49, 0x0b, 0x49,
-  0x6b, 0x48, 0xdb, 0x48, 0x2d, 0xa4, 0x53, 0xa4, 0x3e, 0xd2, 0x10, 0x69, 0x9c, 0x4c, 0x26, 0xeb,
-  0x90, 0x6d, 0xc9, 0xde, 0xe4, 0x08, 0xb2, 0x80, 0xac, 0x20, 0x97, 0x91, 0xb7, 0x90, 0x0f, 0x90,
-  0x4f, 0x92, 0xfb, 0xc9, 0xc3, 0xe4, 0xb7, 0x14, 0x3a, 0xc5, 0x88, 0xe2, 0x4c, 0x09, 0xa2, 0x24,
-  0x52, 0xa4, 0x94, 0x12, 0x4a, 0x35, 0x65, 0x3f, 0xe5, 0x04, 0xa5, 0x9f, 0x32, 0x42, 0x99, 0xa0,
-  0xaa, 0x51, 0xcd, 0xa9, 0x9e, 0xd4, 0x08, 0xaa, 0x88, 0x3a, 0x9f, 0x5a, 0x49, 0x6d, 0xa0, 0x76,
-  0x50, 0x2f, 0x53, 0x87, 0xa9, 0x13, 0x34, 0x75, 0x9a, 0x25, 0xcd, 0x9b, 0x16, 0x43, 0xcb, 0xa4,
-  0x2d, 0xa3, 0xd5, 0xd0, 0x9a, 0x69, 0x67, 0x69, 0xf7, 0x68, 0x2f, 0xe9, 0x74, 0xba, 0x09, 0xdd,
-  0x83, 0x1e, 0x45, 0x97, 0xd0, 0x97, 0xd2, 0x6b, 0xe8, 0x07, 0xe9, 0xe7, 0xe9, 0x83, 0xf4, 0x77,
-  0x0c, 0x0d, 0x86, 0x0d, 0x83, 0xc7, 0x48, 0x62, 0x28, 0x19, 0x6b, 0x19, 0x7b, 0x19, 0xa7, 0x18,
-  0xb7, 0x19, 0x2f, 0x99, 0x4c, 0xa6, 0x05, 0xd3, 0x97, 0x99, 0xc8, 0x54, 0x30, 0xd7, 0x32, 0x1b,
-  0x99, 0x67, 0x98, 0x0f, 0x98, 0x6f, 0x55, 0x58, 0x2a, 0xf6, 0x2a, 0x7c, 0x15, 0x91, 0xca, 0x12,
-  0x95, 0x3a, 0x95, 0x56, 0x95, 0x7e, 0x95, 0xe7, 0xaa, 0x54, 0x55, 0x73, 0x55, 0x3f, 0xd5, 0x79,
-  0xaa, 0x0b, 0x54, 0xab, 0x55, 0x0f, 0xab, 0x5e, 0x56, 0x7d, 0xa6, 0x46, 0x55, 0xb3, 0x50, 0xe3,
-  0xa9, 0x09, 0xd4, 0x16, 0xab, 0xd5, 0xa9, 0x1d, 0x55, 0xbb, 0xa9, 0x36, 0xae, 0xce, 0x52, 0x77,
-  0x52, 0x8f, 0x50, 0xcf, 0x51, 0x5f, 0xa3, 0xbe, 0x5f, 0xfd, 0x82, 0xfa, 0x63, 0x0d, 0xb2, 0x86,
-  0x85, 0x46, 0xa0, 0x86, 0x48, 0xa3, 0x54, 0x63, 0xb7, 0xc6, 0x19, 0x8d, 0x21, 0x16, 0xc6, 0x32,
-  0x65, 0xf1, 0x58, 0x42, 0xd6, 0x72, 0x56, 0x03, 0xeb, 0x2c, 0x6b, 0x98, 0x4d, 0x62, 0x5b, 0xb2,
-  0xf9, 0xec, 0x4c, 0x76, 0x05, 0xfb, 0x1b, 0x76, 0x2f, 0x7b, 0x4c, 0x53, 0x43, 0x73, 0xaa, 0x66,
-  0xac, 0x66, 0x91, 0x66, 0x9d, 0xe6, 0x71, 0xcd, 0x01, 0x0e, 0xc6, 0xb1, 0xe0, 0xf0, 0x39, 0xd9,
-  0x9c, 0x4a, 0xce, 0x21, 0xce, 0x0d, 0xce, 0x7b, 0x2d, 0x03, 0x2d, 0x3f, 0x2d, 0xb1, 0xd6, 0x6a,
-  0xad, 0x66, 0xad, 0x7e, 0xad, 0x37, 0xda, 0x7a, 0xda, 0xbe, 0xda, 0x62, 0xed, 0x72, 0xed, 0x16,
-  0xed, 0xeb, 0xda, 0xef, 0x75, 0x70, 0x9d, 0x40, 0x9d, 0x2c, 0x9d, 0xf5, 0x3a, 0x6d, 0x3a, 0xf7,
-  0x75, 0x09, 0xba, 0x36, 0xba, 0x51, 0xba, 0x85, 0xba, 0xdb, 0x75, 0xcf, 0xea, 0x3e, 0xd3, 0x63,
-  0xeb, 0x79, 0xe9, 0x09, 0xf5, 0xca, 0xf5, 0x0e, 0xe9, 0xdd, 0xd1, 0x47, 0xf5, 0x6d, 0xf4, 0xa3,
-  0xf5, 0x17, 0xea, 0xef, 0xd6, 0xef, 0xd1, 0x1f, 0x37, 0x30, 0x34, 0x08, 0x36, 0x90, 0x19, 0x6c,
-  0x31, 0x38, 0x63, 0xf0, 0xcc, 0x90, 0x63, 0xe8, 0x6b, 0x98, 0x69, 0xb8, 0xd1, 0xf0, 0x84, 0xe1,
-  0xa8, 0x11, 0xcb, 0x68, 0xba, 0x91, 0xc4, 0x68, 0xa3, 0xd1, 0x49, 0xa3, 0x27, 0xb8, 0x26, 0xee,
-  0x87, 0x67, 0xe3, 0x35, 0x78, 0x17, 0x3e, 0x66, 0xac, 0x6f, 0x1c, 0x62, 0xac, 0x34, 0xde, 0x65,
-  0xdc, 0x6b, 0x3c, 0x61, 0x62, 0x69, 0x32, 0xdb, 0xa4, 0xc4, 0xa4, 0xc5, 0xe4, 0xbe, 0x29, 0xcd,
-  0x94, 0x6b, 0x9a, 0x66, 0xba, 0xd1, 0xb4, 0xd3, 0x74, 0xcc, 0xcc, 0xc8, 0x2c, 0xdc, 0xac, 0xd8,
-  0xac, 0xc9, 0xec, 0x8e, 0x39, 0xd5, 0x9c, 0x6b, 0x9e, 0x61, 0xbe, 0xd9, 0xbc, 0xdb, 0xfc, 0x8d,
-  0x85, 0xa5, 0x45, 0x9c, 0xc5, 0x4a, 0x8b, 0x36, 0x8b, 0xc7, 0x96, 0xda, 0x96, 0x7c, 0xcb, 0x05,
-  0x96, 0x4d, 0x96, 0xf7, 0xac, 0x98, 0x56, 0x3e, 0x56, 0x79, 0x56, 0xf5, 0x56, 0xd7, 0xac, 0x49,
-  0xd6, 0x5c, 0xeb, 0x2c, 0xeb, 0x6d, 0xd6, 0x57, 0x6c, 0x50, 0x1b, 0x57, 0x9b, 0x0c, 0x9b, 0x3a,
-  0x9b, 0xcb, 0xb6, 0xa8, 0xad, 0x9b, 0xad, 0xc4, 0x76, 0x9b, 0x6d, 0xdf, 0x14, 0xe2, 0x14, 0x8f,
-  0x29, 0xd2, 0x29, 0xf5, 0x53, 0x6e, 0xda, 0x31, 0xec, 0xfc, 0xec, 0x0a, 0xec, 0x9a, 0xec, 0x06,
-  0xed, 0x39, 0xf6, 0x61, 0xf6, 0x25, 0xf6, 0x6d, 0xf6, 0xcf, 0x1d, 0xcc, 0x1c, 0x12, 0x1d, 0xd6,
-  0x3b, 0x74, 0x3b, 0x7c, 0x72, 0x74, 0x75, 0xcc, 0x76, 0x6c, 0x70, 0xbc, 0xeb, 0xa4, 0xe1, 0x34,
-  0xc3, 0xa9, 0xc4, 0xa9, 0xc3, 0xe9, 0x57, 0x67, 0x1b, 0x67, 0xa1, 0x73, 0x9d, 0xf3, 0x35, 0x17,
-  0xa6, 0x4b, 0x90, 0xcb, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6d, 0xa7, 0x8a, 0xa7, 0x6e, 0x9f,
-  0x7a, 0xcb, 0x95, 0xe5, 0x1a, 0xee, 0xba, 0xd2, 0xb5, 0xd3, 0xf5, 0xa3, 0x9b, 0xbb, 0x9b, 0xdc,
-  0xad, 0xd9, 0x6d, 0xd4, 0xdd, 0xcc, 0x3d, 0xc5, 0x7d, 0xab, 0xfb, 0x4d, 0x2e, 0x9b, 0x1b, 0xc9,
-  0x5d, 0xc3, 0x3d, 0xef, 0x41, 0xf4, 0xf0, 0xf7, 0x58, 0xe2, 0x71, 0xcc, 0xe3, 0x9d, 0xa7, 0x9b,
-  0xa7, 0xc2, 0xf3, 0x90, 0xe7, 0x2f, 0x5e, 0x76, 0x5e, 0x59, 0x5e, 0xfb, 0xbd, 0x1e, 0x4f, 0xb3,
-  0x9c, 0x26, 0x9e, 0xd6, 0x30, 0x6d, 0xc8, 0xdb, 0xc4, 0x5b, 0xe0, 0xbd, 0xcb, 0x7b, 0x60, 0x3a,
-  0x3e, 0x3d, 0x65, 0xfa, 0xce, 0xe9, 0x03, 0x3e, 0xc6, 0x3e, 0x02, 0x9f, 0x7a, 0x9f, 0x87, 0xbe,
-  0xa6, 0xbe, 0x22, 0xdf, 0x3d, 0xbe, 0x23, 0x7e, 0xd6, 0x7e, 0x99, 0x7e, 0x07, 0xfc, 0x9e, 0xfb,
-  0x3b, 0xfa, 0xcb, 0xfd, 0x8f, 0xf8, 0xbf, 0xe1, 0x79, 0xf2, 0x16, 0xf1, 0x4e, 0x05, 0x60, 0x01,
-  0xc1, 0x01, 0xe5, 0x01, 0xbd, 0x81, 0x1a, 0x81, 0xb3, 0x03, 0x6b, 0x03, 0x1f, 0x04, 0x99, 0x04,
-  0xa5, 0x07, 0x35, 0x05, 0x8d, 0x05, 0xbb, 0x06, 0x2f, 0x0c, 0x3e, 0x15, 0x42, 0x0c, 0x09, 0x0d,
-  0x59, 0x1f, 0x72, 0x93, 0x6f, 0xc0, 0x17, 0xf2, 0x1b, 0xf9, 0x63, 0x33, 0xdc, 0x67, 0x2c, 0x9a,
-  0xd1, 0x15, 0xca, 0x08, 0x9d, 0x15, 0x5a, 0x1b, 0xfa, 0x30, 0xcc, 0x26, 0x4c, 0x1e, 0xd6, 0x11,
-  0x8e, 0x86, 0xcf, 0x08, 0xdf, 0x10, 0x7e, 0x6f, 0xa6, 0xf9, 0x4c, 0xe9, 0xcc, 0xb6, 0x08, 0x88,
-  0xe0, 0x47, 0x6c, 0x88, 0xb8, 0x1f, 0x69, 0x19, 0x99, 0x17, 0xf9, 0x7d, 0x14, 0x29, 0x2a, 0x32,
-  0xaa, 0x2e, 0xea, 0x51, 0xb4, 0x53, 0x74, 0x71, 0x74, 0xf7, 0x2c, 0xd6, 0xac, 0xe4, 0x59, 0xfb,
-  0x67, 0xbd, 0x8e, 0xf1, 0x8f, 0xa9, 0x8c, 0xb9, 0x3b, 0xdb, 0x6a, 0xb6, 0x72, 0x76, 0x67, 0xac,
-  0x6a, 0x6c, 0x52, 0x6c, 0x63, 0xec, 0x9b, 0xb8, 0x80, 0xb8, 0xaa, 0xb8, 0x81, 0x78, 0x87, 0xf8,
-  0x45, 0xf1, 0x97, 0x12, 0x74, 0x13, 0x24, 0x09, 0xed, 0x89, 0xe4, 0xc4, 0xd8, 0xc4, 0x3d, 0x89,
-  0xe3, 0x73, 0x02, 0xe7, 0x6c, 0x9a, 0x33, 0x9c, 0xe4, 0x9a, 0x54, 0x96, 0x74, 0x63, 0xae, 0xe5,
-  0xdc, 0xa2, 0xb9, 0x17, 0xe6, 0xe9, 0xce, 0xcb, 0x9e, 0x77, 0x3c, 0x59, 0x35, 0x59, 0x90, 0x7c,
-  0x38, 0x85, 0x98, 0x12, 0x97, 0xb2, 0x3f, 0xe5, 0x83, 0x20, 0x42, 0x50, 0x2f, 0x18, 0x4f, 0xe5,
-  0xa7, 0x6e, 0x4d, 0x1d, 0x13, 0xf2, 0x84, 0x9b, 0x85, 0x4f, 0x45, 0xbe, 0xa2, 0x8d, 0xa2, 0x51,
-  0xb1, 0xb7, 0xb8, 0x4a, 0x3c, 0x92, 0xe6, 0x9d, 0x56, 0x95, 0xf6, 0x38, 0xdd, 0x3b, 0x7d, 0x43,
-  0xfa, 0x68, 0x86, 0x4f, 0x46, 0x75, 0xc6, 0x33, 0x09, 0x4f, 0x52, 0x2b, 0x79, 0x91, 0x19, 0x92,
-  0xb9, 0x23, 0xf3, 0x4d, 0x56, 0x44, 0xd6, 0xde, 0xac, 0xcf, 0xd9, 0x71, 0xd9, 0x2d, 0x39, 0x94,
-  0x9c, 0x94, 0x9c, 0xa3, 0x52, 0x0d, 0x69, 0x96, 0xb4, 0x2b, 0xd7, 0x30, 0xb7, 0x28, 0xb7, 0x4f,
-  0x66, 0x2b, 0x2b, 0x93, 0x0d, 0xe4, 0x79, 0xe6, 0x6d, 0xca, 0x1b, 0x93, 0x87, 0xca, 0xf7, 0xe4,
-  0x23, 0xf9, 0x73, 0xf3, 0xdb, 0x15, 0x6c, 0x85, 0x4c, 0xd1, 0xa3, 0xb4, 0x52, 0xae, 0x50, 0x0e,
-  0x16, 0x4c, 0x2f, 0xa8, 0x2b, 0x78, 0x5b, 0x18, 0x5b, 0x78, 0xb8, 0x48, 0xbd, 0x48, 0x5a, 0xd4,
-  0x33, 0xdf, 0x66, 0xfe, 0xea, 0xf9, 0x23, 0x0b, 0x82, 0x16, 0x7c, 0xbd, 0x90, 0xb0, 0x50, 0xb8,
-  0xb0, 0xb3, 0xd8, 0xb8, 0x78, 0x59, 0xf1, 0xe0, 0x22, 0xbf, 0x45, 0xbb, 0x16, 0x23, 0x8b, 0x53,
-  0x17, 0x77, 0x2e, 0x31, 0x5d, 0x52, 0xba, 0x64, 0x78, 0x69, 0xf0, 0xd2, 0x7d, 0xcb, 0x68, 0xcb,
-  0xb2, 0x96, 0xfd, 0x50, 0xe2, 0x58, 0x52, 0x55, 0xf2, 0x6a, 0x79, 0xdc, 0xf2, 0x8e, 0x52, 0x83,
-  0xd2, 0xa5, 0xa5, 0x43, 0x2b, 0x82, 0x57, 0x34, 0x95, 0xa9, 0x94, 0xc9, 0xcb, 0x6e, 0xae, 0xf4,
-  0x5a, 0xb9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xef, 0x6a, 0x97, 0xd5, 0x5b, 0x56, 0x7f, 0x2a,
-  0x17, 0x95, 0x5f, 0xac, 0x70, 0xac, 0xa8, 0xae, 0xf8, 0xb0, 0x46, 0xb8, 0xe6, 0xe2, 0x57, 0x4e,
-  0x5f, 0xd5, 0x7c, 0xf5, 0x79, 0x6d, 0xda, 0xda, 0xde, 0x4a, 0xb7, 0xca, 0xed, 0xeb, 0x48, 0xeb,
-  0xa4, 0xeb, 0x6e, 0xac, 0xf7, 0x59, 0xbf, 0xaf, 0x4a, 0xbd, 0x6a, 0x41, 0xd5, 0xd0, 0x86, 0xf0,
-  0x0d, 0xad, 0x1b, 0xf1, 0x8d, 0xe5, 0x1b, 0x5f, 0x6d, 0x4a, 0xde, 0x74, 0xa1, 0x7a, 0x6a, 0xf5,
-  0x8e, 0xcd, 0xb4, 0xcd, 0xca, 0xcd, 0x03, 0x35, 0x61, 0x35, 0xed, 0x5b, 0xcc, 0xb6, 0xac, 0xdb,
-  0xf2, 0xa1, 0x36, 0xa3, 0xf6, 0x7a, 0x9d, 0x7f, 0x5d, 0xcb, 0x56, 0xfd, 0xad, 0xab, 0xb7, 0xbe,
-  0xd9, 0x26, 0xda, 0xd6, 0xbf, 0xdd, 0x77, 0x7b, 0xf3, 0x0e, 0x83, 0x1d, 0x15, 0x3b, 0xde, 0xef,
-  0x94, 0xec, 0xbc, 0xb5, 0x2b, 0x78, 0x57, 0x6b, 0xbd, 0x45, 0x7d, 0xf5, 0x6e, 0xd2, 0xee, 0x82,
-  0xdd, 0x8f, 0x1a, 0x62, 0x1b, 0xba, 0xbf, 0xe6, 0x7e, 0xdd, 0xb8, 0x47, 0x77, 0x4f, 0xc5, 0x9e,
-  0x8f, 0x7b, 0xa5, 0x7b, 0x07, 0xf6, 0x45, 0xef, 0xeb, 0x6a, 0x74, 0x6f, 0x6c, 0xdc, 0xaf, 0xbf,
-  0xbf, 0xb2, 0x09, 0x6d, 0x52, 0x36, 0x8d, 0x1e, 0x48, 0x3a, 0x70, 0xe5, 0x9b, 0x80, 0x6f, 0xda,
-  0x9b, 0xed, 0x9a, 0x77, 0xb5, 0x70, 0x5a, 0x2a, 0x0e, 0xc2, 0x41, 0xe5, 0xc1, 0x27, 0xdf, 0xa6,
-  0x7c, 0x7b, 0xe3, 0x50, 0xe8, 0xa1, 0xce, 0xc3, 0xdc, 0xc3, 0xcd, 0xdf, 0x99, 0x7f, 0xb7, 0xf5,
-  0x08, 0xeb, 0x48, 0x79, 0x2b, 0xd2, 0x3a, 0xbf, 0x75, 0xac, 0x2d, 0xa3, 0x6d, 0xa0, 0x3d, 0xa1,
-  0xbd, 0xef, 0xe8, 0x8c, 0xa3, 0x9d, 0x1d, 0x5e, 0x1d, 0x47, 0xbe, 0xb7, 0xff, 0x7e, 0xef, 0x31,
-  0xe3, 0x63, 0x75, 0xc7, 0x35, 0x8f, 0x57, 0x9e, 0xa0, 0x9d, 0x28, 0x3d, 0xf1, 0xf9, 0xe4, 0x82,
-  0x93, 0xe3, 0xa7, 0x64, 0xa7, 0x9e, 0x9d, 0x4e, 0x3f, 0x3d, 0xd4, 0x99, 0xdc, 0x79, 0xf7, 0x4c,
-  0xfc, 0x99, 0x6b, 0x5d, 0x51, 0x5d, 0xbd, 0x67, 0x43, 0xcf, 0x9e, 0x3f, 0x17, 0x74, 0xee, 0x4c,
-  0xb7, 0x5f, 0xf7, 0xc9, 0xf3, 0xde, 0xe7, 0x8f, 0x5d, 0xf0, 0xbc, 0x70, 0xf4, 0x22, 0xf7, 0x62,
-  0xdb, 0x25, 0xb7, 0x4b, 0xad, 0x3d, 0xae, 0x3d, 0x47, 0x7e, 0x70, 0xfd, 0xe1, 0x48, 0xaf, 0x5b,
-  0x6f, 0xeb, 0x65, 0xf7, 0xcb, 0xed, 0x57, 0x3c, 0xae, 0x74, 0xf4, 0x4d, 0xeb, 0x3b, 0xd1, 0xef,
-  0xd3, 0x7f, 0xfa, 0x6a, 0xc0, 0xd5, 0x73, 0xd7, 0xf8, 0xd7, 0x2e, 0x5d, 0x9f, 0x79, 0xbd, 0xef,
-  0xc6, 0xec, 0x1b, 0xb7, 0x6e, 0x26, 0xdd, 0x1c, 0xb8, 0x25, 0xba, 0xf5, 0xf8, 0x76, 0xf6, 0xed,
-  0x17, 0x77, 0x0a, 0xee, 0x4c, 0xdc, 0x5d, 0x7a, 0x8f, 0x78, 0xaf, 0xfc, 0xbe, 0xda, 0xfd, 0xea,
-  0x07, 0xfa, 0x0f, 0xea, 0x7f, 0xb4, 0xfe, 0xb1, 0x65, 0xc0, 0x6d, 0xe0, 0xf8, 0x60, 0xc0, 0x60,
-  0xcf, 0xc3, 0x59, 0x0f, 0xef, 0x0e, 0x09, 0x87, 0x9e, 0xfe, 0x94, 0xff, 0xd3, 0x87, 0xe1, 0xd2,
-  0x47, 0xcc, 0x47, 0xd5, 0x23, 0x46, 0x23, 0x8d, 0x8f, 0x9d, 0x1f, 0x1f, 0x1b, 0x0d, 0x1a, 0xbd,
-  0xf2, 0x64, 0xce, 0x93, 0xe1, 0xa7, 0xb2, 0xa7, 0x13, 0xcf, 0xca, 0x7e, 0x56, 0xff, 0x79, 0xeb,
-  0x73, 0xab, 0xe7, 0xdf, 0xfd, 0xe2, 0xfb, 0x4b, 0xcf, 0x58, 0xfc, 0xd8, 0xf0, 0x0b, 0xf9, 0x8b,
-  0xcf, 0xbf, 0xae, 0x79, 0xa9, 0xf3, 0x72, 0xef, 0xab, 0xa9, 0xaf, 0x3a, 0xc7, 0x23, 0xc7, 0x1f,
-  0xbc, 0xce, 0x79, 0x3d, 0xf1, 0xa6, 0xfc, 0xad, 0xce, 0xdb, 0x7d, 0xef, 0xb8, 0xef, 0xba, 0xdf,
-  0xc7, 0xbd, 0x1f, 0x99, 0x28, 0xfc, 0x40, 0xfe, 0x50, 0xf3, 0xd1, 0xfa, 0x63, 0xc7, 0xa7, 0xd0,
-  0x4f, 0xf7, 0x3e, 0xe7, 0x7c, 0xfe, 0xfc, 0x2f, 0xf7, 0x84, 0xf3, 0xfb, 0x80, 0x39, 0x25, 0x11,
-  0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x43,
-  0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00,
-  0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07,
-  0xdb, 0x0c, 0x0b, 0x11, 0x2e, 0x21, 0xfc, 0x56, 0xfc, 0x79, 0x00, 0x00, 0x02, 0x3d, 0x49, 0x44,
-  0x41, 0x54, 0x58, 0xc3, 0xe5, 0x97, 0xbf, 0x6e, 0x13, 0x41, 0x10, 0xc6, 0x7f, 0xb3, 0x67, 0x1b,
-  0x43, 0x0a, 0x84, 0x10, 0x02, 0x41, 0x43, 0xa4, 0xa4, 0xa0, 0xa5, 0x00, 0x29, 0xbc, 0x01, 0x15,
-  0x2f, 0x43, 0x03, 0xf8, 0x09, 0x68, 0x79, 0x00, 0x5a, 0x68, 0x78, 0x08, 0x1e, 0x81, 0x12, 0x24,
-  0x44, 0x81, 0x30, 0x45, 0x12, 0x0b, 0x13, 0xf0, 0x9f, 0xdd, 0x19, 0x9a, 0x9c, 0xb3, 0x77, 0xe7,
-  0xbb, 0xdb, 0x73, 0x1c, 0xa5, 0x60, 0xa4, 0xd3, 0xfa, 0xe6, 0xe4, 0xdd, 0xef, 0xe6, 0xfb, 0xe6,
-  0x1b, 0x5b, 0xcc, 0x8c, 0xcb, 0x0c, 0xc7, 0x25, 0x47, 0xaf, 0x9c, 0x10, 0x91, 0x5b, 0xc0, 0x5b,
-  0x60, 0x9c, 0xa7, 0xd8, 0xb9, 0x3d, 0xe6, 0xee, 0x41, 0x0f, 0x32, 0x21, 0xcb, 0x04, 0x5d, 0xe1,
-  0x17, 0x5c, 0x4f, 0x70, 0xe2, 0x10, 0x31, 0xd4, 0x09, 0x22, 0x42, 0x86, 0x80, 0x08, 0x86, 0xc3,
-  0x00, 0x61, 0xc0, 0x8d, 0xfb, 0xc7, 0x7c, 0x1c, 0xbd, 0x34, 0xb3, 0x65, 0x23, 0x00, 0xe0, 0x31,
-  0xf0, 0x1b, 0x78, 0x07, 0x04, 0x40, 0x39, 0xf9, 0xa9, 0x7c, 0xfe, 0x60, 0x80, 0x46, 0x97, 0x95,
-  0x3e, 0x97, 0xaf, 0x28, 0x3f, 0x80, 0x27, 0xa3, 0xf7, 0xc0, 0xa8, 0xb5, 0x02, 0xc0, 0x3d, 0xe0,
-  0x19, 0xf0, 0xe8, 0xf4, 0x7e, 0xc8, 0xf0, 0xe6, 0xf4, 0xd5, 0xc3, 0xc3, 0xfd, 0x4d, 0xcb, 0x6c,
-  0x2c, 0x58, 0xcc, 0x47, 0xf3, 0xd7, 0x4f, 0xdf, 0xdc, 0x01, 0xbe, 0xb5, 0x01, 0x50, 0xa0, 0x6f,
-  0x66, 0xbb, 0xdb, 0xe4, 0xfa, 0xc5, 0x81, 0x28, 0x57, 0xf6, 0x1e, 0x94, 0x01, 0xb8, 0x1a, 0x00,
-  0x5b, 0x6f, 0x0d, 0x27, 0x08, 0xb6, 0xd4, 0x14, 0x0a, 0x2c, 0x06, 0x20, 0x22, 0x1b, 0x83, 0x31,
-  0x33, 0x59, 0xed, 0x03, 0x10, 0x96, 0xbe, 0x1d, 0x40, 0x86, 0x11, 0xce, 0x00, 0x98, 0x99, 0x88,
-  0x88, 0xd8, 0x1a, 0xc3, 0x88, 0xf3, 0x22, 0x22, 0xa5, 0xc3, 0xab, 0xc0, 0xbd, 0x0f, 0x29, 0x3e,
-  0x90, 0x2b, 0xb8, 0x71, 0xb3, 0xfc, 0xc0, 0x7c, 0xb5, 0x14, 0x47, 0xb3, 0x59, 0x48, 0xa5, 0x40,
-  0xbb, 0x50, 0x50, 0x7a, 0xf9, 0x55, 0x2e, 0xa6, 0x00, 0x80, 0xe5, 0x9f, 0x04, 0x00, 0xa1, 0x08,
-  0xa0, 0xb2, 0x49, 0x3d, 0x88, 0x76, 0x0a, 0x16, 0x29, 0x00, 0x32, 0x94, 0x80, 0x9e, 0x43, 0x78,
-  0xf5, 0x15, 0x1b, 0xcc, 0x2d, 0x85, 0x02, 0x39, 0x75, 0xc0, 0x8d, 0xba, 0x20, 0x2e, 0x44, 0xa5,
-  0x7a, 0x27, 0x47, 0x49, 0x1a, 0x60, 0x13, 0x0a, 0x9a, 0xe8, 0x58, 0xc5, 0x6c, 0xa2, 0xa9, 0x5d,
-  0xe0, 0x93, 0x37, 0xed, 0x12, 0xfe, 0x48, 0x53, 0x44, 0xa8, 0x75, 0x14, 0x6c, 0x80, 0xa1, 0xf8,
-  0x85, 0x30, 0xd3, 0x14, 0x11, 0x42, 0x38, 0x03, 0x90, 0x53, 0x90, 0x9b, 0x4e, 0xbc, 0xc6, 0xa2,
-  0x5b, 0x57, 0xa1, 0x8a, 0x81, 0xf9, 0x69, 0x92, 0x11, 0x15, 0x2a, 0x50, 0x56, 0x77, 0xbc, 0xd6,
-  0x29, 0xbe, 0xb6, 0x13, 0x26, 0xdf, 0x97, 0x17, 0x62, 0x44, 0x75, 0x9d, 0x50, 0x11, 0xf0, 0xf4,
-  0xd0, 0xa7, 0x00, 0x28, 0x54, 0x20, 0x9f, 0x05, 0x6d, 0x6f, 0x57, 0x37, 0x2f, 0x0a, 0x71, 0x75,
-  0xa2, 0x9d, 0x2b, 0x90, 0xea, 0xf3, 0x4d, 0xf3, 0x62, 0xf5, 0x6c, 0x86, 0xa6, 0x3a, 0xa1, 0xdf,
-  0xc6, 0x38, 0xae, 0x68, 0xec, 0x1a, 0x96, 0xd2, 0x86, 0x21, 0xf6, 0x81, 0x26, 0x23, 0xaa, 0xf3,
-  0x86, 0xb8, 0x4b, 0x0a, 0xf1, 0x17, 0x4d, 0xd5, 0x80, 0x76, 0x72, 0xb8, 0xa6, 0x43, 0x8b, 0xae,
-  0xa0, 0x9d, 0x45, 0x98, 0x4a, 0x41, 0x7c, 0x76, 0x6d, 0x17, 0x74, 0x00, 0x60, 0xe7, 0x99, 0x05,
-  0x6b, 0x87, 0x8b, 0xa2, 0xeb, 0x00, 0xb8, 0x35, 0x65, 0x3a, 0x01, 0x86, 0xdb, 0xfe, 0x51, 0xaa,
-  0x46, 0x20, 0x23, 0xc1, 0x09, 0x77, 0xf8, 0x74, 0x11, 0x00, 0x7c, 0x60, 0x41, 0x8f, 0xf6, 0x71,
-  0x6c, 0x13, 0x3b, 0x16, 0x91, 0xaf, 0x22, 0x32, 0x06, 0x06, 0x80, 0xe3, 0xfa, 0xde, 0x8f, 0xe7,
-  0xfb, 0x5f, 0x76, 0x7b, 0x7d, 0x06, 0x4e, 0x48, 0x1e, 0x49, 0x6a, 0x98, 0x1a, 0xea, 0x95, 0x85,
-  0x37, 0x7e, 0xd1, 0xaf, 0x02, 0x90, 0xff, 0xfe, 0xdf, 0xf1, 0x3f, 0x19, 0x1f, 0x49, 0x59, 0x7e,
-  0x89, 0x43, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-
-/* logbook.png - 1023 bytes */
-static const unsigned char logbook_png[] = {
-  0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-  0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
-  0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
-  0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x43, 0xbb, 0x7f,
-  0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, 0xd7,
-  0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xdb, 0x0c,
-  0x0b, 0x11, 0x24, 0x26, 0x98, 0xdd, 0x81, 0x50, 0x00, 0x00, 0x03, 0x7f, 0x49, 0x44, 0x41, 0x54,
-  0x58, 0xc3, 0xb5, 0x97, 0x3d, 0x8f, 0xdc, 0x44, 0x18, 0xc7, 0x7f, 0xcf, 0x78, 0xf6, 0xe5, 0xf6,
-  0x72, 0x9b, 0x40, 0x14, 0x88, 0xa0, 0x08, 0x81, 0xa4, 0xa0, 0x89, 0x04, 0x48, 0x04, 0x85, 0x86,
-  0x82, 0x8a, 0x8a, 0x0f, 0x42, 0x4b, 0x03, 0xdc, 0x27, 0xa0, 0xe5, 0x03, 0xd0, 0x42, 0x43, 0x47,
-  0x45, 0x81, 0x44, 0x93, 0x06, 0xa4, 0x88, 0x12, 0x42, 0x2a, 0xc4, 0x41, 0xee, 0x8e, 0xe3, 0xf6,
-  0xf6, 0xcd, 0xeb, 0x99, 0x87, 0xc2, 0xe3, 0x59, 0x7b, 0x6d, 0x6f, 0x36, 0x9b, 0xec, 0x48, 0xab,
-  0x5d, 0xdb, 0x2b, 0xff, 0x7f, 0xfe, 0x3f, 0x6f, 0x63, 0x51, 0x55, 0x44, 0xa4, 0x0b, 0xdc, 0x01,
-  0x5e, 0x02, 0xfa, 0xec, 0x76, 0xcd, 0x80, 0xc7, 0xc0, 0x03, 0x55, 0x4d, 0x05, 0xe8, 0x01, 0x1f,
-  0x86, 0x93, 0x7f, 0x00, 0xe7, 0x3b, 0x06, 0x18, 0x02, 0xaf, 0x03, 0xd7, 0x80, 0x1f, 0x04, 0xb8,
-  0x4b, 0x07, 0x61, 0xc1, 0xcf, 0xe1, 0x0f, 0x57, 0x80, 0xaf, 0x81, 0xa3, 0x70, 0x2c, 0xec, 0xbf,
-  0x7c, 0xc4, 0x2b, 0xf7, 0x2c, 0x24, 0x42, 0x92, 0x08, 0xbe, 0xb8, 0x97, 0x11, 0x8c, 0x15, 0x8c,
-  0x18, 0x44, 0x14, 0x6f, 0x04, 0x11, 0x21, 0x41, 0x40, 0x04, 0xc5, 0xa0, 0x80, 0xd0, 0xe5, 0x85,
-  0xd7, 0xfe, 0xe5, 0xa7, 0xc3, 0xcf, 0x23, 0x46, 0x87, 0x77, 0x58, 0xa0, 0x96, 0x84, 0xeb, 0x2c,
-  0xb8, 0x0f, 0x98, 0x70, 0xe9, 0x2e, 0x70, 0x01, 0x7c, 0x03, 0x38, 0xc0, 0x33, 0xfe, 0xdb, 0xf3,
-  0xdb, 0x77, 0x0a, 0xf8, 0xd2, 0x47, 0x57, 0x7e, 0xaf, 0x7e, 0x4a, 0xe7, 0xbb, 0xf0, 0xfe, 0xe1,
-  0xb7, 0xc0, 0x61, 0x04, 0x58, 0xf0, 0x88, 0x84, 0xf7, 0x2c, 0x8e, 0x7d, 0x60, 0x5c, 0x02, 0x78,
-  0x15, 0xf8, 0x18, 0x78, 0x37, 0x1c, 0xf7, 0xe9, 0x5f, 0x1d, 0x7d, 0xf1, 0xf6, 0xc9, 0xed, 0x6d,
-  0x3d, 0x57, 0x52, 0xd2, 0xf9, 0xe1, 0xfc, 0xcb, 0x8f, 0xbe, 0xba, 0xce, 0xf7, 0x9f, 0xfc, 0x13,
-  0x4e, 0x8f, 0x71, 0xec, 0x5b, 0xc0, 0xf0, 0x22, 0x86, 0x53, 0x34, 0x5c, 0xf0, 0x40, 0x47, 0x55,
-  0x6f, 0x3e, 0xcf, 0xc0, 0x7f, 0x76, 0x4f, 0x3c, 0xbd, 0x5b, 0x6f, 0x02, 0xc7, 0x00, 0x41, 0xd3,
-  0xe4, 0x00, 0x1e, 0x13, 0xec, 0xa2, 0x64, 0xdd, 0x73, 0x5d, 0x46, 0x10, 0x74, 0xe1, 0xa3, 0xd3,
-  0xb9, 0xa6, 0xb1, 0x24, 0x35, 0x00, 0x2d, 0x03, 0x88, 0xc8, 0xd6, 0x30, 0xaa, 0x2a, 0xf1, 0x3e,
-  0x00, 0x6e, 0x91, 0x55, 0x00, 0x92, 0xc2, 0x01, 0x2d, 0x01, 0x24, 0x28, 0x6e, 0x09, 0xa0, 0xaa,
-  0x22, 0x22, 0xa2, 0xaa, 0x35, 0x90, 0xf2, 0x79, 0x11, 0x91, 0x15, 0xf1, 0x3a, 0x78, 0x96, 0xb9,
-  0x08, 0xa0, 0x85, 0x03, 0x05, 0xc0, 0x41, 0x10, 0x9d, 0xc4, 0x0c, 0x5e, 0x7b, 0xb3, 0x42, 0xb0,
-  0x80, 0xd0, 0x40, 0xba, 0xde, 0x92, 0x99, 0xe3, 0x60, 0x15, 0x40, 0x57, 0x1c, 0xa0, 0x0a, 0xb0,
-  0x49, 0x08, 0x9a, 0x74, 0x45, 0xa4, 0x12, 0x82, 0xbc, 0xf4, 0x26, 0x2e, 0x68, 0x51, 0xe8, 0xd6,
-  0x43, 0xe0, 0xaa, 0x00, 0xb5, 0x9b, 0xb4, 0x43, 0x3c, 0x39, 0x04, 0xe9, 0x0a, 0x00, 0x18, 0x03,
-  0x18, 0xfa, 0x01, 0x42, 0x31, 0x24, 0xb1, 0xb9, 0x6c, 0x9b, 0x78, 0xda, 0x28, 0x0e, 0xd0, 0x9d,
-  0x6b, 0xd4, 0xe9, 0xaf, 0xe6, 0x80, 0xc6, 0x10, 0x48, 0xe8, 0x80, 0x5b, 0x55, 0x41, 0xd9, 0x88,
-  0x9a, 0x7b, 0xe3, 0xd3, 0x9a, 0x03, 0x79, 0x19, 0x56, 0x73, 0x80, 0x6d, 0x42, 0xb0, 0x2e, 0x1c,
-  0xcb, 0x39, 0x78, 0xe6, 0x2b, 0x55, 0x50, 0x29, 0xc3, 0x5e, 0x00, 0x48, 0x51, 0x20, 0x5b, 0x57,
-  0x72, 0x5b, 0xaf, 0xec, 0xd4, 0xd3, 0xab, 0x97, 0xa1, 0x00, 0xc2, 0x2c, 0xef, 0x15, 0x38, 0x7c,
-  0x5b, 0x08, 0x9e, 0x54, 0x65, 0x4d, 0x66, 0x54, 0x8e, 0xdc, 0xcc, 0x47, 0x9d, 0x5e, 0xae, 0x6b,
-  0xc3, 0x16, 0x41, 0xd9, 0x8b, 0x53, 0x0a, 0xdc, 0x12, 0xa0, 0x08, 0x41, 0xe1, 0x40, 0xf9, 0xbb,
-  0x9c, 0xed, 0x4d, 0xb6, 0xd7, 0x5c, 0xcb, 0x46, 0x2e, 0x6e, 0x77, 0xa6, 0xb9, 0xe3, 0x16, 0x87,
-  0x32, 0x08, 0x10, 0xcb, 0xf8, 0xbb, 0xa6, 0xec, 0x6e, 0xfa, 0x6e, 0xab, 0x84, 0xc6, 0x3c, 0x38,
-  0xfb, 0x73, 0x11, 0x75, 0xfa, 0xc0, 0x08, 0xb5, 0x80, 0x32, 0x47, 0x23, 0xd9, 0xe2, 0xe9, 0x1b,
-  0x51, 0x5b, 0x25, 0xd4, 0x12, 0x78, 0x74, 0x92, 0x45, 0x9d, 0x1c, 0x24, 0x00, 0x80, 0x22, 0xcd,
-  0x0e, 0x14, 0xb3, 0x60, 0x6d, 0x83, 0xd9, 0x34, 0x49, 0xf7, 0xce, 0x7c, 0x65, 0x9b, 0x10, 0x01,
-  0xfa, 0x28, 0xb3, 0xf8, 0xd4, 0x1b, 0xcd, 0x82, 0xb6, 0x10, 0x35, 0x95, 0x63, 0xbc, 0x36, 0x2b,
-  0xdd, 0xb7, 0x8f, 0x90, 0xe6, 0x5b, 0x32, 0x65, 0x8e, 0x67, 0x10, 0x5b, 0xb1, 0xc7, 0x2d, 0xcb,
-  0xf0, 0x59, 0xc6, 0x71, 0x69, 0x97, 0x95, 0xaf, 0x41, 0xa9, 0xd7, 0x4c, 0xf0, 0x24, 0xa8, 0xc5,
-  0xe1, 0x39, 0x40, 0x99, 0x06, 0xba, 0xbc, 0x02, 0xb2, 0x4d, 0x1a, 0x51, 0x5b, 0xc3, 0x69, 0x4d,
-  0xc2, 0x69, 0xc9, 0x81, 0x3d, 0x84, 0x33, 0xbc, 0x05, 0x3c, 0x33, 0x3c, 0xcb, 0xbd, 0x6e, 0xeb,
-  0x2c, 0x58, 0x37, 0x6e, 0x37, 0x1a, 0xc7, 0xa5, 0xfd, 0x74, 0xe8, 0x07, 0x01, 0x60, 0x82, 0xe3,
-  0x52, 0x05, 0xe0, 0xa9, 0x67, 0x41, 0x59, 0xbb, 0xb5, 0x0a, 0xca, 0x00, 0xf9, 0x36, 0xd8, 0x5b,
-  0x24, 0x88, 0x57, 0x1d, 0xd0, 0x67, 0x99, 0x05, 0x4d, 0xcb, 0xfb, 0x8a, 0x06, 0x5c, 0x02, 0xa6,
-  0xb8, 0xdc, 0x01, 0xc1, 0x93, 0x84, 0xa7, 0x16, 0xc6, 0xbb, 0x78, 0x3d, 0xf3, 0x8a, 0x8b, 0x1a,
-  0x44, 0x8f, 0xbd, 0xc1, 0x71, 0x41, 0xc6, 0x00, 0x8b, 0x23, 0x7f, 0x4b, 0xf8, 0x75, 0x17, 0x00,
-  0x99, 0x23, 0x8d, 0x1a, 0x16, 0x47, 0xc6, 0x00, 0xc7, 0x85, 0xc5, 0x72, 0xcc, 0x94, 0x1b, 0x5c,
-  0xe1, 0x24, 0xbc, 0x32, 0x39, 0xfe, 0xe3, 0x91, 0x88, 0x1c, 0x01, 0x5d, 0xc0, 0x70, 0xf9, 0xd6,
-  0x5f, 0x9f, 0xde, 0xfe, 0xfd, 0xa6, 0xed, 0xd0, 0x35, 0xc2, 0xc6, 0x23, 0xc9, 0x2b, 0xea, 0x15,
-  0x9f, 0x79, 0xd2, 0x4c, 0x39, 0xa7, 0x53, 0x72, 0x60, 0xca, 0x0d, 0x2c, 0xc7, 0x02, 0x0c, 0x49,
-  0xf8, 0x00, 0xe1, 0x31, 0x19, 0x0f, 0x81, 0xd1, 0x8e, 0x5f, 0x4e, 0x0f, 0xb0, 0xbc, 0x81, 0x72,
-  0x0d, 0xc7, 0x8f, 0xa2, 0xaa, 0xc8, 0x55, 0x19, 0x32, 0xe1, 0x2d, 0x66, 0x0c, 0xc3, 0x53, 0xef,
-  0x72, 0xa5, 0x58, 0x46, 0x0c, 0xf9, 0x45, 0x4f, 0xf4, 0xfc, 0x7f, 0x56, 0x29, 0xf1, 0xee, 0xd8,
-  0xf8, 0x3c, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82};
-
-	{
-		wxMemoryInputStream sm(logbook_pi_png,sizeof(logbook_pi_png));
-		_img_logbook_pi = new wxBitmap(wxImage(sm));
-	}
-	{
-		wxMemoryInputStream sm(logbook_png,sizeof(logbook_png));
-		_img_logbook = new wxBitmap(wxImage(sm));
-	}
-
-static unsigned char Bullet_green[] = {
-0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 
-0x08, 0x06, 0x00, 0x00, 0x00, 0x8d, 0x32, 0xcf, 0xbd, 0x00, 0x00, 0x00, 
-0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00, 0x00, 0x0b, 
-0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, 0x01, 0x1f, 0x49, 0x44, 
-0x41, 0x54, 0x78, 0x9c, 0x65, 0xd0, 0xbf, 0x4b, 0x02, 0x01, 0x18, 0xc6, 
-0xf1, 0xf7, 0x4f, 0xba, 0x45, 0x04, 0xa7, 0x13, 0x6e, 0x53, 0x04, 0xd1, 
-0xe5, 0xe4, 0x14, 0xe1, 0xe0, 0xce, 0x93, 0x3b, 0x3c, 0x75, 0x90, 0x14, 
-0x17, 0x91, 0x86, 0x96, 0xc0, 0x2d, 0x08, 0x21, 0x68, 0x88, 0xa4, 0x9a, 
-0x43, 0x9d, 0x84, 0x08, 0x21, 0x84, 0x44, 0x70, 0x88, 0x82, 0x70, 0x28, 
-0x10, 0x02, 0xa1, 0x1f, 0x74, 0xc5, 0xb7, 0xc1, 0x0c, 0x42, 0x1e, 0xde, 
-0xe9, 0xf9, 0xf0, 0x0e, 0x8f, 0x00, 0x02, 0x48, 0x40, 0xc0, 0x94, 0x29, 
-0x83, 0xaf, 0x01, 0xa3, 0xb7, 0x11, 0xcb, 0xcf, 0x25, 0x9b, 0x0e, 0x10, 
-0x01, 0x64, 0xc6, 0x8c, 0x06, 0x0d, 0x5c, 0x5c, 0x6c, 0x6c, 0xf2, 0x2f, 
-0x79, 0xd2, 0x37, 0x69, 0x3a, 0x93, 0x0e, 0xc1, 0x77, 0x00, 0x20, 0x32, 
-0x67, 0x4e, 0xf9, 0x37, 0x25, 0x4a, 0xd8, 0x81, 0x8d, 0xb1, 0x30, 0x48, 
-0x4d, 0x52, 0x44, 0x8f, 0xa3, 0xd4, 0x2f, 0xea, 0x6b, 0xd8, 0xa2, 0x85, 
-0x8f, 0x4f, 0x95, 0x2a, 0x3e, 0x3e, 0x56, 0x60, 0xa1, 0xdf, 0xeb, 0xc4, 
-0x2e, 0x63, 0xa8, 0x5d, 0x15, 0xa5, 0xa6, 0x30, 0xbe, 0x1b, 0x23, 0x0e, 
-0x0e, 0x1e, 0x1e, 0x65, 0xca, 0x54, 0xa8, 0x50, 0x78, 0x2d, 0x90, 0xbc, 
-0x4e, 0xa2, 0x1e, 0xa9, 0x84, 0xda, 0x21, 0x94, 0x9a, 0x42, 0xfb, 0xbc, 
-0x8d, 0x98, 0x1f, 0x26, 0x56, 0x60, 0x51, 0xa4, 0x88, 0x87, 0x87, 0xf5, 
-0x64, 0x11, 0xda, 0x5d, 0x83, 0xcd, 0xb9, 0x5d, 0x17, 0xd1, 0x1f, 0x74, 
-0x32, 0x8f, 0x19, 0xb2, 0xcf, 0x59, 0x8c, 0x85, 0xb1, 0x85, 0x94, 0x9a, 
-0x42, 0xf3, 0xb4, 0x89, 0xe4, 0xae, 0x72, 0x24, 0x46, 0x09, 0xe2, 0xc3, 
-0x38, 0xda, 0x99, 0x46, 0x78, 0x2f, 0xbc, 0x05, 0xfb, 0xb7, 0x7d, 0x64, 
-0xb8, 0x18, 0xa2, 0x9d, 0x68, 0x44, 0xf6, 0x23, 0xeb, 0x62, 0xe7, 0x3f, 
-0x32, 0x0f, 0x4c, 0xfe, 0x76, 0xec, 0x4d, 0x7a, 0x84, 0x1b, 0xdb, 0x9f, 
-0x9c, 0x43, 0x87, 0xd5, 0xfb, 0x0a, 0x40, 0x7e, 0x00, 0x57, 0x28, 0x02, 
-0x1e, 0xf4, 0x28, 0xf9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 
-0x44, 0xae, 0x42, 0x60, 0x82, 
-};
-
-
-	{
-		wxMemoryInputStream sm(Bullet_green,sizeof(Bullet_green));
-		_img_Bullet_green = new wxBitmap(wxImage(sm));
-	}
-
-static unsigned char Bullet_red[] = {
-0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 
-0x08, 0x06, 0x00, 0x00, 0x00, 0x8d, 0x32, 0xcf, 0xbd, 0x00, 0x00, 0x00, 
-0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00, 0x00, 0x0b, 
-0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, 0x00, 0xe1, 0x49, 0x44, 
-0x41, 0x54, 0x78, 0x9c, 0x6d, 0xd0, 0xbf, 0x4a, 0x42, 0x71, 0x14, 0xc0, 
-0xf1, 0x2f, 0xe8, 0xe2, 0x23, 0xdc, 0x07, 0xf0, 0x3d, 0xdc, 0x04, 0x9f, 
-0xc0, 0xd1, 0x51, 0x7c, 0x01, 0x89, 0xd6, 0x68, 0x68, 0x09, 0xc1, 0x25, 
-0x08, 0x31, 0x6c, 0x90, 0xb0, 0x5a, 0x74, 0x08, 0xcc, 0x25, 0x88, 0x96, 
-0xb8, 0xd0, 0x1c, 0x05, 0xe9, 0x50, 0x53, 0x2e, 0x95, 0xde, 0x8a, 0x6f, 
-0xc3, 0xfd, 0xdd, 0x4b, 0x58, 0xc3, 0x81, 0xf3, 0xe7, 0xc3, 0xe1, 0x70, 
-0x50, 0x51, 0x71, 0xbd, 0xd6, 0xf1, 0xd8, 0xaf, 0x4e, 0xc7, 0xf7, 0x7e, 
-0xdf, 0x64, 0x3e, 0x37, 0x9f, 0x29, 0x69, 0x32, 0x99, 0x68, 0x14, 0xa5, 
-0x25, 0xf8, 0x0a, 0xde, 0x16, 0x0a, 0xc6, 0xad, 0x96, 0xdf, 0x49, 0x62, 
-0x0a, 0xa7, 0x53, 0x2d, 0x16, 0x73, 0xf4, 0x09, 0x2e, 0xc0, 0x18, 0x3c, 
-0x06, 0xcf, 0xeb, 0xf5, 0x00, 0xcb, 0xe5, 0x1c, 0x65, 0xf0, 0x01, 0xbc, 
-0x00, 0x7b, 0x60, 0x1b, 0xbc, 0x9f, 0xcd, 0xe4, 0x37, 0x12, 0x7c, 0x03, 
-0x6f, 0xc0, 0x23, 0x70, 0x27, 0xc0, 0xb3, 0x66, 0x53, 0x56, 0x61, 0x4b, 
-0x06, 0x9f, 0xc1, 0xdd, 0x00, 0xb2, 0xe8, 0xd5, 0x6a, 0xf2, 0x08, 0x3e, 
-0x81, 0x2f, 0xe1, 0xb6, 0x4d, 0xd4, 0x06, 0x4f, 0x1a, 0x0d, 0xb9, 0x8e, 
-0x22, 0xaf, 0xc0, 0x4b, 0xf0, 0x14, 0xdc, 0xfb, 0x07, 0xde, 0x8d, 0x46, 
-0xb2, 0x18, 0x0c, 0x1c, 0x82, 0xfb, 0xa1, 0xb9, 0xb5, 0x81, 0x0e, 0x2a, 
-0x15, 0xf3, 0x3f, 0xc6, 0xdd, 0xae, 0xdb, 0xa5, 0xd2, 0x9f, 0x4d, 0x87, 
-0xd5, 0xaa, 0x1f, 0xcb, 0xa5, 0x2a, 0x3f, 0x8b, 0xc0, 0xd5, 0x5b, 0x5f, 
-0xfb, 0xcc, 0xea, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 
-0x42, 0x60, 0x82, 
-};
-
-	{
-		wxMemoryInputStream sm(Bullet_red,sizeof(Bullet_red));
-		_img_Bullet_red = new wxBitmap(wxImage(sm));
-	}
-
-static unsigned char Bullet_yellow[] = {
-0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
-0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 
-0x08, 0x06, 0x00, 0x00, 0x00, 0x8d, 0x32, 0xcf, 0xbd, 0x00, 0x00, 0x00, 
-0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00, 0x00, 0x0b, 
-0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, 0x01, 0x20, 0x49, 0x44, 
-0x41, 0x54, 0x78, 0x9c, 0x65, 0xd0, 0xb1, 0x4b, 0x02, 0x71, 0x18, 0xc6, 
-0xf1, 0xdf, 0x9f, 0x74, 0x4b, 0x04, 0x4d, 0x06, 0x6e, 0x45, 0x10, 0xb5, 
-0x18, 0x16, 0x81, 0x70, 0x66, 0x28, 0x59, 0x5d, 0x5c, 0x25, 0x41, 0x94, 
-0x38, 0x44, 0x10, 0x34, 0x04, 0x89, 0x48, 0x81, 0x83, 0x54, 0xd6, 0xd2, 
-0x50, 0x94, 0x04, 0x09, 0x21, 0x92, 0x1c, 0x15, 0x41, 0x52, 0x29, 0xd8, 
-0x41, 0x09, 0x41, 0x20, 0x6a, 0xa7, 0x67, 0x7c, 0x1b, 0x3c, 0x0b, 0x71, 
-0x78, 0xe0, 0x81, 0xf7, 0xc3, 0x33, 0xbc, 0x02, 0x10, 0xad, 0x98, 0xc0, 
-0x03, 0xcd, 0xc6, 0x25, 0xb5, 0x4a, 0x8a, 0x46, 0xfd, 0x93, 0xff, 0x1b, 
-0xc2, 0x2a, 0x8f, 0x40, 0x00, 0xf0, 0x42, 0xdd, 0xcd, 0x57, 0x69, 0x92, 
-0x6c, 0x7a, 0x14, 0xed, 0x76, 0x9b, 0x9f, 0xa6, 0x89, 0x05, 0x9f, 0x80, 
-0x59, 0x2b, 0x33, 0x98, 0x86, 0x1b, 0xbd, 0xe0, 0x44, 0xcb, 0x8c, 0x10, 
-0xdb, 0xeb, 0xe7, 0x24, 0xb1, 0xdc, 0x86, 0x6b, 0x80, 0x1f, 0x98, 0x07, 
-0xfc, 0x98, 0x86, 0x4c, 0x3e, 0xe7, 0xe0, 0xfc, 0x74, 0x80, 0x68, 0xd8, 
-0x86, 0xaa, 0x48, 0xbc, 0x3c, 0x67, 0x10, 0xe0, 0x01, 0x7c, 0xd6, 0xe2, 
-0x1c, 0xd5, 0xca, 0x14, 0xe9, 0xd4, 0x30, 0xfb, 0x51, 0x1b, 0xc1, 0xd5, 
-0x1e, 0x54, 0x45, 0xe2, 0xf8, 0x28, 0x88, 0x30, 0xca, 0x2e, 0xcc, 0xaa, 
-0x0c, 0xe6, 0x34, 0xe0, 0xe3, 0xe3, 0x5d, 0x26, 0xb4, 0xde, 0x02, 0xed, 
-0x44, 0x23, 0x5e, 0x44, 0x21, 0xe7, 0xa0, 0xf8, 0x3a, 0x46, 0xe9, 0x6d, 
-0x1c, 0x3d, 0xef, 0x24, 0x14, 0xec, 0x44, 0xaa, 0x22, 0x71, 0x10, 0x5f, 
-0x41, 0xdc, 0x5c, 0x4f, 0x90, 0xba, 0x1a, 0x22, 0x79, 0x36, 0x48, 0x22, 
-0x6e, 0x67, 0x23, 0xd4, 0xdb, 0x05, 0xef, 0xef, 0x2e, 0x10, 0x7a, 0x31, 
-0x49, 0x3c, 0x66, 0x67, 0x6b, 0xb3, 0x0f, 0x55, 0x91, 0x58, 0x5a, 0xe8, 
-0x44, 0xbb, 0x3b, 0x2e, 0xfe, 0xfe, 0xa8, 0x65, 0x0f, 0x09, 0x2c, 0x76, 
-0x2f, 0x45, 0xc2, 0x1e, 0xbe, 0x6b, 0x65, 0x00, 0xf1, 0x0b, 0xfb, 0x12, 
-0x21, 0x2e, 0x20, 0xdf, 0x1c, 0xdd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 
-0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 
-};
-
-	{
-		wxMemoryInputStream sm(Bullet_yellow,sizeof(Bullet_yellow));
-		_img_Bullet_yellow = new wxBitmap(wxImage(sm));
-	}
+    /* logbook_pi.png - 3327 bytes */
+    static const unsigned char logbook_pi_png[] =
+    {
+        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+        0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+        0xf4, 0x00, 0x00, 0x0a, 0x43, 0x69, 0x43, 0x43, 0x50, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6f,
+        0x66, 0x69, 0x6c, 0x65, 0x00, 0x00, 0x78, 0xda, 0x9d, 0x53, 0x77, 0x58, 0x93, 0xf7, 0x16, 0x3e,
+        0xdf, 0xf7, 0x65, 0x0f, 0x56, 0x42, 0xd8, 0xf0, 0xb1, 0x97, 0x6c, 0x81, 0x00, 0x22, 0x23, 0xac,
+        0x08, 0xc8, 0x10, 0x59, 0xa2, 0x10, 0x92, 0x00, 0x61, 0x84, 0x10, 0x12, 0x40, 0xc5, 0x85, 0x88,
+        0x0a, 0x56, 0x14, 0x15, 0x11, 0x9c, 0x48, 0x55, 0xc4, 0x82, 0xd5, 0x0a, 0x48, 0x9d, 0x88, 0xe2,
+        0xa0, 0x28, 0xb8, 0x67, 0x41, 0x8a, 0x88, 0x5a, 0x8b, 0x55, 0x5c, 0x38, 0xee, 0x1f, 0xdc, 0xa7,
+        0xb5, 0x7d, 0x7a, 0xef, 0xed, 0xed, 0xfb, 0xd7, 0xfb, 0xbc, 0xe7, 0x9c, 0xe7, 0xfc, 0xce, 0x79,
+        0xcf, 0x0f, 0x80, 0x11, 0x12, 0x26, 0x91, 0xe6, 0xa2, 0x6a, 0x00, 0x39, 0x52, 0x85, 0x3c, 0x3a,
+        0xd8, 0x1f, 0x8f, 0x4f, 0x48, 0xc4, 0xc9, 0xbd, 0x80, 0x02, 0x15, 0x48, 0xe0, 0x04, 0x20, 0x10,
+        0xe6, 0xcb, 0xc2, 0x67, 0x05, 0xc5, 0x00, 0x00, 0xf0, 0x03, 0x79, 0x78, 0x7e, 0x74, 0xb0, 0x3f,
+        0xfc, 0x01, 0xaf, 0x6f, 0x00, 0x02, 0x00, 0x70, 0xd5, 0x2e, 0x24, 0x12, 0xc7, 0xe1, 0xff, 0x83,
+        0xba, 0x50, 0x26, 0x57, 0x00, 0x20, 0x91, 0x00, 0xe0, 0x22, 0x12, 0xe7, 0x0b, 0x01, 0x90, 0x52,
+        0x00, 0xc8, 0x2e, 0x54, 0xc8, 0x14, 0x00, 0xc8, 0x18, 0x00, 0xb0, 0x53, 0xb3, 0x64, 0x0a, 0x00,
+        0x94, 0x00, 0x00, 0x6c, 0x79, 0x7c, 0x42, 0x22, 0x00, 0xaa, 0x0d, 0x00, 0xec, 0xf4, 0x49, 0x3e,
+        0x05, 0x00, 0xd8, 0xa9, 0x93, 0xdc, 0x17, 0x00, 0xd8, 0xa2, 0x1c, 0xa9, 0x08, 0x00, 0x8d, 0x01,
+        0x00, 0x99, 0x28, 0x47, 0x24, 0x02, 0x40, 0xbb, 0x00, 0x60, 0x55, 0x81, 0x52, 0x2c, 0x02, 0xc0,
+        0xc2, 0x00, 0xa0, 0xac, 0x40, 0x22, 0x2e, 0x04, 0xc0, 0xae, 0x01, 0x80, 0x59, 0xb6, 0x32, 0x47,
+        0x02, 0x80, 0xbd, 0x05, 0x00, 0x76, 0x8e, 0x58, 0x90, 0x0f, 0x40, 0x60, 0x00, 0x80, 0x99, 0x42,
+        0x2c, 0xcc, 0x00, 0x20, 0x38, 0x02, 0x00, 0x43, 0x1e, 0x13, 0xcd, 0x03, 0x20, 0x4c, 0x03, 0xa0,
+        0x30, 0xd2, 0xbf, 0xe0, 0xa9, 0x5f, 0x70, 0x85, 0xb8, 0x48, 0x01, 0x00, 0xc0, 0xcb, 0x95, 0xcd,
+        0x97, 0x4b, 0xd2, 0x33, 0x14, 0xb8, 0x95, 0xd0, 0x1a, 0x77, 0xf2, 0xf0, 0xe0, 0xe2, 0x21, 0xe2,
+        0xc2, 0x6c, 0xb1, 0x42, 0x61, 0x17, 0x29, 0x10, 0x66, 0x09, 0xe4, 0x22, 0x9c, 0x97, 0x9b, 0x23,
+        0x13, 0x48, 0xe7, 0x03, 0x4c, 0xce, 0x0c, 0x00, 0x00, 0x1a, 0xf9, 0xd1, 0xc1, 0xfe, 0x38, 0x3f,
+        0x90, 0xe7, 0xe6, 0xe4, 0xe1, 0xe6, 0x66, 0xe7, 0x6c, 0xef, 0xf4, 0xc5, 0xa2, 0xfe, 0x6b, 0xf0,
+        0x6f, 0x22, 0x3e, 0x21, 0xf1, 0xdf, 0xfe, 0xbc, 0x8c, 0x02, 0x04, 0x00, 0x10, 0x4e, 0xcf, 0xef,
+        0xda, 0x5f, 0xe5, 0xe5, 0xd6, 0x03, 0x70, 0xc7, 0x01, 0xb0, 0x75, 0xbf, 0x6b, 0xa9, 0x5b, 0x00,
+        0xda, 0x56, 0x00, 0x68, 0xdf, 0xf9, 0x5d, 0x33, 0xdb, 0x09, 0xa0, 0x5a, 0x0a, 0xd0, 0x7a, 0xf9,
+        0x8b, 0x79, 0x38, 0xfc, 0x40, 0x1e, 0x9e, 0xa1, 0x50, 0xc8, 0x3c, 0x1d, 0x1c, 0x0a, 0x0b, 0x0b,
+        0xed, 0x25, 0x62, 0xa1, 0xbd, 0x30, 0xe3, 0x8b, 0x3e, 0xff, 0x33, 0xe1, 0x6f, 0xe0, 0x8b, 0x7e,
+        0xf6, 0xfc, 0x40, 0x1e, 0xfe, 0xdb, 0x7a, 0xf0, 0x00, 0x71, 0x9a, 0x40, 0x99, 0xad, 0xc0, 0xa3,
+        0x83, 0xfd, 0x71, 0x61, 0x6e, 0x76, 0xae, 0x52, 0x8e, 0xe7, 0xcb, 0x04, 0x42, 0x31, 0x6e, 0xf7,
+        0xe7, 0x23, 0xfe, 0xc7, 0x85, 0x7f, 0xfd, 0x8e, 0x29, 0xd1, 0xe2, 0x34, 0xb1, 0x5c, 0x2c, 0x15,
+        0x8a, 0xf1, 0x58, 0x89, 0xb8, 0x50, 0x22, 0x4d, 0xc7, 0x79, 0xb9, 0x52, 0x91, 0x44, 0x21, 0xc9,
+        0x95, 0xe2, 0x12, 0xe9, 0x7f, 0x32, 0xf1, 0x1f, 0x96, 0xfd, 0x09, 0x93, 0x77, 0x0d, 0x00, 0xac,
+        0x86, 0x4f, 0xc0, 0x4e, 0xb6, 0x07, 0xb5, 0xcb, 0x6c, 0xc0, 0x7e, 0xee, 0x01, 0x02, 0x8b, 0x0e,
+        0x58, 0xd2, 0x76, 0x00, 0x40, 0x7e, 0xf3, 0x2d, 0x8c, 0x1a, 0x0b, 0x91, 0x00, 0x10, 0x67, 0x34,
+        0x32, 0x79, 0xf7, 0x00, 0x00, 0x93, 0xbf, 0xf9, 0x8f, 0x40, 0x2b, 0x01, 0x00, 0xcd, 0x97, 0xa4,
+        0xe3, 0x00, 0x00, 0xbc, 0xe8, 0x18, 0x5c, 0xa8, 0x94, 0x17, 0x4c, 0xc6, 0x08, 0x00, 0x00, 0x44,
+        0xa0, 0x81, 0x2a, 0xb0, 0x41, 0x07, 0x0c, 0xc1, 0x14, 0xac, 0xc0, 0x0e, 0x9c, 0xc1, 0x1d, 0xbc,
+        0xc0, 0x17, 0x02, 0x61, 0x06, 0x44, 0x40, 0x0c, 0x24, 0xc0, 0x3c, 0x10, 0x42, 0x06, 0xe4, 0x80,
+        0x1c, 0x0a, 0xa1, 0x18, 0x96, 0x41, 0x19, 0x54, 0xc0, 0x3a, 0xd8, 0x04, 0xb5, 0xb0, 0x03, 0x1a,
+        0xa0, 0x11, 0x9a, 0xe1, 0x10, 0xb4, 0xc1, 0x31, 0x38, 0x0d, 0xe7, 0xe0, 0x12, 0x5c, 0x81, 0xeb,
+        0x70, 0x17, 0x06, 0x60, 0x18, 0x9e, 0xc2, 0x18, 0xbc, 0x86, 0x09, 0x04, 0x41, 0xc8, 0x08, 0x13,
+        0x61, 0x21, 0x3a, 0x88, 0x11, 0x62, 0x8e, 0xd8, 0x22, 0xce, 0x08, 0x17, 0x99, 0x8e, 0x04, 0x22,
+        0x61, 0x48, 0x34, 0x92, 0x80, 0xa4, 0x20, 0xe9, 0x88, 0x14, 0x51, 0x22, 0xc5, 0xc8, 0x72, 0xa4,
+        0x02, 0xa9, 0x42, 0x6a, 0x91, 0x5d, 0x48, 0x23, 0xf2, 0x2d, 0x72, 0x14, 0x39, 0x8d, 0x5c, 0x40,
+        0xfa, 0x90, 0xdb, 0xc8, 0x20, 0x32, 0x8a, 0xfc, 0x8a, 0xbc, 0x47, 0x31, 0x94, 0x81, 0xb2, 0x51,
+        0x03, 0xd4, 0x02, 0x75, 0x40, 0xb9, 0xa8, 0x1f, 0x1a, 0x8a, 0xc6, 0xa0, 0x73, 0xd1, 0x74, 0x34,
+        0x0f, 0x5d, 0x80, 0x96, 0xa2, 0x6b, 0xd1, 0x1a, 0xb4, 0x1e, 0x3d, 0x80, 0xb6, 0xa2, 0xa7, 0xd1,
+        0x4b, 0xe8, 0x75, 0x74, 0x00, 0x7d, 0x8a, 0x8e, 0x63, 0x80, 0xd1, 0x31, 0x0e, 0x66, 0x8c, 0xd9,
+        0x61, 0x5c, 0x8c, 0x87, 0x45, 0x60, 0x89, 0x58, 0x1a, 0x26, 0xc7, 0x16, 0x63, 0xe5, 0x58, 0x35,
+        0x56, 0x8f, 0x35, 0x63, 0x1d, 0x58, 0x37, 0x76, 0x15, 0x1b, 0xc0, 0x9e, 0x61, 0xef, 0x08, 0x24,
+        0x02, 0x8b, 0x80, 0x13, 0xec, 0x08, 0x5e, 0x84, 0x10, 0xc2, 0x6c, 0x82, 0x90, 0x90, 0x47, 0x58,
+        0x4c, 0x58, 0x43, 0xa8, 0x25, 0xec, 0x23, 0xb4, 0x12, 0xba, 0x08, 0x57, 0x09, 0x83, 0x84, 0x31,
+        0xc2, 0x27, 0x22, 0x93, 0xa8, 0x4f, 0xb4, 0x25, 0x7a, 0x12, 0xf9, 0xc4, 0x78, 0x62, 0x3a, 0xb1,
+        0x90, 0x58, 0x46, 0xac, 0x26, 0xee, 0x21, 0x1e, 0x21, 0x9e, 0x25, 0x5e, 0x27, 0x0e, 0x13, 0x5f,
+        0x93, 0x48, 0x24, 0x0e, 0xc9, 0x92, 0xe4, 0x4e, 0x0a, 0x21, 0x25, 0x90, 0x32, 0x49, 0x0b, 0x49,
+        0x6b, 0x48, 0xdb, 0x48, 0x2d, 0xa4, 0x53, 0xa4, 0x3e, 0xd2, 0x10, 0x69, 0x9c, 0x4c, 0x26, 0xeb,
+        0x90, 0x6d, 0xc9, 0xde, 0xe4, 0x08, 0xb2, 0x80, 0xac, 0x20, 0x97, 0x91, 0xb7, 0x90, 0x0f, 0x90,
+        0x4f, 0x92, 0xfb, 0xc9, 0xc3, 0xe4, 0xb7, 0x14, 0x3a, 0xc5, 0x88, 0xe2, 0x4c, 0x09, 0xa2, 0x24,
+        0x52, 0xa4, 0x94, 0x12, 0x4a, 0x35, 0x65, 0x3f, 0xe5, 0x04, 0xa5, 0x9f, 0x32, 0x42, 0x99, 0xa0,
+        0xaa, 0x51, 0xcd, 0xa9, 0x9e, 0xd4, 0x08, 0xaa, 0x88, 0x3a, 0x9f, 0x5a, 0x49, 0x6d, 0xa0, 0x76,
+        0x50, 0x2f, 0x53, 0x87, 0xa9, 0x13, 0x34, 0x75, 0x9a, 0x25, 0xcd, 0x9b, 0x16, 0x43, 0xcb, 0xa4,
+        0x2d, 0xa3, 0xd5, 0xd0, 0x9a, 0x69, 0x67, 0x69, 0xf7, 0x68, 0x2f, 0xe9, 0x74, 0xba, 0x09, 0xdd,
+        0x83, 0x1e, 0x45, 0x97, 0xd0, 0x97, 0xd2, 0x6b, 0xe8, 0x07, 0xe9, 0xe7, 0xe9, 0x83, 0xf4, 0x77,
+        0x0c, 0x0d, 0x86, 0x0d, 0x83, 0xc7, 0x48, 0x62, 0x28, 0x19, 0x6b, 0x19, 0x7b, 0x19, 0xa7, 0x18,
+        0xb7, 0x19, 0x2f, 0x99, 0x4c, 0xa6, 0x05, 0xd3, 0x97, 0x99, 0xc8, 0x54, 0x30, 0xd7, 0x32, 0x1b,
+        0x99, 0x67, 0x98, 0x0f, 0x98, 0x6f, 0x55, 0x58, 0x2a, 0xf6, 0x2a, 0x7c, 0x15, 0x91, 0xca, 0x12,
+        0x95, 0x3a, 0x95, 0x56, 0x95, 0x7e, 0x95, 0xe7, 0xaa, 0x54, 0x55, 0x73, 0x55, 0x3f, 0xd5, 0x79,
+        0xaa, 0x0b, 0x54, 0xab, 0x55, 0x0f, 0xab, 0x5e, 0x56, 0x7d, 0xa6, 0x46, 0x55, 0xb3, 0x50, 0xe3,
+        0xa9, 0x09, 0xd4, 0x16, 0xab, 0xd5, 0xa9, 0x1d, 0x55, 0xbb, 0xa9, 0x36, 0xae, 0xce, 0x52, 0x77,
+        0x52, 0x8f, 0x50, 0xcf, 0x51, 0x5f, 0xa3, 0xbe, 0x5f, 0xfd, 0x82, 0xfa, 0x63, 0x0d, 0xb2, 0x86,
+        0x85, 0x46, 0xa0, 0x86, 0x48, 0xa3, 0x54, 0x63, 0xb7, 0xc6, 0x19, 0x8d, 0x21, 0x16, 0xc6, 0x32,
+        0x65, 0xf1, 0x58, 0x42, 0xd6, 0x72, 0x56, 0x03, 0xeb, 0x2c, 0x6b, 0x98, 0x4d, 0x62, 0x5b, 0xb2,
+        0xf9, 0xec, 0x4c, 0x76, 0x05, 0xfb, 0x1b, 0x76, 0x2f, 0x7b, 0x4c, 0x53, 0x43, 0x73, 0xaa, 0x66,
+        0xac, 0x66, 0x91, 0x66, 0x9d, 0xe6, 0x71, 0xcd, 0x01, 0x0e, 0xc6, 0xb1, 0xe0, 0xf0, 0x39, 0xd9,
+        0x9c, 0x4a, 0xce, 0x21, 0xce, 0x0d, 0xce, 0x7b, 0x2d, 0x03, 0x2d, 0x3f, 0x2d, 0xb1, 0xd6, 0x6a,
+        0xad, 0x66, 0xad, 0x7e, 0xad, 0x37, 0xda, 0x7a, 0xda, 0xbe, 0xda, 0x62, 0xed, 0x72, 0xed, 0x16,
+        0xed, 0xeb, 0xda, 0xef, 0x75, 0x70, 0x9d, 0x40, 0x9d, 0x2c, 0x9d, 0xf5, 0x3a, 0x6d, 0x3a, 0xf7,
+        0x75, 0x09, 0xba, 0x36, 0xba, 0x51, 0xba, 0x85, 0xba, 0xdb, 0x75, 0xcf, 0xea, 0x3e, 0xd3, 0x63,
+        0xeb, 0x79, 0xe9, 0x09, 0xf5, 0xca, 0xf5, 0x0e, 0xe9, 0xdd, 0xd1, 0x47, 0xf5, 0x6d, 0xf4, 0xa3,
+        0xf5, 0x17, 0xea, 0xef, 0xd6, 0xef, 0xd1, 0x1f, 0x37, 0x30, 0x34, 0x08, 0x36, 0x90, 0x19, 0x6c,
+        0x31, 0x38, 0x63, 0xf0, 0xcc, 0x90, 0x63, 0xe8, 0x6b, 0x98, 0x69, 0xb8, 0xd1, 0xf0, 0x84, 0xe1,
+        0xa8, 0x11, 0xcb, 0x68, 0xba, 0x91, 0xc4, 0x68, 0xa3, 0xd1, 0x49, 0xa3, 0x27, 0xb8, 0x26, 0xee,
+        0x87, 0x67, 0xe3, 0x35, 0x78, 0x17, 0x3e, 0x66, 0xac, 0x6f, 0x1c, 0x62, 0xac, 0x34, 0xde, 0x65,
+        0xdc, 0x6b, 0x3c, 0x61, 0x62, 0x69, 0x32, 0xdb, 0xa4, 0xc4, 0xa4, 0xc5, 0xe4, 0xbe, 0x29, 0xcd,
+        0x94, 0x6b, 0x9a, 0x66, 0xba, 0xd1, 0xb4, 0xd3, 0x74, 0xcc, 0xcc, 0xc8, 0x2c, 0xdc, 0xac, 0xd8,
+        0xac, 0xc9, 0xec, 0x8e, 0x39, 0xd5, 0x9c, 0x6b, 0x9e, 0x61, 0xbe, 0xd9, 0xbc, 0xdb, 0xfc, 0x8d,
+        0x85, 0xa5, 0x45, 0x9c, 0xc5, 0x4a, 0x8b, 0x36, 0x8b, 0xc7, 0x96, 0xda, 0x96, 0x7c, 0xcb, 0x05,
+        0x96, 0x4d, 0x96, 0xf7, 0xac, 0x98, 0x56, 0x3e, 0x56, 0x79, 0x56, 0xf5, 0x56, 0xd7, 0xac, 0x49,
+        0xd6, 0x5c, 0xeb, 0x2c, 0xeb, 0x6d, 0xd6, 0x57, 0x6c, 0x50, 0x1b, 0x57, 0x9b, 0x0c, 0x9b, 0x3a,
+        0x9b, 0xcb, 0xb6, 0xa8, 0xad, 0x9b, 0xad, 0xc4, 0x76, 0x9b, 0x6d, 0xdf, 0x14, 0xe2, 0x14, 0x8f,
+        0x29, 0xd2, 0x29, 0xf5, 0x53, 0x6e, 0xda, 0x31, 0xec, 0xfc, 0xec, 0x0a, 0xec, 0x9a, 0xec, 0x06,
+        0xed, 0x39, 0xf6, 0x61, 0xf6, 0x25, 0xf6, 0x6d, 0xf6, 0xcf, 0x1d, 0xcc, 0x1c, 0x12, 0x1d, 0xd6,
+        0x3b, 0x74, 0x3b, 0x7c, 0x72, 0x74, 0x75, 0xcc, 0x76, 0x6c, 0x70, 0xbc, 0xeb, 0xa4, 0xe1, 0x34,
+        0xc3, 0xa9, 0xc4, 0xa9, 0xc3, 0xe9, 0x57, 0x67, 0x1b, 0x67, 0xa1, 0x73, 0x9d, 0xf3, 0x35, 0x17,
+        0xa6, 0x4b, 0x90, 0xcb, 0x12, 0x97, 0x76, 0x97, 0x17, 0x53, 0x6d, 0xa7, 0x8a, 0xa7, 0x6e, 0x9f,
+        0x7a, 0xcb, 0x95, 0xe5, 0x1a, 0xee, 0xba, 0xd2, 0xb5, 0xd3, 0xf5, 0xa3, 0x9b, 0xbb, 0x9b, 0xdc,
+        0xad, 0xd9, 0x6d, 0xd4, 0xdd, 0xcc, 0x3d, 0xc5, 0x7d, 0xab, 0xfb, 0x4d, 0x2e, 0x9b, 0x1b, 0xc9,
+        0x5d, 0xc3, 0x3d, 0xef, 0x41, 0xf4, 0xf0, 0xf7, 0x58, 0xe2, 0x71, 0xcc, 0xe3, 0x9d, 0xa7, 0x9b,
+        0xa7, 0xc2, 0xf3, 0x90, 0xe7, 0x2f, 0x5e, 0x76, 0x5e, 0x59, 0x5e, 0xfb, 0xbd, 0x1e, 0x4f, 0xb3,
+        0x9c, 0x26, 0x9e, 0xd6, 0x30, 0x6d, 0xc8, 0xdb, 0xc4, 0x5b, 0xe0, 0xbd, 0xcb, 0x7b, 0x60, 0x3a,
+        0x3e, 0x3d, 0x65, 0xfa, 0xce, 0xe9, 0x03, 0x3e, 0xc6, 0x3e, 0x02, 0x9f, 0x7a, 0x9f, 0x87, 0xbe,
+        0xa6, 0xbe, 0x22, 0xdf, 0x3d, 0xbe, 0x23, 0x7e, 0xd6, 0x7e, 0x99, 0x7e, 0x07, 0xfc, 0x9e, 0xfb,
+        0x3b, 0xfa, 0xcb, 0xfd, 0x8f, 0xf8, 0xbf, 0xe1, 0x79, 0xf2, 0x16, 0xf1, 0x4e, 0x05, 0x60, 0x01,
+        0xc1, 0x01, 0xe5, 0x01, 0xbd, 0x81, 0x1a, 0x81, 0xb3, 0x03, 0x6b, 0x03, 0x1f, 0x04, 0x99, 0x04,
+        0xa5, 0x07, 0x35, 0x05, 0x8d, 0x05, 0xbb, 0x06, 0x2f, 0x0c, 0x3e, 0x15, 0x42, 0x0c, 0x09, 0x0d,
+        0x59, 0x1f, 0x72, 0x93, 0x6f, 0xc0, 0x17, 0xf2, 0x1b, 0xf9, 0x63, 0x33, 0xdc, 0x67, 0x2c, 0x9a,
+        0xd1, 0x15, 0xca, 0x08, 0x9d, 0x15, 0x5a, 0x1b, 0xfa, 0x30, 0xcc, 0x26, 0x4c, 0x1e, 0xd6, 0x11,
+        0x8e, 0x86, 0xcf, 0x08, 0xdf, 0x10, 0x7e, 0x6f, 0xa6, 0xf9, 0x4c, 0xe9, 0xcc, 0xb6, 0x08, 0x88,
+        0xe0, 0x47, 0x6c, 0x88, 0xb8, 0x1f, 0x69, 0x19, 0x99, 0x17, 0xf9, 0x7d, 0x14, 0x29, 0x2a, 0x32,
+        0xaa, 0x2e, 0xea, 0x51, 0xb4, 0x53, 0x74, 0x71, 0x74, 0xf7, 0x2c, 0xd6, 0xac, 0xe4, 0x59, 0xfb,
+        0x67, 0xbd, 0x8e, 0xf1, 0x8f, 0xa9, 0x8c, 0xb9, 0x3b, 0xdb, 0x6a, 0xb6, 0x72, 0x76, 0x67, 0xac,
+        0x6a, 0x6c, 0x52, 0x6c, 0x63, 0xec, 0x9b, 0xb8, 0x80, 0xb8, 0xaa, 0xb8, 0x81, 0x78, 0x87, 0xf8,
+        0x45, 0xf1, 0x97, 0x12, 0x74, 0x13, 0x24, 0x09, 0xed, 0x89, 0xe4, 0xc4, 0xd8, 0xc4, 0x3d, 0x89,
+        0xe3, 0x73, 0x02, 0xe7, 0x6c, 0x9a, 0x33, 0x9c, 0xe4, 0x9a, 0x54, 0x96, 0x74, 0x63, 0xae, 0xe5,
+        0xdc, 0xa2, 0xb9, 0x17, 0xe6, 0xe9, 0xce, 0xcb, 0x9e, 0x77, 0x3c, 0x59, 0x35, 0x59, 0x90, 0x7c,
+        0x38, 0x85, 0x98, 0x12, 0x97, 0xb2, 0x3f, 0xe5, 0x83, 0x20, 0x42, 0x50, 0x2f, 0x18, 0x4f, 0xe5,
+        0xa7, 0x6e, 0x4d, 0x1d, 0x13, 0xf2, 0x84, 0x9b, 0x85, 0x4f, 0x45, 0xbe, 0xa2, 0x8d, 0xa2, 0x51,
+        0xb1, 0xb7, 0xb8, 0x4a, 0x3c, 0x92, 0xe6, 0x9d, 0x56, 0x95, 0xf6, 0x38, 0xdd, 0x3b, 0x7d, 0x43,
+        0xfa, 0x68, 0x86, 0x4f, 0x46, 0x75, 0xc6, 0x33, 0x09, 0x4f, 0x52, 0x2b, 0x79, 0x91, 0x19, 0x92,
+        0xb9, 0x23, 0xf3, 0x4d, 0x56, 0x44, 0xd6, 0xde, 0xac, 0xcf, 0xd9, 0x71, 0xd9, 0x2d, 0x39, 0x94,
+        0x9c, 0x94, 0x9c, 0xa3, 0x52, 0x0d, 0x69, 0x96, 0xb4, 0x2b, 0xd7, 0x30, 0xb7, 0x28, 0xb7, 0x4f,
+        0x66, 0x2b, 0x2b, 0x93, 0x0d, 0xe4, 0x79, 0xe6, 0x6d, 0xca, 0x1b, 0x93, 0x87, 0xca, 0xf7, 0xe4,
+        0x23, 0xf9, 0x73, 0xf3, 0xdb, 0x15, 0x6c, 0x85, 0x4c, 0xd1, 0xa3, 0xb4, 0x52, 0xae, 0x50, 0x0e,
+        0x16, 0x4c, 0x2f, 0xa8, 0x2b, 0x78, 0x5b, 0x18, 0x5b, 0x78, 0xb8, 0x48, 0xbd, 0x48, 0x5a, 0xd4,
+        0x33, 0xdf, 0x66, 0xfe, 0xea, 0xf9, 0x23, 0x0b, 0x82, 0x16, 0x7c, 0xbd, 0x90, 0xb0, 0x50, 0xb8,
+        0xb0, 0xb3, 0xd8, 0xb8, 0x78, 0x59, 0xf1, 0xe0, 0x22, 0xbf, 0x45, 0xbb, 0x16, 0x23, 0x8b, 0x53,
+        0x17, 0x77, 0x2e, 0x31, 0x5d, 0x52, 0xba, 0x64, 0x78, 0x69, 0xf0, 0xd2, 0x7d, 0xcb, 0x68, 0xcb,
+        0xb2, 0x96, 0xfd, 0x50, 0xe2, 0x58, 0x52, 0x55, 0xf2, 0x6a, 0x79, 0xdc, 0xf2, 0x8e, 0x52, 0x83,
+        0xd2, 0xa5, 0xa5, 0x43, 0x2b, 0x82, 0x57, 0x34, 0x95, 0xa9, 0x94, 0xc9, 0xcb, 0x6e, 0xae, 0xf4,
+        0x5a, 0xb9, 0x63, 0x15, 0x61, 0x95, 0x64, 0x55, 0xef, 0x6a, 0x97, 0xd5, 0x5b, 0x56, 0x7f, 0x2a,
+        0x17, 0x95, 0x5f, 0xac, 0x70, 0xac, 0xa8, 0xae, 0xf8, 0xb0, 0x46, 0xb8, 0xe6, 0xe2, 0x57, 0x4e,
+        0x5f, 0xd5, 0x7c, 0xf5, 0x79, 0x6d, 0xda, 0xda, 0xde, 0x4a, 0xb7, 0xca, 0xed, 0xeb, 0x48, 0xeb,
+        0xa4, 0xeb, 0x6e, 0xac, 0xf7, 0x59, 0xbf, 0xaf, 0x4a, 0xbd, 0x6a, 0x41, 0xd5, 0xd0, 0x86, 0xf0,
+        0x0d, 0xad, 0x1b, 0xf1, 0x8d, 0xe5, 0x1b, 0x5f, 0x6d, 0x4a, 0xde, 0x74, 0xa1, 0x7a, 0x6a, 0xf5,
+        0x8e, 0xcd, 0xb4, 0xcd, 0xca, 0xcd, 0x03, 0x35, 0x61, 0x35, 0xed, 0x5b, 0xcc, 0xb6, 0xac, 0xdb,
+        0xf2, 0xa1, 0x36, 0xa3, 0xf6, 0x7a, 0x9d, 0x7f, 0x5d, 0xcb, 0x56, 0xfd, 0xad, 0xab, 0xb7, 0xbe,
+        0xd9, 0x26, 0xda, 0xd6, 0xbf, 0xdd, 0x77, 0x7b, 0xf3, 0x0e, 0x83, 0x1d, 0x15, 0x3b, 0xde, 0xef,
+        0x94, 0xec, 0xbc, 0xb5, 0x2b, 0x78, 0x57, 0x6b, 0xbd, 0x45, 0x7d, 0xf5, 0x6e, 0xd2, 0xee, 0x82,
+        0xdd, 0x8f, 0x1a, 0x62, 0x1b, 0xba, 0xbf, 0xe6, 0x7e, 0xdd, 0xb8, 0x47, 0x77, 0x4f, 0xc5, 0x9e,
+        0x8f, 0x7b, 0xa5, 0x7b, 0x07, 0xf6, 0x45, 0xef, 0xeb, 0x6a, 0x74, 0x6f, 0x6c, 0xdc, 0xaf, 0xbf,
+        0xbf, 0xb2, 0x09, 0x6d, 0x52, 0x36, 0x8d, 0x1e, 0x48, 0x3a, 0x70, 0xe5, 0x9b, 0x80, 0x6f, 0xda,
+        0x9b, 0xed, 0x9a, 0x77, 0xb5, 0x70, 0x5a, 0x2a, 0x0e, 0xc2, 0x41, 0xe5, 0xc1, 0x27, 0xdf, 0xa6,
+        0x7c, 0x7b, 0xe3, 0x50, 0xe8, 0xa1, 0xce, 0xc3, 0xdc, 0xc3, 0xcd, 0xdf, 0x99, 0x7f, 0xb7, 0xf5,
+        0x08, 0xeb, 0x48, 0x79, 0x2b, 0xd2, 0x3a, 0xbf, 0x75, 0xac, 0x2d, 0xa3, 0x6d, 0xa0, 0x3d, 0xa1,
+        0xbd, 0xef, 0xe8, 0x8c, 0xa3, 0x9d, 0x1d, 0x5e, 0x1d, 0x47, 0xbe, 0xb7, 0xff, 0x7e, 0xef, 0x31,
+        0xe3, 0x63, 0x75, 0xc7, 0x35, 0x8f, 0x57, 0x9e, 0xa0, 0x9d, 0x28, 0x3d, 0xf1, 0xf9, 0xe4, 0x82,
+        0x93, 0xe3, 0xa7, 0x64, 0xa7, 0x9e, 0x9d, 0x4e, 0x3f, 0x3d, 0xd4, 0x99, 0xdc, 0x79, 0xf7, 0x4c,
+        0xfc, 0x99, 0x6b, 0x5d, 0x51, 0x5d, 0xbd, 0x67, 0x43, 0xcf, 0x9e, 0x3f, 0x17, 0x74, 0xee, 0x4c,
+        0xb7, 0x5f, 0xf7, 0xc9, 0xf3, 0xde, 0xe7, 0x8f, 0x5d, 0xf0, 0xbc, 0x70, 0xf4, 0x22, 0xf7, 0x62,
+        0xdb, 0x25, 0xb7, 0x4b, 0xad, 0x3d, 0xae, 0x3d, 0x47, 0x7e, 0x70, 0xfd, 0xe1, 0x48, 0xaf, 0x5b,
+        0x6f, 0xeb, 0x65, 0xf7, 0xcb, 0xed, 0x57, 0x3c, 0xae, 0x74, 0xf4, 0x4d, 0xeb, 0x3b, 0xd1, 0xef,
+        0xd3, 0x7f, 0xfa, 0x6a, 0xc0, 0xd5, 0x73, 0xd7, 0xf8, 0xd7, 0x2e, 0x5d, 0x9f, 0x79, 0xbd, 0xef,
+        0xc6, 0xec, 0x1b, 0xb7, 0x6e, 0x26, 0xdd, 0x1c, 0xb8, 0x25, 0xba, 0xf5, 0xf8, 0x76, 0xf6, 0xed,
+        0x17, 0x77, 0x0a, 0xee, 0x4c, 0xdc, 0x5d, 0x7a, 0x8f, 0x78, 0xaf, 0xfc, 0xbe, 0xda, 0xfd, 0xea,
+        0x07, 0xfa, 0x0f, 0xea, 0x7f, 0xb4, 0xfe, 0xb1, 0x65, 0xc0, 0x6d, 0xe0, 0xf8, 0x60, 0xc0, 0x60,
+        0xcf, 0xc3, 0x59, 0x0f, 0xef, 0x0e, 0x09, 0x87, 0x9e, 0xfe, 0x94, 0xff, 0xd3, 0x87, 0xe1, 0xd2,
+        0x47, 0xcc, 0x47, 0xd5, 0x23, 0x46, 0x23, 0x8d, 0x8f, 0x9d, 0x1f, 0x1f, 0x1b, 0x0d, 0x1a, 0xbd,
+        0xf2, 0x64, 0xce, 0x93, 0xe1, 0xa7, 0xb2, 0xa7, 0x13, 0xcf, 0xca, 0x7e, 0x56, 0xff, 0x79, 0xeb,
+        0x73, 0xab, 0xe7, 0xdf, 0xfd, 0xe2, 0xfb, 0x4b, 0xcf, 0x58, 0xfc, 0xd8, 0xf0, 0x0b, 0xf9, 0x8b,
+        0xcf, 0xbf, 0xae, 0x79, 0xa9, 0xf3, 0x72, 0xef, 0xab, 0xa9, 0xaf, 0x3a, 0xc7, 0x23, 0xc7, 0x1f,
+        0xbc, 0xce, 0x79, 0x3d, 0xf1, 0xa6, 0xfc, 0xad, 0xce, 0xdb, 0x7d, 0xef, 0xb8, 0xef, 0xba, 0xdf,
+        0xc7, 0xbd, 0x1f, 0x99, 0x28, 0xfc, 0x40, 0xfe, 0x50, 0xf3, 0xd1, 0xfa, 0x63, 0xc7, 0xa7, 0xd0,
+        0x4f, 0xf7, 0x3e, 0xe7, 0x7c, 0xfe, 0xfc, 0x2f, 0xf7, 0x84, 0xf3, 0xfb, 0x80, 0x39, 0x25, 0x11,
+        0x00, 0x00, 0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x43,
+        0xbb, 0x7f, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00,
+        0x0d, 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07,
+        0xdb, 0x0c, 0x0b, 0x11, 0x2e, 0x21, 0xfc, 0x56, 0xfc, 0x79, 0x00, 0x00, 0x02, 0x3d, 0x49, 0x44,
+        0x41, 0x54, 0x58, 0xc3, 0xe5, 0x97, 0xbf, 0x6e, 0x13, 0x41, 0x10, 0xc6, 0x7f, 0xb3, 0x67, 0x1b,
+        0x43, 0x0a, 0x84, 0x10, 0x02, 0x41, 0x43, 0xa4, 0xa4, 0xa0, 0xa5, 0x00, 0x29, 0xbc, 0x01, 0x15,
+        0x2f, 0x43, 0x03, 0xf8, 0x09, 0x68, 0x79, 0x00, 0x5a, 0x68, 0x78, 0x08, 0x1e, 0x81, 0x12, 0x24,
+        0x44, 0x81, 0x30, 0x45, 0x12, 0x0b, 0x13, 0xf0, 0x9f, 0xdd, 0x19, 0x9a, 0x9c, 0xb3, 0x77, 0xe7,
+        0xbb, 0xdb, 0x73, 0x1c, 0xa5, 0x60, 0xa4, 0xd3, 0xfa, 0xe6, 0xe4, 0xdd, 0xef, 0xe6, 0xfb, 0xe6,
+        0x1b, 0x5b, 0xcc, 0x8c, 0xcb, 0x0c, 0xc7, 0x25, 0x47, 0xaf, 0x9c, 0x10, 0x91, 0x5b, 0xc0, 0x5b,
+        0x60, 0x9c, 0xa7, 0xd8, 0xb9, 0x3d, 0xe6, 0xee, 0x41, 0x0f, 0x32, 0x21, 0xcb, 0x04, 0x5d, 0xe1,
+        0x17, 0x5c, 0x4f, 0x70, 0xe2, 0x10, 0x31, 0xd4, 0x09, 0x22, 0x42, 0x86, 0x80, 0x08, 0x86, 0xc3,
+        0x00, 0x61, 0xc0, 0x8d, 0xfb, 0xc7, 0x7c, 0x1c, 0xbd, 0x34, 0xb3, 0x65, 0x23, 0x00, 0xe0, 0x31,
+        0xf0, 0x1b, 0x78, 0x07, 0x04, 0x40, 0x39, 0xf9, 0xa9, 0x7c, 0xfe, 0x60, 0x80, 0x46, 0x97, 0x95,
+        0x3e, 0x97, 0xaf, 0x28, 0x3f, 0x80, 0x27, 0xa3, 0xf7, 0xc0, 0xa8, 0xb5, 0x02, 0xc0, 0x3d, 0xe0,
+        0x19, 0xf0, 0xe8, 0xf4, 0x7e, 0xc8, 0xf0, 0xe6, 0xf4, 0xd5, 0xc3, 0xc3, 0xfd, 0x4d, 0xcb, 0x6c,
+        0x2c, 0x58, 0xcc, 0x47, 0xf3, 0xd7, 0x4f, 0xdf, 0xdc, 0x01, 0xbe, 0xb5, 0x01, 0x50, 0xa0, 0x6f,
+        0x66, 0xbb, 0xdb, 0xe4, 0xfa, 0xc5, 0x81, 0x28, 0x57, 0xf6, 0x1e, 0x94, 0x01, 0xb8, 0x1a, 0x00,
+        0x5b, 0x6f, 0x0d, 0x27, 0x08, 0xb6, 0xd4, 0x14, 0x0a, 0x2c, 0x06, 0x20, 0x22, 0x1b, 0x83, 0x31,
+        0x33, 0x59, 0xed, 0x03, 0x10, 0x96, 0xbe, 0x1d, 0x40, 0x86, 0x11, 0xce, 0x00, 0x98, 0x99, 0x88,
+        0x88, 0xd8, 0x1a, 0xc3, 0x88, 0xf3, 0x22, 0x22, 0xa5, 0xc3, 0xab, 0xc0, 0xbd, 0x0f, 0x29, 0x3e,
+        0x90, 0x2b, 0xb8, 0x71, 0xb3, 0xfc, 0xc0, 0x7c, 0xb5, 0x14, 0x47, 0xb3, 0x59, 0x48, 0xa5, 0x40,
+        0xbb, 0x50, 0x50, 0x7a, 0xf9, 0x55, 0x2e, 0xa6, 0x00, 0x80, 0xe5, 0x9f, 0x04, 0x00, 0xa1, 0x08,
+        0xa0, 0xb2, 0x49, 0x3d, 0x88, 0x76, 0x0a, 0x16, 0x29, 0x00, 0x32, 0x94, 0x80, 0x9e, 0x43, 0x78,
+        0xf5, 0x15, 0x1b, 0xcc, 0x2d, 0x85, 0x02, 0x39, 0x75, 0xc0, 0x8d, 0xba, 0x20, 0x2e, 0x44, 0xa5,
+        0x7a, 0x27, 0x47, 0x49, 0x1a, 0x60, 0x13, 0x0a, 0x9a, 0xe8, 0x58, 0xc5, 0x6c, 0xa2, 0xa9, 0x5d,
+        0xe0, 0x93, 0x37, 0xed, 0x12, 0xfe, 0x48, 0x53, 0x44, 0xa8, 0x75, 0x14, 0x6c, 0x80, 0xa1, 0xf8,
+        0x85, 0x30, 0xd3, 0x14, 0x11, 0x42, 0x38, 0x03, 0x90, 0x53, 0x90, 0x9b, 0x4e, 0xbc, 0xc6, 0xa2,
+        0x5b, 0x57, 0xa1, 0x8a, 0x81, 0xf9, 0x69, 0x92, 0x11, 0x15, 0x2a, 0x50, 0x56, 0x77, 0xbc, 0xd6,
+        0x29, 0xbe, 0xb6, 0x13, 0x26, 0xdf, 0x97, 0x17, 0x62, 0x44, 0x75, 0x9d, 0x50, 0x11, 0xf0, 0xf4,
+        0xd0, 0xa7, 0x00, 0x28, 0x54, 0x20, 0x9f, 0x05, 0x6d, 0x6f, 0x57, 0x37, 0x2f, 0x0a, 0x71, 0x75,
+        0xa2, 0x9d, 0x2b, 0x90, 0xea, 0xf3, 0x4d, 0xf3, 0x62, 0xf5, 0x6c, 0x86, 0xa6, 0x3a, 0xa1, 0xdf,
+        0xc6, 0x38, 0xae, 0x68, 0xec, 0x1a, 0x96, 0xd2, 0x86, 0x21, 0xf6, 0x81, 0x26, 0x23, 0xaa, 0xf3,
+        0x86, 0xb8, 0x4b, 0x0a, 0xf1, 0x17, 0x4d, 0xd5, 0x80, 0x76, 0x72, 0xb8, 0xa6, 0x43, 0x8b, 0xae,
+        0xa0, 0x9d, 0x45, 0x98, 0x4a, 0x41, 0x7c, 0x76, 0x6d, 0x17, 0x74, 0x00, 0x60, 0xe7, 0x99, 0x05,
+        0x6b, 0x87, 0x8b, 0xa2, 0xeb, 0x00, 0xb8, 0x35, 0x65, 0x3a, 0x01, 0x86, 0xdb, 0xfe, 0x51, 0xaa,
+        0x46, 0x20, 0x23, 0xc1, 0x09, 0x77, 0xf8, 0x74, 0x11, 0x00, 0x7c, 0x60, 0x41, 0x8f, 0xf6, 0x71,
+        0x6c, 0x13, 0x3b, 0x16, 0x91, 0xaf, 0x22, 0x32, 0x06, 0x06, 0x80, 0xe3, 0xfa, 0xde, 0x8f, 0xe7,
+        0xfb, 0x5f, 0x76, 0x7b, 0x7d, 0x06, 0x4e, 0x48, 0x1e, 0x49, 0x6a, 0x98, 0x1a, 0xea, 0x95, 0x85,
+        0x37, 0x7e, 0xd1, 0xaf, 0x02, 0x90, 0xff, 0xfe, 0xdf, 0xf1, 0x3f, 0x19, 0x1f, 0x49, 0x59, 0x7e,
+        0x89, 0x43, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+    };
+
+
+    /* logbook.png - 1023 bytes */
+    static const unsigned char logbook_png[] =
+    {
+        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
+        0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a,
+        0xf4, 0x00, 0x00, 0x00, 0x01, 0x73, 0x52, 0x47, 0x42, 0x00, 0xae, 0xce, 0x1c, 0xe9, 0x00, 0x00,
+        0x00, 0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf9, 0x43, 0xbb, 0x7f,
+        0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, 0xd7,
+        0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xdb, 0x0c,
+        0x0b, 0x11, 0x24, 0x26, 0x98, 0xdd, 0x81, 0x50, 0x00, 0x00, 0x03, 0x7f, 0x49, 0x44, 0x41, 0x54,
+        0x58, 0xc3, 0xb5, 0x97, 0x3d, 0x8f, 0xdc, 0x44, 0x18, 0xc7, 0x7f, 0xcf, 0x78, 0xf6, 0xe5, 0xf6,
+        0x72, 0x9b, 0x40, 0x14, 0x88, 0xa0, 0x08, 0x81, 0xa4, 0xa0, 0x89, 0x04, 0x48, 0x04, 0x85, 0x86,
+        0x82, 0x8a, 0x8a, 0x0f, 0x42, 0x4b, 0x03, 0xdc, 0x27, 0xa0, 0xe5, 0x03, 0xd0, 0x42, 0x43, 0x47,
+        0x45, 0x81, 0x44, 0x93, 0x06, 0xa4, 0x88, 0x12, 0x42, 0x2a, 0xc4, 0x41, 0xee, 0x8e, 0xe3, 0xf6,
+        0xf6, 0xcd, 0xeb, 0x99, 0x87, 0xc2, 0xe3, 0x59, 0x7b, 0x6d, 0x6f, 0x36, 0x9b, 0xec, 0x48, 0xab,
+        0x5d, 0xdb, 0x2b, 0xff, 0x7f, 0xfe, 0x3f, 0x6f, 0x63, 0x51, 0x55, 0x44, 0xa4, 0x0b, 0xdc, 0x01,
+        0x5e, 0x02, 0xfa, 0xec, 0x76, 0xcd, 0x80, 0xc7, 0xc0, 0x03, 0x55, 0x4d, 0x05, 0xe8, 0x01, 0x1f,
+        0x86, 0x93, 0x7f, 0x00, 0xe7, 0x3b, 0x06, 0x18, 0x02, 0xaf, 0x03, 0xd7, 0x80, 0x1f, 0x04, 0xb8,
+        0x4b, 0x07, 0x61, 0xc1, 0xcf, 0xe1, 0x0f, 0x57, 0x80, 0xaf, 0x81, 0xa3, 0x70, 0x2c, 0xec, 0xbf,
+        0x7c, 0xc4, 0x2b, 0xf7, 0x2c, 0x24, 0x42, 0x92, 0x08, 0xbe, 0xb8, 0x97, 0x11, 0x8c, 0x15, 0x8c,
+        0x18, 0x44, 0x14, 0x6f, 0x04, 0x11, 0x21, 0x41, 0x40, 0x04, 0xc5, 0xa0, 0x80, 0xd0, 0xe5, 0x85,
+        0xd7, 0xfe, 0xe5, 0xa7, 0xc3, 0xcf, 0x23, 0x46, 0x87, 0x77, 0x58, 0xa0, 0x96, 0x84, 0xeb, 0x2c,
+        0xb8, 0x0f, 0x98, 0x70, 0xe9, 0x2e, 0x70, 0x01, 0x7c, 0x03, 0x38, 0xc0, 0x33, 0xfe, 0xdb, 0xf3,
+        0xdb, 0x77, 0x0a, 0xf8, 0xd2, 0x47, 0x57, 0x7e, 0xaf, 0x7e, 0x4a, 0xe7, 0xbb, 0xf0, 0xfe, 0xe1,
+        0xb7, 0xc0, 0x61, 0x04, 0x58, 0xf0, 0x88, 0x84, 0xf7, 0x2c, 0x8e, 0x7d, 0x60, 0x5c, 0x02, 0x78,
+        0x15, 0xf8, 0x18, 0x78, 0x37, 0x1c, 0xf7, 0xe9, 0x5f, 0x1d, 0x7d, 0xf1, 0xf6, 0xc9, 0xed, 0x6d,
+        0x3d, 0x57, 0x52, 0xd2, 0xf9, 0xe1, 0xfc, 0xcb, 0x8f, 0xbe, 0xba, 0xce, 0xf7, 0x9f, 0xfc, 0x13,
+        0x4e, 0x8f, 0x71, 0xec, 0x5b, 0xc0, 0xf0, 0x22, 0x86, 0x53, 0x34, 0x5c, 0xf0, 0x40, 0x47, 0x55,
+        0x6f, 0x3e, 0xcf, 0xc0, 0x7f, 0x76, 0x4f, 0x3c, 0xbd, 0x5b, 0x6f, 0x02, 0xc7, 0x00, 0x41, 0xd3,
+        0xe4, 0x00, 0x1e, 0x13, 0xec, 0xa2, 0x64, 0xdd, 0x73, 0x5d, 0x46, 0x10, 0x74, 0xe1, 0xa3, 0xd3,
+        0xb9, 0xa6, 0xb1, 0x24, 0x35, 0x00, 0x2d, 0x03, 0x88, 0xc8, 0xd6, 0x30, 0xaa, 0x2a, 0xf1, 0x3e,
+        0x00, 0x6e, 0x91, 0x55, 0x00, 0x92, 0xc2, 0x01, 0x2d, 0x01, 0x24, 0x28, 0x6e, 0x09, 0xa0, 0xaa,
+        0x22, 0x22, 0xa2, 0xaa, 0x35, 0x90, 0xf2, 0x79, 0x11, 0x91, 0x15, 0xf1, 0x3a, 0x78, 0x96, 0xb9,
+        0x08, 0xa0, 0x85, 0x03, 0x05, 0xc0, 0x41, 0x10, 0x9d, 0xc4, 0x0c, 0x5e, 0x7b, 0xb3, 0x42, 0xb0,
+        0x80, 0xd0, 0x40, 0xba, 0xde, 0x92, 0x99, 0xe3, 0x60, 0x15, 0x40, 0x57, 0x1c, 0xa0, 0x0a, 0xb0,
+        0x49, 0x08, 0x9a, 0x74, 0x45, 0xa4, 0x12, 0x82, 0xbc, 0xf4, 0x26, 0x2e, 0x68, 0x51, 0xe8, 0xd6,
+        0x43, 0xe0, 0xaa, 0x00, 0xb5, 0x9b, 0xb4, 0x43, 0x3c, 0x39, 0x04, 0xe9, 0x0a, 0x00, 0x18, 0x03,
+        0x18, 0xfa, 0x01, 0x42, 0x31, 0x24, 0xb1, 0xb9, 0x6c, 0x9b, 0x78, 0xda, 0x28, 0x0e, 0xd0, 0x9d,
+        0x6b, 0xd4, 0xe9, 0xaf, 0xe6, 0x80, 0xc6, 0x10, 0x48, 0xe8, 0x80, 0x5b, 0x55, 0x41, 0xd9, 0x88,
+        0x9a, 0x7b, 0xe3, 0xd3, 0x9a, 0x03, 0x79, 0x19, 0x56, 0x73, 0x80, 0x6d, 0x42, 0xb0, 0x2e, 0x1c,
+        0xcb, 0x39, 0x78, 0xe6, 0x2b, 0x55, 0x50, 0x29, 0xc3, 0x5e, 0x00, 0x48, 0x51, 0x20, 0x5b, 0x57,
+        0x72, 0x5b, 0xaf, 0xec, 0xd4, 0xd3, 0xab, 0x97, 0xa1, 0x00, 0xc2, 0x2c, 0xef, 0x15, 0x38, 0x7c,
+        0x5b, 0x08, 0x9e, 0x54, 0x65, 0x4d, 0x66, 0x54, 0x8e, 0xdc, 0xcc, 0x47, 0x9d, 0x5e, 0xae, 0x6b,
+        0xc3, 0x16, 0x41, 0xd9, 0x8b, 0x53, 0x0a, 0xdc, 0x12, 0xa0, 0x08, 0x41, 0xe1, 0x40, 0xf9, 0xbb,
+        0x9c, 0xed, 0x4d, 0xb6, 0xd7, 0x5c, 0xcb, 0x46, 0x2e, 0x6e, 0x77, 0xa6, 0xb9, 0xe3, 0x16, 0x87,
+        0x32, 0x08, 0x10, 0xcb, 0xf8, 0xbb, 0xa6, 0xec, 0x6e, 0xfa, 0x6e, 0xab, 0x84, 0xc6, 0x3c, 0x38,
+        0xfb, 0x73, 0x11, 0x75, 0xfa, 0xc0, 0x08, 0xb5, 0x80, 0x32, 0x47, 0x23, 0xd9, 0xe2, 0xe9, 0x1b,
+        0x51, 0x5b, 0x25, 0xd4, 0x12, 0x78, 0x74, 0x92, 0x45, 0x9d, 0x1c, 0x24, 0x00, 0x80, 0x22, 0xcd,
+        0x0e, 0x14, 0xb3, 0x60, 0x6d, 0x83, 0xd9, 0x34, 0x49, 0xf7, 0xce, 0x7c, 0x65, 0x9b, 0x10, 0x01,
+        0xfa, 0x28, 0xb3, 0xf8, 0xd4, 0x1b, 0xcd, 0x82, 0xb6, 0x10, 0x35, 0x95, 0x63, 0xbc, 0x36, 0x2b,
+        0xdd, 0xb7, 0x8f, 0x90, 0xe6, 0x5b, 0x32, 0x65, 0x8e, 0x67, 0x10, 0x5b, 0xb1, 0xc7, 0x2d, 0xcb,
+        0xf0, 0x59, 0xc6, 0x71, 0x69, 0x97, 0x95, 0xaf, 0x41, 0xa9, 0xd7, 0x4c, 0xf0, 0x24, 0xa8, 0xc5,
+        0xe1, 0x39, 0x40, 0x99, 0x06, 0xba, 0xbc, 0x02, 0xb2, 0x4d, 0x1a, 0x51, 0x5b, 0xc3, 0x69, 0x4d,
+        0xc2, 0x69, 0xc9, 0x81, 0x3d, 0x84, 0x33, 0xbc, 0x05, 0x3c, 0x33, 0x3c, 0xcb, 0xbd, 0x6e, 0xeb,
+        0x2c, 0x58, 0x37, 0x6e, 0x37, 0x1a, 0xc7, 0xa5, 0xfd, 0x74, 0xe8, 0x07, 0x01, 0x60, 0x82, 0xe3,
+        0x52, 0x05, 0xe0, 0xa9, 0x67, 0x41, 0x59, 0xbb, 0xb5, 0x0a, 0xca, 0x00, 0xf9, 0x36, 0xd8, 0x5b,
+        0x24, 0x88, 0x57, 0x1d, 0xd0, 0x67, 0x99, 0x05, 0x4d, 0xcb, 0xfb, 0x8a, 0x06, 0x5c, 0x02, 0xa6,
+        0xb8, 0xdc, 0x01, 0xc1, 0x93, 0x84, 0xa7, 0x16, 0xc6, 0xbb, 0x78, 0x3d, 0xf3, 0x8a, 0x8b, 0x1a,
+        0x44, 0x8f, 0xbd, 0xc1, 0x71, 0x41, 0xc6, 0x00, 0x8b, 0x23, 0x7f, 0x4b, 0xf8, 0x75, 0x17, 0x00,
+        0x99, 0x23, 0x8d, 0x1a, 0x16, 0x47, 0xc6, 0x00, 0xc7, 0x85, 0xc5, 0x72, 0xcc, 0x94, 0x1b, 0x5c,
+        0xe1, 0x24, 0xbc, 0x32, 0x39, 0xfe, 0xe3, 0x91, 0x88, 0x1c, 0x01, 0x5d, 0xc0, 0x70, 0xf9, 0xd6,
+        0x5f, 0x9f, 0xde, 0xfe, 0xfd, 0xa6, 0xed, 0xd0, 0x35, 0xc2, 0xc6, 0x23, 0xc9, 0x2b, 0xea, 0x15,
+        0x9f, 0x79, 0xd2, 0x4c, 0x39, 0xa7, 0x53, 0x72, 0x60, 0xca, 0x0d, 0x2c, 0xc7, 0x02, 0x0c, 0x49,
+        0xf8, 0x00, 0xe1, 0x31, 0x19, 0x0f, 0x81, 0xd1, 0x8e, 0x5f, 0x4e, 0x0f, 0xb0, 0xbc, 0x81, 0x72,
+        0x0d, 0xc7, 0x8f, 0xa2, 0xaa, 0xc8, 0x55, 0x19, 0x32, 0xe1, 0x2d, 0x66, 0x0c, 0xc3, 0x53, 0xef,
+        0x72, 0xa5, 0x58, 0x46, 0x0c, 0xf9, 0x45, 0x4f, 0xf4, 0xfc, 0x7f, 0x56, 0x29, 0xf1, 0xee, 0xd8,
+        0xf8, 0x3c, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+    };
+
+    {
+        wxMemoryInputStream sm( logbook_pi_png,sizeof( logbook_pi_png ) );
+        _img_logbook_pi = new wxBitmap( wxImage( sm ) );
+    }
+    {
+        wxMemoryInputStream sm( logbook_png,sizeof( logbook_png ) );
+        _img_logbook = new wxBitmap( wxImage( sm ) );
+    }
+
+    static unsigned char Bullet_green[] =
+    {
+        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+        0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a,
+        0x08, 0x06, 0x00, 0x00, 0x00, 0x8d, 0x32, 0xcf, 0xbd, 0x00, 0x00, 0x00,
+        0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00, 0x00, 0x0b,
+        0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, 0x01, 0x1f, 0x49, 0x44,
+        0x41, 0x54, 0x78, 0x9c, 0x65, 0xd0, 0xbf, 0x4b, 0x02, 0x01, 0x18, 0xc6,
+        0xf1, 0xf7, 0x4f, 0xba, 0x45, 0x04, 0xa7, 0x13, 0x6e, 0x53, 0x04, 0xd1,
+        0xe5, 0xe4, 0x14, 0xe1, 0xe0, 0xce, 0x93, 0x3b, 0x3c, 0x75, 0x90, 0x14,
+        0x17, 0x91, 0x86, 0x96, 0xc0, 0x2d, 0x08, 0x21, 0x68, 0x88, 0xa4, 0x9a,
+        0x43, 0x9d, 0x84, 0x08, 0x21, 0x84, 0x44, 0x70, 0x88, 0x82, 0x70, 0x28,
+        0x10, 0x02, 0xa1, 0x1f, 0x74, 0xc5, 0xb7, 0xc1, 0x0c, 0x42, 0x1e, 0xde,
+        0xe9, 0xf9, 0xf0, 0x0e, 0x8f, 0x00, 0x02, 0x48, 0x40, 0xc0, 0x94, 0x29,
+        0x83, 0xaf, 0x01, 0xa3, 0xb7, 0x11, 0xcb, 0xcf, 0x25, 0x9b, 0x0e, 0x10,
+        0x01, 0x64, 0xc6, 0x8c, 0x06, 0x0d, 0x5c, 0x5c, 0x6c, 0x6c, 0xf2, 0x2f,
+        0x79, 0xd2, 0x37, 0x69, 0x3a, 0x93, 0x0e, 0xc1, 0x77, 0x00, 0x20, 0x32,
+        0x67, 0x4e, 0xf9, 0x37, 0x25, 0x4a, 0xd8, 0x81, 0x8d, 0xb1, 0x30, 0x48,
+        0x4d, 0x52, 0x44, 0x8f, 0xa3, 0xd4, 0x2f, 0xea, 0x6b, 0xd8, 0xa2, 0x85,
+        0x8f, 0x4f, 0x95, 0x2a, 0x3e, 0x3e, 0x56, 0x60, 0xa1, 0xdf, 0xeb, 0xc4,
+        0x2e, 0x63, 0xa8, 0x5d, 0x15, 0xa5, 0xa6, 0x30, 0xbe, 0x1b, 0x23, 0x0e,
+        0x0e, 0x1e, 0x1e, 0x65, 0xca, 0x54, 0xa8, 0x50, 0x78, 0x2d, 0x90, 0xbc,
+        0x4e, 0xa2, 0x1e, 0xa9, 0x84, 0xda, 0x21, 0x94, 0x9a, 0x42, 0xfb, 0xbc,
+        0x8d, 0x98, 0x1f, 0x26, 0x56, 0x60, 0x51, 0xa4, 0x88, 0x87, 0x87, 0xf5,
+        0x64, 0x11, 0xda, 0x5d, 0x83, 0xcd, 0xb9, 0x5d, 0x17, 0xd1, 0x1f, 0x74,
+        0x32, 0x8f, 0x19, 0xb2, 0xcf, 0x59, 0x8c, 0x85, 0xb1, 0x85, 0x94, 0x9a,
+        0x42, 0xf3, 0xb4, 0x89, 0xe4, 0xae, 0x72, 0x24, 0x46, 0x09, 0xe2, 0xc3,
+        0x38, 0xda, 0x99, 0x46, 0x78, 0x2f, 0xbc, 0x05, 0xfb, 0xb7, 0x7d, 0x64,
+        0xb8, 0x18, 0xa2, 0x9d, 0x68, 0x44, 0xf6, 0x23, 0xeb, 0x62, 0xe7, 0x3f,
+        0x32, 0x0f, 0x4c, 0xfe, 0x76, 0xec, 0x4d, 0x7a, 0x84, 0x1b, 0xdb, 0x9f,
+        0x9c, 0x43, 0x87, 0xd5, 0xfb, 0x0a, 0x40, 0x7e, 0x00, 0x57, 0x28, 0x02,
+        0x1e, 0xf4, 0x28, 0xf9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
+        0x44, 0xae, 0x42, 0x60, 0x82,
+    };
+
+
+    {
+        wxMemoryInputStream sm( Bullet_green,sizeof( Bullet_green ) );
+        _img_Bullet_green = new wxBitmap( wxImage( sm ) );
+    }
+
+    static unsigned char Bullet_red[] =
+    {
+        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+        0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a,
+        0x08, 0x06, 0x00, 0x00, 0x00, 0x8d, 0x32, 0xcf, 0xbd, 0x00, 0x00, 0x00,
+        0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00, 0x00, 0x0b,
+        0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, 0x00, 0xe1, 0x49, 0x44,
+        0x41, 0x54, 0x78, 0x9c, 0x6d, 0xd0, 0xbf, 0x4a, 0x42, 0x71, 0x14, 0xc0,
+        0xf1, 0x2f, 0xe8, 0xe2, 0x23, 0xdc, 0x07, 0xf0, 0x3d, 0xdc, 0x04, 0x9f,
+        0xc0, 0xd1, 0x51, 0x7c, 0x01, 0x89, 0xd6, 0x68, 0x68, 0x09, 0xc1, 0x25,
+        0x08, 0x31, 0x6c, 0x90, 0xb0, 0x5a, 0x74, 0x08, 0xcc, 0x25, 0x88, 0x96,
+        0xb8, 0xd0, 0x1c, 0x05, 0xe9, 0x50, 0x53, 0x2e, 0x95, 0xde, 0x8a, 0x6f,
+        0xc3, 0xfd, 0xdd, 0x4b, 0x58, 0xc3, 0x81, 0xf3, 0xe7, 0xc3, 0xe1, 0x70,
+        0x50, 0x51, 0x71, 0xbd, 0xd6, 0xf1, 0xd8, 0xaf, 0x4e, 0xc7, 0xf7, 0x7e,
+        0xdf, 0x64, 0x3e, 0x37, 0x9f, 0x29, 0x69, 0x32, 0x99, 0x68, 0x14, 0xa5,
+        0x25, 0xf8, 0x0a, 0xde, 0x16, 0x0a, 0xc6, 0xad, 0x96, 0xdf, 0x49, 0x62,
+        0x0a, 0xa7, 0x53, 0x2d, 0x16, 0x73, 0xf4, 0x09, 0x2e, 0xc0, 0x18, 0x3c,
+        0x06, 0xcf, 0xeb, 0xf5, 0x00, 0xcb, 0xe5, 0x1c, 0x65, 0xf0, 0x01, 0xbc,
+        0x00, 0x7b, 0x60, 0x1b, 0xbc, 0x9f, 0xcd, 0xe4, 0x37, 0x12, 0x7c, 0x03,
+        0x6f, 0xc0, 0x23, 0x70, 0x27, 0xc0, 0xb3, 0x66, 0x53, 0x56, 0x61, 0x4b,
+        0x06, 0x9f, 0xc1, 0xdd, 0x00, 0xb2, 0xe8, 0xd5, 0x6a, 0xf2, 0x08, 0x3e,
+        0x81, 0x2f, 0xe1, 0xb6, 0x4d, 0xd4, 0x06, 0x4f, 0x1a, 0x0d, 0xb9, 0x8e,
+        0x22, 0xaf, 0xc0, 0x4b, 0xf0, 0x14, 0xdc, 0xfb, 0x07, 0xde, 0x8d, 0x46,
+        0xb2, 0x18, 0x0c, 0x1c, 0x82, 0xfb, 0xa1, 0xb9, 0xb5, 0x81, 0x0e, 0x2a,
+        0x15, 0xf3, 0x3f, 0xc6, 0xdd, 0xae, 0xdb, 0xa5, 0xd2, 0x9f, 0x4d, 0x87,
+        0xd5, 0xaa, 0x1f, 0xcb, 0xa5, 0x2a, 0x3f, 0x8b, 0xc0, 0xd5, 0x5b, 0x5f,
+        0xfb, 0xcc, 0xea, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+        0x42, 0x60, 0x82,
+    };
+
+    {
+        wxMemoryInputStream sm( Bullet_red,sizeof( Bullet_red ) );
+        _img_Bullet_red = new wxBitmap( wxImage( sm ) );
+    }
+
+    static unsigned char Bullet_yellow[] =
+    {
+        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
+        0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a,
+        0x08, 0x06, 0x00, 0x00, 0x00, 0x8d, 0x32, 0xcf, 0xbd, 0x00, 0x00, 0x00,
+        0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0b, 0x12, 0x00, 0x00, 0x0b,
+        0x12, 0x01, 0xd2, 0xdd, 0x7e, 0xfc, 0x00, 0x00, 0x01, 0x20, 0x49, 0x44,
+        0x41, 0x54, 0x78, 0x9c, 0x65, 0xd0, 0xb1, 0x4b, 0x02, 0x71, 0x18, 0xc6,
+        0xf1, 0xdf, 0x9f, 0x74, 0x4b, 0x04, 0x4d, 0x06, 0x6e, 0x45, 0x10, 0xb5,
+        0x18, 0x16, 0x81, 0x70, 0x66, 0x28, 0x59, 0x5d, 0x5c, 0x25, 0x41, 0x94,
+        0x38, 0x44, 0x10, 0x34, 0x04, 0x89, 0x48, 0x81, 0x83, 0x54, 0xd6, 0xd2,
+        0x50, 0x94, 0x04, 0x09, 0x21, 0x92, 0x1c, 0x15, 0x41, 0x52, 0x29, 0xd8,
+        0x41, 0x09, 0x41, 0x20, 0x6a, 0xa7, 0x67, 0x7c, 0x1b, 0x3c, 0x0b, 0x71,
+        0x78, 0xe0, 0x81, 0xf7, 0xc3, 0x33, 0xbc, 0x02, 0x10, 0xad, 0x98, 0xc0,
+        0x03, 0xcd, 0xc6, 0x25, 0xb5, 0x4a, 0x8a, 0x46, 0xfd, 0x93, 0xff, 0x1b,
+        0xc2, 0x2a, 0x8f, 0x40, 0x00, 0xf0, 0x42, 0xdd, 0xcd, 0x57, 0x69, 0x92,
+        0x6c, 0x7a, 0x14, 0xed, 0x76, 0x9b, 0x9f, 0xa6, 0x89, 0x05, 0x9f, 0x80,
+        0x59, 0x2b, 0x33, 0x98, 0x86, 0x1b, 0xbd, 0xe0, 0x44, 0xcb, 0x8c, 0x10,
+        0xdb, 0xeb, 0xe7, 0x24, 0xb1, 0xdc, 0x86, 0x6b, 0x80, 0x1f, 0x98, 0x07,
+        0xfc, 0x98, 0x86, 0x4c, 0x3e, 0xe7, 0xe0, 0xfc, 0x74, 0x80, 0x68, 0xd8,
+        0x86, 0xaa, 0x48, 0xbc, 0x3c, 0x67, 0x10, 0xe0, 0x01, 0x7c, 0xd6, 0xe2,
+        0x1c, 0xd5, 0xca, 0x14, 0xe9, 0xd4, 0x30, 0xfb, 0x51, 0x1b, 0xc1, 0xd5,
+        0x1e, 0x54, 0x45, 0xe2, 0xf8, 0x28, 0x88, 0x30, 0xca, 0x2e, 0xcc, 0xaa,
+        0x0c, 0xe6, 0x34, 0xe0, 0xe3, 0xe3, 0x5d, 0x26, 0xb4, 0xde, 0x02, 0xed,
+        0x44, 0x23, 0x5e, 0x44, 0x21, 0xe7, 0xa0, 0xf8, 0x3a, 0x46, 0xe9, 0x6d,
+        0x1c, 0x3d, 0xef, 0x24, 0x14, 0xec, 0x44, 0xaa, 0x22, 0x71, 0x10, 0x5f,
+        0x41, 0xdc, 0x5c, 0x4f, 0x90, 0xba, 0x1a, 0x22, 0x79, 0x36, 0x48, 0x22,
+        0x6e, 0x67, 0x23, 0xd4, 0xdb, 0x05, 0xef, 0xef, 0x2e, 0x10, 0x7a, 0x31,
+        0x49, 0x3c, 0x66, 0x67, 0x6b, 0xb3, 0x0f, 0x55, 0x91, 0x58, 0x5a, 0xe8,
+        0x44, 0xbb, 0x3b, 0x2e, 0xfe, 0xfe, 0xa8, 0x65, 0x0f, 0x09, 0x2c, 0x76,
+        0x2f, 0x45, 0xc2, 0x1e, 0xbe, 0x6b, 0x65, 0x00, 0xf1, 0x0b, 0xfb, 0x12,
+        0x21, 0x2e, 0x20, 0xdf, 0x1c, 0xdd, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+        0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+    };
+
+    {
+        wxMemoryInputStream sm( Bullet_yellow,sizeof( Bullet_yellow ) );
+        _img_Bullet_yellow = new wxBitmap( wxImage( sm ) );
+    }
 
-	return;
+    return;
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/icons.h opencpn-plugin-logbookkonni-1.2024/src/icons.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/icons.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/icons.h	2016-02-25 13:06:29.000000000 +0000
@@ -7,7 +7,7 @@
 #	include <wx/wx.h>
 #endif
 
-extern void initialize_images(void);
+extern void initialize_images( void );
 
 extern wxBitmap *_img_logbook_pi;
 extern wxBitmap *_img_logbook;
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/json_defs.h opencpn-plugin-logbookkonni-1.2024/src/json_defs.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/json_defs.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/json_defs.h	2016-02-25 13:06:29.000000000 +0000
@@ -50,15 +50,15 @@
 //    #define WXDLLIMPEXP_JSON                  WXIMPORT
 //    #define WXDLLIMPEXP_DATA_JSON(type)       WXIMPORT type
 //#else // not making nor using DLL
-    #define WXDLLIMPEXP_JSON
-    #define WXDLLIMPEXP_DATA_JSON(type)	    type
+#define WXDLLIMPEXP_JSON
+#define WXDLLIMPEXP_DATA_JSON(type)	    type
 //#endif
 
 // the __PRETTY_FUNCTION__ macro expands to the full class's
 // member name in the GNU GCC.
 // For other compilers we use the standard __wxFUNCTION__ macro
 #if !defined( __GNUC__ )
-  #define __PRETTY_FUNCTION__   __WXFUNCTION__
+#define __PRETTY_FUNCTION__   __WXFUNCTION__
 #endif
 
 
@@ -66,11 +66,11 @@
 // define wxJSON_USE_UNICODE if wxWidgets was built with
 // unicode support
 #if defined( wxJSON_USE_UNICODE )
-  #undef wxJSON_USE_UNICODE
+#undef wxJSON_USE_UNICODE
 #endif
 // do not modify the following lines
 #if wxUSE_UNICODE == 1
-  #define wxJSON_USE_UNICODE
+#define wxJSON_USE_UNICODE
 #endif
 
 // the following macro, if defined, cause the wxJSONValue to store
@@ -114,46 +114,46 @@
 //   *** 1 errors in Compile ***
 // so, if the constants are not defined, I define them by myself
 #if !defined( LLONG_MAX )
-  #define LLONG_MAX      9223372036854775807
+#define LLONG_MAX      9223372036854775807
 #endif
 
 #if !defined( ULLONG_MAX )
-  #define ULLONG_MAX    18446744073709551615
+#define ULLONG_MAX    18446744073709551615
 #endif
 
 #if !defined( LLONG_MIN )
-  #define LLONG_MIN     -9223372036854775808
+#define LLONG_MIN     -9223372036854775808
 #endif
 
 
 
 // the same applies for all other integer constants
 #if !defined( INT_MIN )
-  #define INT_MIN       -32768
+#define INT_MIN       -32768
 #endif
 #if !defined( INT_MAX )
-  #define INT_MAX        32767
+#define INT_MAX        32767
 #endif
 #if !defined( UINT_MAX )
-  #define UINT_MAX       65535
+#define UINT_MAX       65535
 #endif
 #if !defined( LONG_MIN )
-  #define LONG_MIN       -2147483648
+#define LONG_MIN       -2147483648
 #endif
 #if !defined( LONG_MAX )
-  #define LONG_MAX       2147483647
+#define LONG_MAX       2147483647
 #endif
 #if !defined( ULONG_MAX )
-  #define ULONG_MAX       4294967295
+#define ULONG_MAX       4294967295
 #endif
 #if !defined( SHORT_MAX )
-  #define SHORT_MAX	32767
+#define SHORT_MAX	32767
 #endif
 #if !defined( SHORT_MIN )
-  #define SHORT_MIN	-32768
+#define SHORT_MIN	-32768
 #endif
 #if !defined( USHORT_MAX )
-  #define USHORT_MAX	65535
+#define USHORT_MAX	65535
 #endif
 
 
@@ -163,9 +163,9 @@
 // unless the wxJSON_NOABORT_ASSERT is defined
 // #define wxJSON_NOABORT_ASSERT
 #if defined( wxJSON_NOABORT_ASSERT )
-  #define wxJSON_ASSERT( cond )
+#define wxJSON_ASSERT( cond )
 #else
-  #define wxJSON_ASSERT( cond )		wxASSERT( cond );
+#define wxJSON_ASSERT( cond )		wxASSERT( cond );
 #endif
 
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/jsonreader.cpp opencpn-plugin-logbookkonni-1.2024/src/jsonreader.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/jsonreader.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/jsonreader.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -9,7 +9,7 @@
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WXOSX__
 #ifdef __GNUG__
-    #pragma implementation "jsonreader.cpp"
+#pragma implementation "jsonreader.cpp"
 #endif
 #endif
 #include "jsonreader.h"
@@ -171,8 +171,8 @@
 // trace messages by setting the:
 // WXTRACE=traceReader StoreComment
 // environment variable
-static const wxChar* traceMask = _T("traceReader");
-static const wxChar* storeTraceMask = _T("StoreComment");
+static const wxChar* traceMask = _T( "traceReader" );
+static const wxChar* storeTraceMask = _T( "StoreComment" );
 
 
 //! Ctor
@@ -241,7 +241,8 @@
     m_noUtf8    = false;
 #if !defined( wxJSON_USE_UNICODE )
     // in ANSI builds we can suppress UTF-8 conversion for both the writer and the reader
-    if ( m_flags & wxJSONREADER_NOUTF8_STREAM )    {
+    if ( m_flags & wxJSONREADER_NOUTF8_STREAM )
+    {
         m_noUtf8 = true;
     }
 #endif
@@ -312,15 +313,17 @@
     char* readBuff = 0;
     wxCharBuffer utf8CB = doc.ToUTF8();        // the UTF-8 buffer
 #if !defined( wxJSON_USE_UNICODE )
-    wxCharBuffer ansiCB( doc.c_str());        // the ANSI buffer
-    if ( m_noUtf8 )    {
+    wxCharBuffer ansiCB( doc.c_str() );       // the ANSI buffer
+    if ( m_noUtf8 )
+    {
         readBuff = ansiCB.data();
     }
-    else    {
+    else
+    {
         readBuff = utf8CB.data();
     }
 #else
-        readBuff = utf8CB.data();
+    readBuff = utf8CB.data();
 #endif
 
     // now construct the temporary memory input stream
@@ -351,7 +354,8 @@
     // if a wxJSONValue is not passed to the Parse function
     // we set the temparary object created on the stack
     // I know this will slow down the validation of input
-    if ( val == 0 )  {
+    if ( val == 0 )
+    {
         val = &temp;
     }
     wxASSERT( val );
@@ -363,15 +367,16 @@
     m_current    = 0;
 
     int ch = GetStart( is );
-    switch ( ch )  {
-        case '{' :
+    switch ( ch )
+    {
+    case '{' :
         val->SetType( wxJSONTYPE_OBJECT );
         break;
     case '[' :
         val->SetType( wxJSONTYPE_ARRAY );
         break;
     default :
-        AddError( _T("Cannot find a start object/array character" ));
+        AddError( _T( "Cannot find a start object/array character" ) );
         return m_errors.size();
         break;
     }
@@ -403,26 +408,29 @@
 wxJSONReader::GetStart( wxInputStream& is )
 {
     int ch = 0;
-    do  {
-        switch ( ch )  {
-            case 0 :
-                ch = ReadChar( is );
-                break;
-            case '{' :
-                return ch;
-                break;
-            case '[' :
-                return ch;
-                break;
-            case '/' :
-                ch = SkipComment( is );
-                StoreComment( 0 );
-                break;
-            default :
-                ch = ReadChar( is );
-                break;
+    do
+    {
+        switch ( ch )
+        {
+        case 0 :
+            ch = ReadChar( is );
+            break;
+        case '{' :
+            return ch;
+            break;
+        case '[' :
+            return ch;
+            break;
+        case '/' :
+            ch = SkipComment( is );
+            StoreComment( 0 );
+            break;
+        default :
+            ch = ReadChar( is );
+            break;
         }
-    } while ( ch >= 0 );
+    }
+    while ( ch >= 0 );
     return ch;
 }
 
@@ -487,13 +495,15 @@
 int
 wxJSONReader::ReadChar( wxInputStream& is )
 {
-    if ( is.Eof())    {
+    if ( is.Eof() )
+    {
         return -1;
     }
 
     unsigned char ch = is.GetC();
     size_t last = is.LastRead();    // returns ZERO if EOF
-    if ( last == 0 )    {
+    if ( last == 0 )
+    {
         return -1;
     }
 
@@ -501,24 +511,29 @@
     // in the case of CR+LF
     int nextChar;
 
-    if ( ch == '\r' )  {
+    if ( ch == '\r' )
+    {
         m_colNo = 1;
         nextChar = PeekChar( is );
-        if ( nextChar == -1 )  {
+        if ( nextChar == -1 )
+        {
             return -1;
         }
-        else if ( nextChar == '\n' )    {
+        else if ( nextChar == '\n' )
+        {
             ch = is.GetC();
         }
     }
-    if ( ch == '\n' )  {
+    if ( ch == '\n' )
+    {
         ++m_lineNo;
         m_colNo = 1;
     }
-    else  {
+    else
+    {
         ++m_colNo;
     }
-    return (int) ch;
+    return ( int ) ch;
 }
 
 
@@ -533,8 +548,10 @@
 int
 wxJSONReader::PeekChar( wxInputStream& is )
 {
-    int ch = -1; unsigned char c;
-    if ( !is.Eof())    {
+    int ch = -1;
+    unsigned char c;
+    if ( !is.Eof() )
+    {
         c = is.Peek();
         ch = c;
     }
@@ -570,7 +587,8 @@
 wxJSONReader::DoRead( wxInputStream& is, wxJSONValue& parent )
 {
     ++m_level;
-    if ( m_depth < m_level )    {
+    if ( m_depth < m_level )
+    {
         m_depth = m_level;
     }
 
@@ -592,157 +610,181 @@
     // the character read: -1=EOF, 0=to be read
     int ch=0;
 
-    do {                   // we read until ch < 0
-        switch ( ch )  {
-            case 0 :
-                ch = ReadChar( is );
-                break;
-            case ' ' :
-            case '\t' :
-            case '\n' :
-            case '\r' :
-                ch = SkipWhiteSpace( is );
-                break;
-            case -1 :   // the EOF
-                break;
-            case '/' :
-                ch = SkipComment( is );
-                StoreComment( &parent );
-                break;
+    do                     // we read until ch < 0
+    {
+        switch ( ch )
+        {
+        case 0 :
+            ch = ReadChar( is );
+            break;
+        case ' ' :
+        case '\t' :
+        case '\n' :
+        case '\r' :
+            ch = SkipWhiteSpace( is );
+            break;
+        case -1 :   // the EOF
+            break;
+        case '/' :
+            ch = SkipComment( is );
+            StoreComment( &parent );
+            break;
 
-            case '{' :
-                if ( parent.IsObject() ) {
-                    if ( key.empty() )   {
-                        AddError( _T("\'{\' is not allowed here (\'name\' is missing") );
-                    }
-                    if ( value.IsValid() )   {
-                        AddError( _T("\'{\' cannot follow a \'value\'") );
-                          }
+        case '{' :
+            if ( parent.IsObject() )
+            {
+                if ( key.empty() )
+                {
+                    AddError( _T( "\'{\' is not allowed here (\'name\' is missing" ) );
                 }
-                else if ( parent.IsArray() )  {
-                    if ( value.IsValid() )   {
-                        AddError( _T("\'{\' cannot follow a \'value\' in JSON array") );
-                    }
+                if ( value.IsValid() )
+                {
+                    AddError( _T( "\'{\' cannot follow a \'value\'" ) );
                 }
-                else  {
-                    wxJSON_ASSERT( 0 );       // always fails
+            }
+            else if ( parent.IsArray() )
+            {
+                if ( value.IsValid() )
+                {
+                    AddError( _T( "\'{\' cannot follow a \'value\' in JSON array" ) );
                 }
+            }
+            else
+            {
+                wxJSON_ASSERT( 0 );       // always fails
+            }
 
-                // the openobject char cause the DoRead() to be called recursively
-                value.SetType( wxJSONTYPE_OBJECT );
-                ch = DoRead( is, value );
-                break;
+            // the openobject char cause the DoRead() to be called recursively
+            value.SetType( wxJSONTYPE_OBJECT );
+            ch = DoRead( is, value );
+            break;
 
-            case '}' :
-                if ( !parent.IsObject() )  {
-                    AddWarning( wxJSONREADER_MISSING,
-                    _T("Trying to close an array using the \'}\' (close-object) char" ));
-                }
-                // close-object: store the current value, if any
-                StoreValue( ch, key, value, parent );
-                m_current = &parent;
-                m_next    = 0;
-                m_current->SetLineNo( m_lineNo );
-                ch = ReadChar( is );
-                return ch;
-                break;
+        case '}' :
+            if ( !parent.IsObject() )
+            {
+                AddWarning( wxJSONREADER_MISSING,
+                            _T( "Trying to close an array using the \'}\' (close-object) char" ) );
+            }
+            // close-object: store the current value, if any
+            StoreValue( ch, key, value, parent );
+            m_current = &parent;
+            m_next    = 0;
+            m_current->SetLineNo( m_lineNo );
+            ch = ReadChar( is );
+            return ch;
+            break;
 
-            case '[' :
-                if ( parent.IsObject() ) {
-                    if ( key.empty() )   {
-                        AddError( _T("\'[\' is not allowed here (\'name\' is missing") );
-                    }
-                    if ( value.IsValid() )   {
-                        AddError( _T("\'[\' cannot follow a \'value\' text") );
-                    }
+        case '[' :
+            if ( parent.IsObject() )
+            {
+                if ( key.empty() )
+                {
+                    AddError( _T( "\'[\' is not allowed here (\'name\' is missing" ) );
                 }
-                else if ( parent.IsArray())  {
-                    if ( value.IsValid() )   {
-                        AddError( _T("\'[\' cannot follow a \'value\'") );
-                    }
+                if ( value.IsValid() )
+                {
+                    AddError( _T( "\'[\' cannot follow a \'value\' text" ) );
                 }
-                else  {
-                    wxJSON_ASSERT( 0 );       // always fails
+            }
+            else if ( parent.IsArray() )
+            {
+                if ( value.IsValid() )
+                {
+                    AddError( _T( "\'[\' cannot follow a \'value\'" ) );
                 }
-                // open-array cause the DoRead() to be called recursively
-                value.SetType( wxJSONTYPE_ARRAY );
-                ch = DoRead( is, value );
-                break;
+            }
+            else
+            {
+                wxJSON_ASSERT( 0 );       // always fails
+            }
+            // open-array cause the DoRead() to be called recursively
+            value.SetType( wxJSONTYPE_ARRAY );
+            ch = DoRead( is, value );
+            break;
 
-            case ']' :
-                if ( !parent.IsArray() )  {
-                    // wrong close-array char (should be close-object)
-                    AddWarning( wxJSONREADER_MISSING,
-                    _T("Trying to close an object using the \']\' (close-array) char" ));
-                }
-                StoreValue( ch, key, value, parent );
-                m_current = &parent;
-                m_next    = 0;
-                m_current->SetLineNo( m_lineNo );
-                return 0;   // returning ZERO for reading the next char
-                break;
+        case ']' :
+            if ( !parent.IsArray() )
+            {
+                // wrong close-array char (should be close-object)
+                AddWarning( wxJSONREADER_MISSING,
+                            _T( "Trying to close an object using the \']\' (close-array) char" ) );
+            }
+            StoreValue( ch, key, value, parent );
+            m_current = &parent;
+            m_next    = 0;
+            m_current->SetLineNo( m_lineNo );
+            return 0;   // returning ZERO for reading the next char
+            break;
 
-            case ',' :
-                // store the value, if any
-                StoreValue( ch, key, value, parent );
-                key.clear();
-                ch = ReadChar( is );
-                break;
+        case ',' :
+            // store the value, if any
+            StoreValue( ch, key, value, parent );
+            key.clear();
+            ch = ReadChar( is );
+            break;
 
-            case '\"' :
-                ch = ReadString( is, value );     // read a JSON string type
-                m_current = &value;
-                m_next    = 0;
-                break;
+        case '\"' :
+            ch = ReadString( is, value );     // read a JSON string type
+            m_current = &value;
+            m_next    = 0;
+            break;
 
-            case '\'' :
-                ch = ReadMemoryBuff( is, value );  // read a memory buffer type
-                m_current = &value;
-                m_next    = 0;
-                break;
+        case '\'' :
+            ch = ReadMemoryBuff( is, value );  // read a memory buffer type
+            m_current = &value;
+            m_next    = 0;
+            break;
 
-            case ':' :   // key / value separator
-                m_current = &value;
-                m_current->SetLineNo( m_lineNo );
-                m_next    = 0;
-                if ( !parent.IsObject() )  {
-                    AddError( _T( "\':\' can only used in object's values" ));
-                }
-                else if ( !value.IsString() )  {
-                    AddError( _T( "\':\' follows a value which is not of type \'string\'" ));
-                }
-                else if ( !key.empty() )  {
-                    AddError( _T( "\':\' not allowed where a \'name\' string was already available" ));
-                }
-                else  {
-                    // the string in 'value' is set as the 'key'
-                    key = value.AsString();
-                    value.SetType( wxJSONTYPE_INVALID );
-                }
-                ch = ReadChar( is );
-                break;
+        case ':' :   // key / value separator
+            m_current = &value;
+            m_current->SetLineNo( m_lineNo );
+            m_next    = 0;
+            if ( !parent.IsObject() )
+            {
+                AddError( _T( "\':\' can only used in object's values" ) );
+            }
+            else if ( !value.IsString() )
+            {
+                AddError( _T( "\':\' follows a value which is not of type \'string\'" ) );
+            }
+            else if ( !key.empty() )
+            {
+                AddError( _T( "\':\' not allowed where a \'name\' string was already available" ) );
+            }
+            else
+            {
+                // the string in 'value' is set as the 'key'
+                key = value.AsString();
+                value.SetType( wxJSONTYPE_INVALID );
+            }
+            ch = ReadChar( is );
+            break;
 
-            default :
-                // no special char: it is a literal or a number
-                // errors are checked in the 'ReadValue()' function.
-                m_current = &value;
-                m_current->SetLineNo( m_lineNo );
-                m_next    = 0;
-                ch = ReadValue( is, ch, value );
-                break;
+        default :
+            // no special char: it is a literal or a number
+            // errors are checked in the 'ReadValue()' function.
+            m_current = &value;
+            m_current->SetLineNo( m_lineNo );
+            m_next    = 0;
+            ch = ReadValue( is, ch, value );
+            break;
         } // end switch
-    } while ( ch >= 0 );
+    }
+    while ( ch >= 0 );
 
     // the DoRead() should return when the close-object/array char is encontered
     // if we are here, the EOF condition was encontered so one or more close-something
     // characters are missing
-    if ( parent.IsArray() )  {
-        AddWarning( wxJSONREADER_MISSING, _T("\']\' missing at end of file"));
+    if ( parent.IsArray() )
+    {
+        AddWarning( wxJSONREADER_MISSING, _T( "\']\' missing at end of file" ) );
+    }
+    else if ( parent.IsObject() )
+    {
+        AddWarning( wxJSONREADER_MISSING, _T( "\'}\' missing at end of file" ) );
     }
-    else if ( parent.IsObject() )  {
-        AddWarning( wxJSONREADER_MISSING, _T("\'}\' missing at end of file"));
-    }
-    else  {
+    else
+    {
         wxJSON_ASSERT( 0 );
     }
 
@@ -775,59 +817,71 @@
     //
     // if 'ch' == , (comma) value AND key (for TypeMap) cannot be empty
     //
-    wxLogTrace( traceMask, _T("(%s) ch=%d char=%c"), __PRETTY_FUNCTION__, ch, (char) ch);
-    wxLogTrace( traceMask, _T("(%s) value=%s"), __PRETTY_FUNCTION__, value.AsString().c_str());
+    wxLogTrace( traceMask, _T( "(%s) ch=%d char=%c" ), __PRETTY_FUNCTION__, ch, ( char ) ch );
+    wxLogTrace( traceMask, _T( "(%s) value=%s" ), __PRETTY_FUNCTION__, value.AsString().c_str() );
 
     m_current = 0;
     m_next    = &value;
     m_lastStored = 0;
     m_next->SetLineNo( -1 );
 
-    if ( !value.IsValid() && key.empty() ) {
+    if ( !value.IsValid() && key.empty() )
+    {
         // OK, if the char read is a close-object or close-array
-        if ( ch == '}' || ch == ']' )  {
+        if ( ch == '}' || ch == ']' )
+        {
             m_lastStored = 0;
-            wxLogTrace( traceMask, _T("(%s) key and value are empty, returning"),
-                             __PRETTY_FUNCTION__);
+            wxLogTrace( traceMask, _T( "(%s) key and value are empty, returning" ),
+                        __PRETTY_FUNCTION__ );
         }
-        else  {
-            AddError( _T("key or value is missing for JSON value"));
+        else
+        {
+            AddError( _T( "key or value is missing for JSON value" ) );
         }
     }
-    else  {
+    else
+    {
         // key or value are not empty
-        if ( parent.IsObject() )  {
-            if ( !value.IsValid() ) {
-                AddError( _T("cannot store the value: \'value\' is missing for JSON object type"));
-             }
-             else if ( key.empty() ) {
-                AddError( _T("cannot store the value: \'key\' is missing for JSON object type"));
+        if ( parent.IsObject() )
+        {
+            if ( !value.IsValid() )
+            {
+                AddError( _T( "cannot store the value: \'value\' is missing for JSON object type" ) );
+            }
+            else if ( key.empty() )
+            {
+                AddError( _T( "cannot store the value: \'key\' is missing for JSON object type" ) );
             }
-            else  {
+            else
+            {
                 // OK, adding the value to parent key/value map
-                wxLogTrace( traceMask, _T("(%s) adding value to key:%s"),
-                     __PRETTY_FUNCTION__, key.c_str());
+                wxLogTrace( traceMask, _T( "(%s) adding value to key:%s" ),
+                            __PRETTY_FUNCTION__, key.c_str() );
                 parent[key] = value;
-                m_lastStored = &(parent[key]);
+                m_lastStored = &( parent[key] );
                 m_lastStored->SetLineNo( m_lineNo );
             }
         }
-        else if ( parent.IsArray() ) {
-            if ( !value.IsValid() ) {
-                    AddError( _T("cannot store the item: \'value\' is missing for JSON array type"));
-            }
-            if ( !key.empty() ) {
-                AddError( _T("cannot store the item: \'key\' (\'%s\') is not permitted in JSON array type"), key);
+        else if ( parent.IsArray() )
+        {
+            if ( !value.IsValid() )
+            {
+                AddError( _T( "cannot store the item: \'value\' is missing for JSON array type" ) );
+            }
+            if ( !key.empty() )
+            {
+                AddError( _T( "cannot store the item: \'key\' (\'%s\') is not permitted in JSON array type" ), key );
             }
-            wxLogTrace( traceMask, _T("(%s) appending value to parent array"),
-                                 __PRETTY_FUNCTION__ );
+            wxLogTrace( traceMask, _T( "(%s) appending value to parent array" ),
+                        __PRETTY_FUNCTION__ );
             parent.Append( value );
             const wxJSONInternalArray* arr = parent.AsArray();
             wxJSON_ASSERT( arr );
-            m_lastStored = &(arr->Last());
+            m_lastStored = &( arr->Last() );
             m_lastStored->SetLineNo( m_lineNo );
         }
-        else  {
+        else
+        {
             wxJSON_ASSERT( 0 );  // should never happen
         }
     }
@@ -856,15 +910,17 @@
 wxJSONReader::AddError( const wxString& msg )
 {
     wxString err;
-    err.Printf( _T("Error: line %d, col %d - %s"), m_lineNo, m_colNo, msg.c_str() );
+    err.Printf( _T( "Error: line %d, col %d - %s" ), m_lineNo, m_colNo, msg.c_str() );
 
-    wxLogTrace( traceMask, _T("(%s) %s"), __PRETTY_FUNCTION__, err.c_str());
+    wxLogTrace( traceMask, _T( "(%s) %s" ), __PRETTY_FUNCTION__, err.c_str() );
 
-    if ( (int) m_errors.size() < m_maxErrors )  {
+    if ( ( int ) m_errors.size() < m_maxErrors )
+    {
         m_errors.Add( err );
     }
-    else if ( (int) m_errors.size() == m_maxErrors )  {
-        m_errors.Add( _T("ERROR: too many error messages - ignoring further errors"));
+    else if ( ( int ) m_errors.size() == m_maxErrors )
+    {
+        m_errors.Add( _T( "ERROR: too many error messages - ignoring further errors" ) );
     }
     // else if ( m_errors > m_maxErrors ) do nothing, thus ignore the error message
 }
@@ -915,22 +971,26 @@
 {
     // if 'type' AND 'm_flags' == 1 than the extension is
     // ON. Otherwise it is OFF anf the function calls AddError()
-    if ( type != 0 )    {
-        if ( ( type & m_flags ) == 0 )  {
+    if ( type != 0 )
+    {
+        if ( ( type & m_flags ) == 0 )
+        {
             AddError( msg );
             return;
         }
     }
 
     wxString err;
-    err.Printf( _T( "Warning: line %d, col %d - %s"), m_lineNo, m_colNo, msg.c_str() );
+    err.Printf( _T( "Warning: line %d, col %d - %s" ), m_lineNo, m_colNo, msg.c_str() );
 
-    wxLogTrace( traceMask, _T("(%s) %s"), __PRETTY_FUNCTION__, err.c_str());
-    if ( (int) m_warnings.size() < m_maxErrors )  {
+    wxLogTrace( traceMask, _T( "(%s) %s" ), __PRETTY_FUNCTION__, err.c_str() );
+    if ( ( int ) m_warnings.size() < m_maxErrors )
+    {
         m_warnings.Add( err );
     }
-    else if ( (int) m_warnings.size() == m_maxErrors )  {
-        m_warnings.Add( _T("Error: too many warning messages - ignoring further warnings"));
+    else if ( ( int ) m_warnings.size() == m_maxErrors )
+    {
+        m_warnings.Add( _T( "Error: too many warning messages - ignoring further warnings" ) );
     }
     // else do nothing, thus ignore the warning message
 }
@@ -949,15 +1009,17 @@
 {
     // just read one byte at a time and check for whitespaces
     int ch;
-    do {
+    do
+    {
         ch = ReadChar( is );
-        if ( ch < 0 )  {
+        if ( ch < 0 )
+        {
             break;
         }
     }
     while ( ch == ' ' || ch == '\n' || ch == '\t' );
-    wxLogTrace( traceMask, _T("(%s) end whitespaces line=%d col=%d"),
-             __PRETTY_FUNCTION__, m_lineNo, m_colNo );
+    wxLogTrace( traceMask, _T( "(%s) end whitespaces line=%d col=%d" ),
+                __PRETTY_FUNCTION__, m_lineNo, m_colNo );
     return ch;
 }
 
@@ -977,64 +1039,75 @@
 wxJSONReader::SkipComment( wxInputStream& is )
 {
     static const wxChar* warn =
-    _T("Comments may be tolerated in JSON text but they are not part of JSON syntax");
+        _T( "Comments may be tolerated in JSON text but they are not part of JSON syntax" );
 
     // if it is a comment, then a warning is added to the array
     // otherwise it is an error: values cannot start with a '/'
     // read the char next to the first slash
     int ch = ReadChar( is );
-    if ( ch < 0 )  {
+    if ( ch < 0 )
+    {
         return -1;
     }
 
-    wxLogTrace( storeTraceMask, _T("(%s) start comment line=%d col=%d"),
-             __PRETTY_FUNCTION__, m_lineNo, m_colNo );
+    wxLogTrace( storeTraceMask, _T( "(%s) start comment line=%d col=%d" ),
+                __PRETTY_FUNCTION__, m_lineNo, m_colNo );
 
     // the temporary UTF-8/ANSI buffer that holds the comment string. This will be
     // converted to a wxString object using wxString::FromUTF8() or From8BitData()
     wxMemoryBuffer utf8Buff;
     unsigned char c;
 
-    if ( ch == '/' )  {         // C++ comment, read until end-of-line
+    if ( ch == '/' )            // C++ comment, read until end-of-line
+    {
         // C++ comment strings are in UTF-8 format. we store all
         // UTF-8 code units until the first LF or CR+LF
         AddWarning( wxJSONREADER_ALLOW_COMMENTS, warn );
         m_commentLine = m_lineNo;
         utf8Buff.AppendData( "//", 2 );
 
-        while ( ch >= 0 )  {
-            if ( ch == '\n' )    {
+        while ( ch >= 0 )
+        {
+            if ( ch == '\n' )
+            {
                 break;
             }
-            if ( ch == '\r' )    {
+            if ( ch == '\r' )
+            {
                 ch = PeekChar( is );
-                if ( ch == '\n' )    {
+                if ( ch == '\n' )
+                {
                     ch = ReadChar( is );
                 }
                 break;
             }
-            else    {
+            else
+            {
                 // store the char in the UTF8 temporary buffer
-                c = (unsigned char) ch;
+                c = ( unsigned char ) ch;
                 utf8Buff.AppendByte( c );
             }
             ch = ReadChar( is );
         }
         // now convert the temporary UTF-8 buffer
-        m_comment = wxString::FromUTF8( (const char*) utf8Buff.GetData(),
-                        utf8Buff.GetDataLen());
+        m_comment = wxString::FromUTF8( ( const char* ) utf8Buff.GetData(),
+                                        utf8Buff.GetDataLen() );
     }
 
     // check if a C-style comment
-    else if ( ch == '*' )  {     // C-style comment
-        AddWarning(wxJSONREADER_ALLOW_COMMENTS, warn );
+    else if ( ch == '*' )        // C-style comment
+    {
+        AddWarning( wxJSONREADER_ALLOW_COMMENTS, warn );
         m_commentLine = m_lineNo;
         utf8Buff.AppendData( "/*", 2 );
-        while ( ch >= 0 ) {
+        while ( ch >= 0 )
+        {
             // check the END-COMMENT chars ('*/')
-            if ( ch == '*' )    {
+            if ( ch == '*' )
+            {
                 ch = PeekChar( is );
-                if ( ch == '/' )    {
+                if ( ch == '/' )
+                {
                     ch = ReadChar( is );  // read the '/' char
                     ch = ReadChar( is );  // read the next char that will be returned
                     utf8Buff.AppendData( "*/", 2 );
@@ -1042,43 +1115,49 @@
                 }
             }
             // store the char in the UTF8 temporary buffer
-            c = (unsigned char) ch;
+            c = ( unsigned char ) ch;
             utf8Buff.AppendByte( c );
             ch = ReadChar( is );
         }
         // now convert the temporary buffer in a wxString object
-        if ( m_noUtf8 )    {
-            m_comment = wxString::From8BitData( (const char*) utf8Buff.GetData(),
-                                utf8Buff.GetDataLen());
+        if ( m_noUtf8 )
+        {
+            m_comment = wxString::From8BitData( ( const char* ) utf8Buff.GetData(),
+                                                utf8Buff.GetDataLen() );
         }
-        else    {
-            m_comment = wxString::FromUTF8( (const char*) utf8Buff.GetData(),
-                                utf8Buff.GetDataLen());
+        else
+        {
+            m_comment = wxString::FromUTF8( ( const char* ) utf8Buff.GetData(),
+                                            utf8Buff.GetDataLen() );
         }
     }
 
-    else  {   // it is not a comment, return the character next the first '/'
-        AddError( _T( "Strange '/' (did you want to insert a comment?)"));
+    else      // it is not a comment, return the character next the first '/'
+    {
+        AddError( _T( "Strange '/' (did you want to insert a comment?)" ) );
         // we read until end-of-line OR end of C-style comment OR EOF
         // because a '/' should be a start comment
-        while ( ch >= 0 ) {
+        while ( ch >= 0 )
+        {
             ch = ReadChar( is );
-            if ( ch == '*' && PeekChar( is ) == '/' )  {
+            if ( ch == '*' && PeekChar( is ) == '/' )
+            {
                 break;
             }
-            if ( ch == '\n' )  {
+            if ( ch == '\n' )
+            {
                 break;
             }
         }
         // read the next char that will be returned
         ch = ReadChar( is );
     }
-    wxLogTrace( traceMask, _T("(%s) end comment line=%d col=%d"),
-             __PRETTY_FUNCTION__, m_lineNo, m_colNo );
-    wxLogTrace( storeTraceMask, _T("(%s) end comment line=%d col=%d"),
-             __PRETTY_FUNCTION__, m_lineNo, m_colNo );
-    wxLogTrace( storeTraceMask, _T("(%s) comment=%s"),
-             __PRETTY_FUNCTION__, m_comment.c_str());
+    wxLogTrace( traceMask, _T( "(%s) end comment line=%d col=%d" ),
+                __PRETTY_FUNCTION__, m_lineNo, m_colNo );
+    wxLogTrace( storeTraceMask, _T( "(%s) end comment line=%d col=%d" ),
+                __PRETTY_FUNCTION__, m_lineNo, m_colNo );
+    wxLogTrace( storeTraceMask, _T( "(%s) comment=%s" ),
+                __PRETTY_FUNCTION__, m_comment.c_str() );
     return ch;
 }
 
@@ -1135,56 +1214,62 @@
     char ues[8];        // stores a Unicode Escaped Esquence: \uXXXX
 
     int ch = 0;
-    while ( ch >= 0 ) {
+    while ( ch >= 0 )
+    {
         ch = ReadChar( is );
-        unsigned char c = (unsigned char) ch;
-        if ( ch == '\\' )  {    // an escape sequence
+        unsigned char c = ( unsigned char ) ch;
+        if ( ch == '\\' )       // an escape sequence
+        {
             ch = ReadChar( is );
-            switch ( ch )  {
-                case -1 :        // EOF
-                    break;
-                case 't' :
-                    utf8Buff.AppendByte( '\t' );
-                    break;
-                case 'n' :
-                    utf8Buff.AppendByte( '\n' );
-                    break;
-                case 'b' :
-                    utf8Buff.AppendByte( '\b' );
-                    break;
-                case 'r' :
-                    utf8Buff.AppendByte( '\r' );
-                    break;
-                case '\"' :
-                    utf8Buff.AppendByte( '\"' );
-                    break;
-                case '\\' :
-                    utf8Buff.AppendByte( '\\' );
-                    break;
-                case '/' :
-                    utf8Buff.AppendByte( '/' );
-                    break;
-                case 'f' :
-                    utf8Buff.AppendByte( '\f' );
-                    break;
-                case 'u' :
-                    ch = ReadUES( is, ues );
-                    if ( ch < 0 ) {        // if EOF, returns
-                        return ch;
-                    }
-                    // append the escaped character to the UTF8 buffer
-                    AppendUES( utf8Buff, ues );
-                    // many thanks to Bryan Ashby who discovered this bug
-                    continue;
-                    // break;
-                default :
-                    AddError( _T( "Unknow escaped character \'\\%c\'"), ch );
+            switch ( ch )
+            {
+            case -1 :        // EOF
+                break;
+            case 't' :
+                utf8Buff.AppendByte( '\t' );
+                break;
+            case 'n' :
+                utf8Buff.AppendByte( '\n' );
+                break;
+            case 'b' :
+                utf8Buff.AppendByte( '\b' );
+                break;
+            case 'r' :
+                utf8Buff.AppendByte( '\r' );
+                break;
+            case '\"' :
+                utf8Buff.AppendByte( '\"' );
+                break;
+            case '\\' :
+                utf8Buff.AppendByte( '\\' );
+                break;
+            case '/' :
+                utf8Buff.AppendByte( '/' );
+                break;
+            case 'f' :
+                utf8Buff.AppendByte( '\f' );
+                break;
+            case 'u' :
+                ch = ReadUES( is, ues );
+                if ( ch < 0 )          // if EOF, returns
+                {
+                    return ch;
+                }
+                // append the escaped character to the UTF8 buffer
+                AppendUES( utf8Buff, ues );
+                // many thanks to Bryan Ashby who discovered this bug
+                continue;
+            // break;
+            default :
+                AddError( _T( "Unknow escaped character \'\\%c\'" ), ch );
             }
         }
-        else {
+        else
+        {
             // we have read a non-escaped character so we have to append it to
             // the temporary UTF-8 buffer until the next quote char
-            if ( ch == '\"' )    {
+            if ( ch == '\"' )
+            {
                 break;
             }
             utf8Buff.AppendByte( c );
@@ -1194,71 +1279,81 @@
     // if UTF-8 conversion is disabled (ANSI builds only) we just copy the
     // bit data to a wxString object
     wxString s;
-    if ( m_noUtf8 )    {
-        s = wxString::From8BitData( (const char*) utf8Buff.GetData(), utf8Buff.GetDataLen());
+    if ( m_noUtf8 )
+    {
+        s = wxString::From8BitData( ( const char* ) utf8Buff.GetData(), utf8Buff.GetDataLen() );
     }
-    else    {
+    else
+    {
         // perform UTF-8 conversion
         // first we check that the UTF-8 buffer is correct, i.e. it contains valid
         // UTF-8 code points.
         // this works in both ANSI and Unicode builds.
         size_t convLen = wxConvUTF8.ToWChar( 0,        // wchar_t destination
-                        0,                            // size_t  destLenght
-            (const char*) utf8Buff.GetData(),        // char_t  source
-                utf8Buff.GetDataLen());                // size_t  sourceLenght
-
-        if ( convLen == wxCONV_FAILED )    {
-            AddError( _T( "String value: the UTF-8 stream is invalid"));
-            s.append( _T( "<UTF-8 stream not valid>"));
+                                             0,                            // size_t  destLenght
+                                             ( const char* ) utf8Buff.GetData(),      // char_t  source
+                                             utf8Buff.GetDataLen() );               // size_t  sourceLenght
+
+        if ( convLen == wxCONV_FAILED )
+        {
+            AddError( _T( "String value: the UTF-8 stream is invalid" ) );
+            s.append( _T( "<UTF-8 stream not valid>" ) );
         }
-        else    {
+        else
+        {
 #if defined( wxJSON_USE_UNICODE )
             // in Unicode just convert to wxString
-            s = wxString::FromUTF8( (const char*) utf8Buff.GetData(), utf8Buff.GetDataLen());
+            s = wxString::FromUTF8( ( const char* ) utf8Buff.GetData(), utf8Buff.GetDataLen() );
 #else
             // in ANSI, the conversion may fail and an empty string is returned
             // in this case, the reader do a char-by-char conversion storing
-              // unicode escaped sequences of unrepresentable characters
-            s = wxString::FromUTF8( (const char*) utf8Buff.GetData(), utf8Buff.GetDataLen());
-            if ( s.IsEmpty() )    {
+            // unicode escaped sequences of unrepresentable characters
+            s = wxString::FromUTF8( ( const char* ) utf8Buff.GetData(), utf8Buff.GetDataLen() );
+            if ( s.IsEmpty() )
+            {
                 int r = ConvertCharByChar( s, utf8Buff );    // return number of escaped sequences
-                if ( r > 0 )    {
-                    AddWarning( 0, _T( "The string value contains unrepresentable Unicode characters"));
+                if ( r > 0 )
+                {
+                    AddWarning( 0, _T( "The string value contains unrepresentable Unicode characters" ) );
                 }
             }
 #endif
         }
-     }
-    wxLogTrace( traceMask, _T("(%s) line=%d col=%d"),
-             __PRETTY_FUNCTION__, m_lineNo, m_colNo );
-    wxLogTrace( traceMask, _T("(%s) string read=%s"),
-             __PRETTY_FUNCTION__, s.c_str() );
-    wxLogTrace( traceMask, _T("(%s) value=%s"),
-             __PRETTY_FUNCTION__, val.AsString().c_str() );
+    }
+    wxLogTrace( traceMask, _T( "(%s) line=%d col=%d" ),
+                __PRETTY_FUNCTION__, m_lineNo, m_colNo );
+    wxLogTrace( traceMask, _T( "(%s) string read=%s" ),
+                __PRETTY_FUNCTION__, s.c_str() );
+    wxLogTrace( traceMask, _T( "(%s) value=%s" ),
+                __PRETTY_FUNCTION__, val.AsString().c_str() );
 
     // now assign the string to the JSON-value 'value'
     // must check that:
     //   'value'  is empty
     //   'value'  is a string; concatenate it but emit warning
-    if ( !val.IsValid() )   {
-        wxLogTrace( traceMask, _T("(%s) assigning the string to value"), __PRETTY_FUNCTION__ );
+    if ( !val.IsValid() )
+    {
+        wxLogTrace( traceMask, _T( "(%s) assigning the string to value" ), __PRETTY_FUNCTION__ );
         val = s ;
     }
-    else if ( val.IsString() )  {
+    else if ( val.IsString() )
+    {
         AddWarning( wxJSONREADER_MULTISTRING,
-            _T("Multiline strings are not allowed by JSON syntax") );
-        wxLogTrace( traceMask, _T("(%s) concatenate the string to value"), __PRETTY_FUNCTION__ );
+                    _T( "Multiline strings are not allowed by JSON syntax" ) );
+        wxLogTrace( traceMask, _T( "(%s) concatenate the string to value" ), __PRETTY_FUNCTION__ );
         val.Cat( s );
     }
-    else  {
-        AddError( _T( "String value \'%s\' cannot follow another value"), s );
+    else
+    {
+        AddError( _T( "String value \'%s\' cannot follow another value" ), s );
     }
 
     // store the input text's line number when the string was stored in 'val'
     val.SetLineNo( m_lineNo );
 
     // read the next char after the closing quotes and returns it
-    if ( ch >= 0 )  {
+    if ( ch >= 0 )
+    {
         ch = ReadChar( is );
     }
     return ch;
@@ -1288,36 +1383,38 @@
 wxJSONReader::ReadToken( wxInputStream& is, int ch, wxString& s )
 {
     int nextCh = ch;
-    while ( nextCh >= 0 ) {
-        switch ( nextCh ) {
-            case ' ' :
-            case ',' :
-            case ':' :
-            case '[' :
-            case ']' :
-            case '{' :
-            case '}' :
-            case '\t' :
-            case '\n' :
-            case '\r' :
-            case '\b' :
-                wxLogTrace( traceMask, _T("(%s) line=%d col=%d"),
-                     __PRETTY_FUNCTION__, m_lineNo, m_colNo );
-                wxLogTrace( traceMask, _T("(%s) token read=%s"),
-                     __PRETTY_FUNCTION__, s.c_str() );
-                return nextCh;
-                break;
-            default :
-                s.Append( (unsigned char) nextCh, 1 );
-                break;
+    while ( nextCh >= 0 )
+    {
+        switch ( nextCh )
+        {
+        case ' ' :
+        case ',' :
+        case ':' :
+        case '[' :
+        case ']' :
+        case '{' :
+        case '}' :
+        case '\t' :
+        case '\n' :
+        case '\r' :
+        case '\b' :
+            wxLogTrace( traceMask, _T( "(%s) line=%d col=%d" ),
+                        __PRETTY_FUNCTION__, m_lineNo, m_colNo );
+            wxLogTrace( traceMask, _T( "(%s) token read=%s" ),
+                        __PRETTY_FUNCTION__, s.c_str() );
+            return nextCh;
+            break;
+        default :
+            s.Append( ( unsigned char ) nextCh, 1 );
+            break;
         }
         // read the next character
         nextCh = ReadChar( is );
     }
-    wxLogTrace( traceMask, _T("(%s) EOF on line=%d col=%d"),
-         __PRETTY_FUNCTION__, m_lineNo, m_colNo );
-    wxLogTrace( traceMask, _T("(%s) EOF - token read=%s"),
-             __PRETTY_FUNCTION__, s.c_str() );
+    wxLogTrace( traceMask, _T( "(%s) EOF on line=%d col=%d" ),
+                __PRETTY_FUNCTION__, m_lineNo, m_colNo );
+    wxLogTrace( traceMask, _T( "(%s) EOF - token read=%s" ),
+                __PRETTY_FUNCTION__, s.c_str() );
     return nextCh;
 }
 
@@ -1350,54 +1447,63 @@
 {
     wxString s;
     int nextCh = ReadToken( is, ch, s );
-    wxLogTrace( traceMask, _T("(%s) value=%s"),
-             __PRETTY_FUNCTION__, val.AsString().c_str() );
+    wxLogTrace( traceMask, _T( "(%s) value=%s" ),
+                __PRETTY_FUNCTION__, val.AsString().c_str() );
 
-    if ( val.IsValid() )  {
-        AddError( _T( "Value \'%s\' cannot follow a value: \',\' or \':\' missing?"), s );
+    if ( val.IsValid() )
+    {
+        AddError( _T( "Value \'%s\' cannot follow a value: \',\' or \':\' missing?" ), s );
         return nextCh;
     }
 
     // variables used for converting numeric values
-    bool r;  double d;
+    bool r;
+    double d;
 #if defined( wxJSON_64BIT_INT )
     wxInt64  i64;
     wxUint64 ui64;
 #else
-    unsigned long int ul; long int l;
+    unsigned long int ul;
+    long int l;
 #endif
 
     // first try the literal strings lowercase and nocase
-    if ( s == _T("null") ) {
+    if ( s == _T( "null" ) )
+    {
         val.SetType( wxJSONTYPE_NULL );
-        wxLogTrace( traceMask, _T("(%s) value = NULL"),  __PRETTY_FUNCTION__ );
+        wxLogTrace( traceMask, _T( "(%s) value = NULL" ),  __PRETTY_FUNCTION__ );
         return nextCh;
     }
-    else if ( s.CmpNoCase( _T( "null" )) == 0 ) {
-        wxLogTrace( traceMask, _T("(%s) value = NULL"),  __PRETTY_FUNCTION__ );
-        AddWarning( wxJSONREADER_CASE, _T( "the \'null\' literal must be lowercase" ));
+    else if ( s.CmpNoCase( _T( "null" ) ) == 0 )
+    {
+        wxLogTrace( traceMask, _T( "(%s) value = NULL" ),  __PRETTY_FUNCTION__ );
+        AddWarning( wxJSONREADER_CASE, _T( "the \'null\' literal must be lowercase" ) );
         val.SetType( wxJSONTYPE_NULL );
         return nextCh;
     }
-    else if ( s == _T("true") ) {
-        wxLogTrace( traceMask, _T("(%s) value = TRUE"),  __PRETTY_FUNCTION__ );
+    else if ( s == _T( "true" ) )
+    {
+        wxLogTrace( traceMask, _T( "(%s) value = TRUE" ),  __PRETTY_FUNCTION__ );
         val = true;
         return nextCh;
     }
-    else if ( s.CmpNoCase( _T( "true" )) == 0 ) {
-        wxLogTrace( traceMask, _T("(%s) value = TRUE"),  __PRETTY_FUNCTION__ );
-        AddWarning( wxJSONREADER_CASE, _T( "the \'true\' literal must be lowercase" ));
+    else if ( s.CmpNoCase( _T( "true" ) ) == 0 )
+    {
+        wxLogTrace( traceMask, _T( "(%s) value = TRUE" ),  __PRETTY_FUNCTION__ );
+        AddWarning( wxJSONREADER_CASE, _T( "the \'true\' literal must be lowercase" ) );
         val = true;
         return nextCh;
     }
-    else if ( s == _T("false") ) {
-        wxLogTrace( traceMask, _T("(%s) value = FALSE"),  __PRETTY_FUNCTION__ );
+    else if ( s == _T( "false" ) )
+    {
+        wxLogTrace( traceMask, _T( "(%s) value = FALSE" ),  __PRETTY_FUNCTION__ );
         val = false;
         return nextCh;
     }
-    else if ( s.CmpNoCase( _T( "false" )) == 0 ) {
-        wxLogTrace( traceMask, _T("(%s) value = FALSE"),  __PRETTY_FUNCTION__ );
-        AddWarning( wxJSONREADER_CASE, _T( "the \'false\' literal must be lowercase" ));
+    else if ( s.CmpNoCase( _T( "false" ) ) == 0 )
+    {
+        wxLogTrace( traceMask, _T( "(%s) value = FALSE" ),  __PRETTY_FUNCTION__ );
+        AddWarning( wxJSONREADER_CASE, _T( "the \'false\' literal must be lowercase" ) );
         val = false;
         return nextCh;
     }
@@ -1409,83 +1515,92 @@
     //    2. unsigned integer (not if 'ch' == '-')
     //    3. finally double
     bool tSigned = true, tUnsigned = true, tDouble = true;
-    switch ( ch )  {
-        case '0' :
-        case '1' :
-        case '2' :
-        case '3' :
-        case '4' :
-        case '5' :
-        case '6' :
-        case '7' :
-        case '8' :
-        case '9' :
-            // first try a signed integer, then a unsigned integer, then a double
-            break;
-
-        case '+' :
-            // the plus sign forces a unsigned integer
-            tSigned = false;
-            break;
-
-        case '-' :
-            // try signed and double
-            tUnsigned = false;
-            break;
-        default :
-            AddError( _T( "Literal \'%s\' is incorrect (did you forget quotes?)"), s );
-            return nextCh;
+    switch ( ch )
+    {
+    case '0' :
+    case '1' :
+    case '2' :
+    case '3' :
+    case '4' :
+    case '5' :
+    case '6' :
+    case '7' :
+    case '8' :
+    case '9' :
+        // first try a signed integer, then a unsigned integer, then a double
+        break;
+
+    case '+' :
+        // the plus sign forces a unsigned integer
+        tSigned = false;
+        break;
+
+    case '-' :
+        // try signed and double
+        tUnsigned = false;
+        break;
+    default :
+        AddError( _T( "Literal \'%s\' is incorrect (did you forget quotes?)" ), s );
+        return nextCh;
     }
 
-    if ( tSigned )    {
-    #if defined( wxJSON_64BIT_INT)
+    if ( tSigned )
+    {
+#if defined( wxJSON_64BIT_INT)
         r = Strtoll( s, &i64 );
-        wxLogTrace( traceMask, _T("(%s) convert to wxInt64 result=%d"),
-                  __PRETTY_FUNCTION__, r );
-        if ( r )  {
+        wxLogTrace( traceMask, _T( "(%s) convert to wxInt64 result=%d" ),
+                    __PRETTY_FUNCTION__, r );
+        if ( r )
+        {
             // store the value
             val = i64;
             return nextCh;
         }
-    #else
+#else
         r = s.ToLong( &l );
-        wxLogTrace( traceMask, _T("(%s) convert to int result=%d"),
-                 __PRETTY_FUNCTION__, r );
-        if ( r )  {
+        wxLogTrace( traceMask, _T( "(%s) convert to int result=%d" ),
+                    __PRETTY_FUNCTION__, r );
+        if ( r )
+        {
             // store the value
-            val = (int) l;
+            val = ( int ) l;
             return nextCh;
         }
-    #endif
+#endif
     }
 
-    if ( tUnsigned )    {
-    #if defined( wxJSON_64BIT_INT)
+    if ( tUnsigned )
+    {
+#if defined( wxJSON_64BIT_INT)
         r = Strtoull( s, &ui64 );
-        wxLogTrace( traceMask, _T("(%s) convert to wxUint64 result=%d"),
-                              __PRETTY_FUNCTION__, r );
-        if ( r )  {
+        wxLogTrace( traceMask, _T( "(%s) convert to wxUint64 result=%d" ),
+                    __PRETTY_FUNCTION__, r );
+        if ( r )
+        {
             // store the value
             val = ui64;
             return nextCh;
         }
-    #else
+#else
         r = s.ToULong( &ul );
-        wxLogTrace( traceMask, _T("(%s) convert to int result=%d"),
-                         __PRETTY_FUNCTION__, r );
-        if ( r )  {
+        wxLogTrace( traceMask, _T( "(%s) convert to int result=%d" ),
+                    __PRETTY_FUNCTION__, r );
+        if ( r )
+        {
             // store the value
-            val = (unsigned int) ul;
+            val = ( unsigned int ) ul;
             return nextCh;
         }
-    #endif
+#endif
     }
 
-    if ( tDouble )    {
+    if ( tDouble )
+    {
         r = s.ToDouble( &d );
-        wxLogTrace( traceMask, _T("(%s) convert to double result=%d"),
-                 __PRETTY_FUNCTION__, r );
-        if ( r )  {
+        wxLogTrace( traceMask, _T( "(%s) convert to double result=%d" ),
+                    __PRETTY_FUNCTION__, r );
+        if ( r )
+        {
             // store the value
             val = d;
             return nextCh;
@@ -1494,9 +1609,9 @@
 
 
     // the value is not syntactically correct
-    AddError( _T( "Literal \'%s\' is incorrect (did you forget quotes?)"), s );
+    AddError( _T( "Literal \'%s\' is incorrect (did you forget quotes?)" ), s );
+    return nextCh;
     return nextCh;
-  return nextCh;
 }
 
 
@@ -1523,12 +1638,14 @@
 wxJSONReader::ReadUES( wxInputStream& is, char* uesBuffer )
 {
     int ch;
-    for ( int i = 0; i < 4; i++ )  {
+    for ( int i = 0; i < 4; i++ )
+    {
         ch = ReadChar( is );
-        if ( ch < 0 )  {
+        if ( ch < 0 )
+        {
             return ch;
         }
-        uesBuffer[i] = (unsigned char) ch;
+        uesBuffer[i] = ( unsigned char ) ch;
     }
     uesBuffer[4] = 0;    // makes a ASCIIZ string
 
@@ -1568,20 +1685,22 @@
 {
     unsigned long l;
     int r = sscanf( uesBuffer, "%lx", &l );    // r is the assigned items
-    if ( r != 1  )  {
-        AddError( _T( "Invalid Unicode Escaped Sequence"));
+    if ( r != 1  )
+    {
+        AddError( _T( "Invalid Unicode Escaped Sequence" ) );
         return -1;
     }
-    wxLogTrace( traceMask, _T("(%s) unicode sequence=%s code=%ld"),
-              __PRETTY_FUNCTION__, uesBuffer, l );
+    wxLogTrace( traceMask, _T( "(%s) unicode sequence=%s code=%ld" ),
+                __PRETTY_FUNCTION__, uesBuffer, l );
 
-    wchar_t ch = (wchar_t) l;
+    wchar_t ch = ( wchar_t ) l;
     char buffer[16];
     size_t len = wxConvUTF8.FromWChar( buffer, 10, &ch, 1 );
 
     // seems that the wxMBConv classes always appends a NULL byte to
     // the converted buffer
-    if ( len > 1 )    {
+    if ( len > 1 )
+    {
         len = len - 1;
     }
     utf8Buff.AppendData( buffer, len );
@@ -1620,49 +1739,56 @@
 void
 wxJSONReader::StoreComment( const wxJSONValue* parent )
 {
-    wxLogTrace( storeTraceMask, _T("(%s) m_comment=%s"),  __PRETTY_FUNCTION__, m_comment.c_str());
-    wxLogTrace( storeTraceMask, _T("(%s) m_flags=%d m_commentLine=%d"),
-              __PRETTY_FUNCTION__, m_flags, m_commentLine );
-    wxLogTrace( storeTraceMask, _T("(%s) m_current=%p"), __PRETTY_FUNCTION__, m_current );
-    wxLogTrace( storeTraceMask, _T("(%s) m_next=%p"), __PRETTY_FUNCTION__, m_next );
-    wxLogTrace( storeTraceMask, _T("(%s) m_lastStored=%p"), __PRETTY_FUNCTION__, m_lastStored );
+    wxLogTrace( storeTraceMask, _T( "(%s) m_comment=%s" ),  __PRETTY_FUNCTION__, m_comment.c_str() );
+    wxLogTrace( storeTraceMask, _T( "(%s) m_flags=%d m_commentLine=%d" ),
+                __PRETTY_FUNCTION__, m_flags, m_commentLine );
+    wxLogTrace( storeTraceMask, _T( "(%s) m_current=%p" ), __PRETTY_FUNCTION__, m_current );
+    wxLogTrace( storeTraceMask, _T( "(%s) m_next=%p" ), __PRETTY_FUNCTION__, m_next );
+    wxLogTrace( storeTraceMask, _T( "(%s) m_lastStored=%p" ), __PRETTY_FUNCTION__, m_lastStored );
 
     // first check if the 'store comment' bit is on
-    if ( (m_flags & wxJSONREADER_STORE_COMMENTS) == 0 )  {
+    if ( ( m_flags & wxJSONREADER_STORE_COMMENTS ) == 0 )
+    {
         m_comment.clear();
         return;
     }
 
     // check if the comment is on the same line of one of the
     // 'current', 'next' or 'lastStored' value
-    if ( m_current != 0 )  {
-        wxLogTrace( storeTraceMask, _T("(%s) m_current->lineNo=%d"),
-             __PRETTY_FUNCTION__, m_current->GetLineNo() );
-        if ( m_current->GetLineNo() == m_commentLine ) {
-            wxLogTrace( storeTraceMask, _T("(%s) comment added to \'m_current\' INLINE"),
-             __PRETTY_FUNCTION__ );
+    if ( m_current != 0 )
+    {
+        wxLogTrace( storeTraceMask, _T( "(%s) m_current->lineNo=%d" ),
+                    __PRETTY_FUNCTION__, m_current->GetLineNo() );
+        if ( m_current->GetLineNo() == m_commentLine )
+        {
+            wxLogTrace( storeTraceMask, _T( "(%s) comment added to \'m_current\' INLINE" ),
+                        __PRETTY_FUNCTION__ );
             m_current->AddComment( m_comment, wxJSONVALUE_COMMENT_INLINE );
             m_comment.clear();
             return;
         }
     }
-    if ( m_next != 0 )  {
-        wxLogTrace( storeTraceMask, _T("(%s) m_next->lineNo=%d"),
-             __PRETTY_FUNCTION__, m_next->GetLineNo() );
-        if ( m_next->GetLineNo() == m_commentLine ) {
-            wxLogTrace( storeTraceMask, _T("(%s) comment added to \'m_next\' INLINE"),
-                 __PRETTY_FUNCTION__ );
+    if ( m_next != 0 )
+    {
+        wxLogTrace( storeTraceMask, _T( "(%s) m_next->lineNo=%d" ),
+                    __PRETTY_FUNCTION__, m_next->GetLineNo() );
+        if ( m_next->GetLineNo() == m_commentLine )
+        {
+            wxLogTrace( storeTraceMask, _T( "(%s) comment added to \'m_next\' INLINE" ),
+                        __PRETTY_FUNCTION__ );
             m_next->AddComment( m_comment, wxJSONVALUE_COMMENT_INLINE );
             m_comment.clear();
             return;
         }
     }
-    if ( m_lastStored != 0 )  {
-        wxLogTrace( storeTraceMask, _T("(%s) m_lastStored->lineNo=%d"),
-             __PRETTY_FUNCTION__, m_lastStored->GetLineNo() );
-        if ( m_lastStored->GetLineNo() == m_commentLine ) {
-            wxLogTrace( storeTraceMask, _T("(%s) comment added to \'m_lastStored\' INLINE"),
-                 __PRETTY_FUNCTION__ );
+    if ( m_lastStored != 0 )
+    {
+        wxLogTrace( storeTraceMask, _T( "(%s) m_lastStored->lineNo=%d" ),
+                    __PRETTY_FUNCTION__, m_lastStored->GetLineNo() );
+        if ( m_lastStored->GetLineNo() == m_commentLine )
+        {
+            wxLogTrace( storeTraceMask, _T( "(%s) comment added to \'m_lastStored\' INLINE" ),
+                        __PRETTY_FUNCTION__ );
             m_lastStored->AddComment( m_comment, wxJSONVALUE_COMMENT_INLINE );
             m_comment.clear();
             return;
@@ -1674,37 +1800,46 @@
     // if comment is AFTER, store the comment in the 'm_lastStored'
     // or 'm_current' value
 
-    if ( m_flags & wxJSONREADER_COMMENTS_AFTER )  {  // comment AFTER
-        if ( m_current )  {
-            if ( m_current == parent || !m_current->IsValid()) {
-                AddError( _T("Cannot find a value for storing the comment (flag AFTER)"));
-            }
-            else  {
-                wxLogTrace( storeTraceMask, _T("(%s) comment added to m_current (AFTER)"),
-                     __PRETTY_FUNCTION__ );
+    if ( m_flags & wxJSONREADER_COMMENTS_AFTER )     // comment AFTER
+    {
+        if ( m_current )
+        {
+            if ( m_current == parent || !m_current->IsValid() )
+            {
+                AddError( _T( "Cannot find a value for storing the comment (flag AFTER)" ) );
+            }
+            else
+            {
+                wxLogTrace( storeTraceMask, _T( "(%s) comment added to m_current (AFTER)" ),
+                            __PRETTY_FUNCTION__ );
                 m_current->AddComment( m_comment, wxJSONVALUE_COMMENT_AFTER );
             }
         }
-        else if ( m_lastStored )  {
-            wxLogTrace( storeTraceMask, _T("(%s) comment added to m_lastStored (AFTER)"),
-                 __PRETTY_FUNCTION__ );
+        else if ( m_lastStored )
+        {
+            wxLogTrace( storeTraceMask, _T( "(%s) comment added to m_lastStored (AFTER)" ),
+                        __PRETTY_FUNCTION__ );
             m_lastStored->AddComment( m_comment, wxJSONVALUE_COMMENT_AFTER );
         }
-        else   {
+        else
+        {
             wxLogTrace( storeTraceMask,
-                _T("(%s) cannot find a value for storing the AFTER comment"), __PRETTY_FUNCTION__ );
-            AddError(_T("Cannot find a value for storing the comment (flag AFTER)"));
+                        _T( "(%s) cannot find a value for storing the AFTER comment" ), __PRETTY_FUNCTION__ );
+            AddError( _T( "Cannot find a value for storing the comment (flag AFTER)" ) );
         }
     }
-    else {       // comment BEFORE can only be added to the 'next' value
-        if ( m_next )  {
-            wxLogTrace( storeTraceMask, _T("(%s) comment added to m_next (BEFORE)"),
-                 __PRETTY_FUNCTION__ );
+    else         // comment BEFORE can only be added to the 'next' value
+    {
+        if ( m_next )
+        {
+            wxLogTrace( storeTraceMask, _T( "(%s) comment added to m_next (BEFORE)" ),
+                        __PRETTY_FUNCTION__ );
             m_next->AddComment( m_comment, wxJSONVALUE_COMMENT_BEFORE );
         }
-        else   {
+        else
+        {
             // cannot find a value for storing the comment
-            AddError(_T("Cannot find a value for storing the comment (flag BEFORE)"));
+            AddError( _T( "Cannot find a value for storing the comment (flag BEFORE)" ) );
         }
     }
     m_comment.clear();
@@ -1753,8 +1888,10 @@
 wxJSONReader::UTF8NumBytes( char ch )
 {
     int num = 0;    // the counter of '1' bits
-    for ( int i = 0; i < 8; i++ )  {
-        if ( (ch & 0x80) == 0 )  {
+    for ( int i = 0; i < 8; i++ )
+    {
+        if ( ( ch & 0x80 ) == 0 )
+        {
             break;
         }
         ++num;
@@ -1763,10 +1900,12 @@
 
     // note that if the char contains more than six '1' bits it is not
     // a valid UTF-8 encoded character
-    if ( num > 6 )  {
+    if ( num > 6 )
+    {
         num = -1;
     }
-    else if ( num == 0 )  {
+    else if ( num == 0 )
+    {
         num = 1;
     }
     return num;
@@ -1792,19 +1931,22 @@
 wxJSONReader::ConvertCharByChar( wxString& s, const wxMemoryBuffer& utf8Buffer )
 {
     size_t len  = utf8Buffer.GetDataLen();
-    char*  buff = (char*) utf8Buffer.GetData();
+    char*  buff = ( char* ) utf8Buffer.GetData();
     char* buffEnd = buff + len;
 
     int result = 0;
     char temp[16];    // the UTF-8 code-point
 
-    while ( buff < buffEnd )    {
+    while ( buff < buffEnd )
+    {
         temp[0] = *buff;    // the first UTF-8 code-unit
         // compute the number of code-untis that make one UTF-8 code-point
         int numBytes = NumBytes( *buff );
         ++buff;
-        for ( int i = 1; i < numBytes; i++ )    {
-            if ( buff >= buffEnd )    {
+        for ( int i = 1; i < numBytes; i++ )
+        {
+            if ( buff >= buffEnd )
+            {
                 break;
             }
             temp[i] = *buff;    // the first UTF-8 code-unit
@@ -1821,13 +1963,15 @@
         // len = wxConvLocal.FromWChar( temp, 16, dst, outLength );
         // len = wxConviso8859_1.FromWChar( temp, 16, dst, outLength );
         len = wxConvLibc.FromWChar( temp, 16, dst, outLength );
-        if ( len == wxCONV_FAILED )    {
+        if ( len == wxCONV_FAILED )
+        {
             ++result;
             wxString t;
-            t.Printf( _T( "\\u%04X"), (int) dst[0] );
+            t.Printf( _T( "\\u%04X" ), ( int ) dst[0] );
             s.Append( t );
         }
-        else    {
+        else
+        {
             s.Append( temp[0], 1 );
         }
     }        // end while
@@ -1858,49 +2002,60 @@
 int
 wxJSONReader::ReadMemoryBuff( wxInputStream& is, wxJSONValue& val )
 {
-    static const wxChar* membuffError = _T("the \'memory buffer\' type contains %d invalid digits" );
+    static const wxChar* membuffError = _T( "the \'memory buffer\' type contains %d invalid digits" );
 
-    AddWarning( wxJSONREADER_MEMORYBUFF, _T( "the \'memory buffer\' type is not valid JSON text" ));
+    AddWarning( wxJSONREADER_MEMORYBUFF, _T( "the \'memory buffer\' type is not valid JSON text" ) );
 
     wxMemoryBuffer buff;
-    int ch = 0; int errors = 0;
+    int ch = 0;
+    int errors = 0;
     unsigned char byte = 0;
-    while ( ch >= 0 ) {
+    while ( ch >= 0 )
+    {
         ch = ReadChar( is );
-        if ( ch < 0 )  {
+        if ( ch < 0 )
+        {
             break;
         }
-        if ( ch == '\'' )  {
+        if ( ch == '\'' )
+        {
             break;
         }
         // the conversion is done two chars at a time
-        unsigned char c1 = (unsigned char) ch;
+        unsigned char c1 = ( unsigned char ) ch;
         ch = ReadChar( is );
-        if ( ch < 0 )  {
+        if ( ch < 0 )
+        {
             break;
         }
-        unsigned char c2 = (unsigned char) ch;
+        unsigned char c2 = ( unsigned char ) ch;
         c1 -= '0';
         c2 -= '0';
-        if ( c1 > 9 )  {
+        if ( c1 > 9 )
+        {
             c1 -= 7;
         }
-        if ( c2 > 9 )  {
+        if ( c2 > 9 )
+        {
             c2 -= 7;
         }
-        if ( c1 > 15 )  {
+        if ( c1 > 15 )
+        {
             ++errors;
         }
-        else if ( c2 > 15 )  {
+        else if ( c2 > 15 )
+        {
             ++errors;
         }
-        else {
-            byte = (c1 * 16) + c2;
+        else
+        {
+            byte = ( c1 * 16 ) + c2;
             buff.AppendByte( byte );
         }
     }   // end while
 
-    if ( errors > 0 )  {
+    if ( errors > 0 )
+    {
         wxString err;
         err.Printf( membuffError, errors );
         AddError( err );
@@ -1911,23 +2066,27 @@
     // must check that:
     //   'value'  is invalid OR
     //   'value'  is a memory buffer; concatenate it
-    if ( !val.IsValid() )   {
-        wxLogTrace( traceMask, _T("(%s) assigning the memory buffer to value"), __PRETTY_FUNCTION__ );
+    if ( !val.IsValid() )
+    {
+        wxLogTrace( traceMask, _T( "(%s) assigning the memory buffer to value" ), __PRETTY_FUNCTION__ );
         val = buff ;
     }
-    else if ( val.IsMemoryBuff() )  {
-        wxLogTrace( traceMask, _T("(%s) concatenate memory buffer to value"), __PRETTY_FUNCTION__ );
+    else if ( val.IsMemoryBuff() )
+    {
+        wxLogTrace( traceMask, _T( "(%s) concatenate memory buffer to value" ), __PRETTY_FUNCTION__ );
         val.Cat( buff );
     }
-    else  {
-        AddError( _T( "Memory buffer value cannot follow another value") );
+    else
+    {
+        AddError( _T( "Memory buffer value cannot follow another value" ) );
     }
 
     // store the input text's line number when the string was stored in 'val'
     val.SetLineNo( m_lineNo );
 
     // read the next char after the closing quotes and returns it
-    if ( ch >= 0 )  {
+    if ( ch >= 0 )
+    {
         ch = ReadChar( is );
     }
     return ch;
@@ -1972,25 +2131,30 @@
     bool r = DoStrto_ll( str, &ui64, &sign );
 
     // check overflow for signed long long
-    switch ( sign )  {
-        case '-' :
-            if ( ui64 > (wxUint64) LLONG_MAX + 1 )  {
-                r = false;
-            }
-            else  {
-                *i64 = (wxInt64) (ui64 * -1);
-            }
-            break;
+    switch ( sign )
+    {
+    case '-' :
+        if ( ui64 > ( wxUint64 ) LLONG_MAX + 1 )
+        {
+            r = false;
+        }
+        else
+        {
+            *i64 = ( wxInt64 ) ( ui64 * -1 );
+        }
+        break;
 
-        // case '+' :
-        default :
-            if ( ui64 > LLONG_MAX )  {
-                r = false;
-            }
-            else  {
-                *i64 = (wxInt64) ui64;
-            }
-            break;
+    // case '+' :
+    default :
+        if ( ui64 > LLONG_MAX )
+        {
+            r = false;
+        }
+        else
+        {
+            *i64 = ( wxInt64 ) ui64;
+        }
+        break;
     }
     return r;
 }
@@ -2005,7 +2169,8 @@
 {
     wxChar sign = ' ';
     bool r = DoStrto_ll( str, ui64, &sign );
-    if ( sign == '-' )  {
+    if ( sign == '-' )
+    {
         r = false;
     }
     return r;
@@ -2025,79 +2190,88 @@
 bool
 wxJSONReader::DoStrto_ll( const wxString& str, wxUint64* ui64, wxChar* sign )
 {
-  // the conversion is done by multiplying the individual digits
-  // in reverse order to the corresponding power of 10
-  //
-  //  10's power:  987654321.9876543210
-  //
-  // LLONG_MAX:     9223372036854775807
-  // LLONG_MIN:    -9223372036854775808
-  // ULLONG_MAX:   18446744073709551615
-  //
-  // the function does not take into account the sign: only a
-  // unsigned long long int is returned
+    // the conversion is done by multiplying the individual digits
+    // in reverse order to the corresponding power of 10
+    //
+    //  10's power:  987654321.9876543210
+    //
+    // LLONG_MAX:     9223372036854775807
+    // LLONG_MIN:    -9223372036854775808
+    // ULLONG_MAX:   18446744073709551615
+    //
+    // the function does not take into account the sign: only a
+    // unsigned long long int is returned
 
     int maxDigits = 20;       // 20 + 1 (for the sign)
 
-    wxUint64 power10[] = {
-    wxULL(1),
-    wxULL(10),
-    wxULL(100),
-    wxULL(1000),
-    wxULL(10000),
-    wxULL(100000),
-    wxULL(1000000),
-    wxULL(10000000),
-    wxULL(100000000),
-    wxULL(1000000000),
-    wxULL(10000000000),
-    wxULL(100000000000),
-    wxULL(1000000000000),
-    wxULL(10000000000000),
-    wxULL(100000000000000),
-    wxULL(1000000000000000),
-    wxULL(10000000000000000),
-    wxULL(100000000000000000),
-    wxULL(1000000000000000000),
-    wxULL(10000000000000000000)
-  };
+    wxUint64 power10[] =
+    {
+        wxULL( 1 ),
+        wxULL( 10 ),
+        wxULL( 100 ),
+        wxULL( 1000 ),
+        wxULL( 10000 ),
+        wxULL( 100000 ),
+        wxULL( 1000000 ),
+        wxULL( 10000000 ),
+        wxULL( 100000000 ),
+        wxULL( 1000000000 ),
+        wxULL( 10000000000 ),
+        wxULL( 100000000000 ),
+        wxULL( 1000000000000 ),
+        wxULL( 10000000000000 ),
+        wxULL( 100000000000000 ),
+        wxULL( 1000000000000000 ),
+        wxULL( 10000000000000000 ),
+        wxULL( 100000000000000000 ),
+        wxULL( 1000000000000000000 ),
+        wxULL( 10000000000000000000 )
+    };
 
 
-    wxUint64 temp1 = wxULL(0);   // the temporary converted integer
+    wxUint64 temp1 = wxULL( 0 ); // the temporary converted integer
 
     int strLen = str.length();
-    if ( strLen == 0 )  {
+    if ( strLen == 0 )
+    {
         // an empty string is converted to a ZERO value: the function succeeds
-        *ui64 = wxLL(0);
+        *ui64 = wxLL( 0 );
         return true;
     }
 
     int index = 0;
     wxChar ch = str[0];
-    if ( ch == '+' || ch == '-' )  {
+    if ( ch == '+' || ch == '-' )
+    {
         *sign = ch;
         ++index;
         ++maxDigits;
     }
 
-    if ( strLen > maxDigits )  {
+    if ( strLen > maxDigits )
+    {
         return false;
     }
 
     // check the overflow: check the string length and the individual digits
     // of the string; the overflow is checked for unsigned long long
-    if ( strLen == maxDigits )  {
-        wxString uLongMax( _T("18446744073709551615"));
+    if ( strLen == maxDigits )
+    {
+        wxString uLongMax( _T( "18446744073709551615" ) );
         int j = 0;
-        for ( int i = index; i < strLen - 1; i++ )  {
+        for ( int i = index; i < strLen - 1; i++ )
+        {
             ch = str[i];
-            if ( ch < '0' || ch > '9' ) {
+            if ( ch < '0' || ch > '9' )
+            {
                 return false;
             }
-            if ( ch > uLongMax[j] ) {
+            if ( ch > uLongMax[j] )
+            {
                 return false;
             }
-            if ( ch < uLongMax[j] ) {
+            if ( ch < uLongMax[j] )
+            {
                 break;
             }
             ++j;
@@ -2107,9 +2281,11 @@
     // get the digits in the reverse order and multiply them by the
     // corresponding power of 10
     int exponent = 0;
-    for ( int i = strLen - 1; i >= index; i-- )   {
+    for ( int i = strLen - 1; i >= index; i-- )
+    {
         wxChar ch = str[i];
-        if ( ch < '0' || ch > '9' ) {
+        if ( ch < '0' || ch > '9' )
+        {
             return false;
         }
         ch = ch - '0';
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/jsonreader.h opencpn-plugin-logbookkonni-1.2024/src/jsonreader.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/jsonreader.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/jsonreader.h	2016-02-25 13:06:29.000000000 +0000
@@ -12,22 +12,22 @@
 #define _WX_JSONREADER_H
 #ifndef __WXOSX__
 #ifdef __GNUG__
-    #pragma interface "jsonreader.h"
+#pragma interface "jsonreader.h"
 #endif
 #endif
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+#pragma hdrstop
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
-    #include <wx/stream.h>
-    #include <wx/string.h>
-    #include <wx/arrstr.h>
+#include <wx/stream.h>
+#include <wx/string.h>
+#include <wx/arrstr.h>
 #endif
 
 
@@ -35,7 +35,8 @@
 #include "jsonval.h"
 
 // The flags of the parser
-enum {
+enum
+{
     wxJSONREADER_STRICT          = 0,
     wxJSONREADER_ALLOW_COMMENTS  = 1,
     wxJSONREADER_STORE_COMMENTS  = 2,
@@ -47,7 +48,7 @@
     wxJSONREADER_MEMORYBUFF      = 128,
 
     wxJSONREADER_TOLERANT        = wxJSONREADER_ALLOW_COMMENTS | wxJSONREADER_CASE |
-                                 wxJSONREADER_MISSING | wxJSONREADER_MULTISTRING,
+                                   wxJSONREADER_MISSING | wxJSONREADER_MULTISTRING,
     wxJSONREADER_COMMENTS_BEFORE = wxJSONREADER_ALLOW_COMMENTS | wxJSONREADER_STORE_COMMENTS
 };
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/jsonval.cpp opencpn-plugin-logbookkonni-1.2024/src/jsonval.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/jsonval.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/jsonval.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -7,12 +7,12 @@
 // Copyright:   (c) 2007 Luciano Cattani
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXOSX__
+
 #ifdef __GNUG__
-    #pragma implementation "jsonval.cpp"
-#endif
+#pragma implementation "jsonval.cpp"
 #endif
 
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -32,9 +32,9 @@
 
 // the trace mask used in wxLogTrace() function
 // static const wxChar* traceMask = _T("jsonval");
-static const wxChar* traceMask = _T("jsonval");
-static const wxChar* compareTraceMask = _T("sameas");
-static const wxChar* cowTraceMask = _T("traceCOW" );
+static const wxChar* traceMask = _T( "jsonval" );
+static const wxChar* compareTraceMask = _T( "sameas" );
+static const wxChar* cowTraceMask = _T( "traceCOW" );
 
 
 
@@ -57,8 +57,8 @@
 */
 
 #if defined( WXJSON_USE_VALUE_COUNTER )
-    // The progressive counter (used for debugging only)
-    int          wxJSONRefData::sm_progr = 1;
+// The progressive counter (used for debugging only)
+int          wxJSONRefData::sm_progr = 1;
 #endif
 
 //! Constructor.
@@ -66,20 +66,21 @@
 {
     m_lineNo   = -1;
     m_refCount = 1;
-    m_memBuff  = 0;
+    m_memBuff  = 0;
 
 #if defined( WXJSON_USE_VALUE_COUNTER )
     m_progr = sm_progr;
     ++sm_progr;
-    wxLogTrace( traceMask, _T("(%s) JSON refData ctor progr=%d"),
-                __PRETTY_FUNCTION__, m_progr);
+    wxLogTrace( traceMask, _T( "(%s) JSON refData ctor progr=%d" ),
+                __PRETTY_FUNCTION__, m_progr );
 #endif
 }
 
 // Dtor
 wxJSONRefData::~wxJSONRefData()
 {
-    if ( m_memBuff ) {
+    if ( m_memBuff )
+    {
         delete m_memBuff;
     }
 }
@@ -146,22 +147,22 @@
    wxJSONvalue aString( "this is a static string" );
    aString = 10;
  \endcode
- To know more about this topic see \ref json_internals_cstring.
-
- Starting from version 1.3 the class can hold binary memory buffers
- as an extension to the JSON syntax. Memory buffers are stored as
- \b wxMemoryBuffer objects which contain binary data. The class
- uses reference counting for the copy and assignment operation but
- it is not a \e copy-on-write structure.
- To know more about memory buffers read \ref wxjson_tutorial_memorybuff
+ To know more about this topic see \ref json_internals_cstring.
+
+ Starting from version 1.3 the class can hold binary memory buffers
+ as an extension to the JSON syntax. Memory buffers are stored as
+ \b wxMemoryBuffer objects which contain binary data. The class
+ uses reference counting for the copy and assignment operation but
+ it is not a \e copy-on-write structure.
+ To know more about memory buffers read \ref wxjson_tutorial_memorybuff
 
  \sa the \ref wxjson_tutorial.
 */
 
 
 #if defined( WXJSON_USE_VALUE_COUNTER )
-    // The progressive counter (used for debugging only)
-    int          wxJSONValue::sm_progr = 1;
+// The progressive counter (used for debugging only)
+int          wxJSONValue::sm_progr = 1;
 #endif
 
 //! Constructors.
@@ -200,7 +201,8 @@
 wxJSONValue::Init( wxJSONType type )
 {
     wxJSONRefData* data = GetRefData();
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         UnRef();
     }
 
@@ -210,7 +212,8 @@
 
     // in release builds we do not have ASSERT so we check 'data' before
     // using it
-    if ( data )  {
+    if ( data )
+    {
         data->m_type = type;
         data->m_commentPos = wxJSONVALUE_COMMENT_BEFORE;
     }
@@ -219,8 +222,8 @@
 #if defined( WXJSON_USE_VALUE_COUNTER )
     m_progr = sm_progr;
     ++sm_progr;
-    wxLogTrace( cowTraceMask, _T("(%s) Init a new object progr=%d"),
-             __PRETTY_FUNCTION__, m_progr );
+    wxLogTrace( cowTraceMask, _T( "(%s) Init a new object progr=%d" ),
+                __PRETTY_FUNCTION__, m_progr );
 #endif
     return data;
 }
@@ -239,7 +242,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_INT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         // the 'VAL_INT' macro expands to 'm_valLong' or 'm_valInt64' depending
         // on 64-bits integer support being enabled on not
         data->m_value.VAL_INT = i;
@@ -253,7 +257,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_UINT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         // the 'VAL_UINT' macro expands to 'm_valULong' or 'm_valUInt64' depending
         // on 64-bits integer support being enabled on not
         data->m_value.VAL_UINT = ui;
@@ -266,7 +271,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_INT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         // the 'VAL_INT' macro expands to 'm_valLong' or 'm_valInt64' depending
         // on 64-bits integer support being enabled on not
         data->m_value.VAL_INT = i;
@@ -280,10 +286,11 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_UINT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         // the 'VAL_UINT' macro expands to 'm_valULong' or 'm_valUInt64' depending
         // on 64-bits integer support being enabled on not
-    data->m_value.VAL_UINT = ui;
+        data->m_value.VAL_UINT = ui;
     }
 }
 
@@ -293,7 +300,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_BOOL );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_value.m_valBool = b;
     }
 }
@@ -304,7 +312,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_DOUBLE );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_value.m_valDouble = d;
     }
 }
@@ -315,13 +324,14 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_CSTRING );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
-    #if !defined( WXJSON_USE_CSTRING )
+    if ( data != 0 )
+    {
+#if !defined( WXJSON_USE_CSTRING )
         data->m_type = wxJSONTYPE_STRING;
         data->m_valString.assign( str );
-    #else
+#else
         data->m_value.m_valCString = str;
-    #endif
+#endif
     }
 }
 
@@ -331,7 +341,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_STRING );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_valString.assign( str );
     }
 }
@@ -342,7 +353,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_INT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_value.VAL_INT = l;
     }
 }
@@ -353,44 +365,48 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_UINT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_value.VAL_UINT = ul;
     }
 }
 
-//! Construct a JSON value object of type \e memory \e buffer
-/*!
- Note that this ctor makes a deep copy of \c buff so changes made
- to the original buffer does not reflect to the buffer stored in this
- JSON value.
+//! Construct a JSON value object of type \e memory \e buffer
+/*!
+ Note that this ctor makes a deep copy of \c buff so changes made
+ to the original buffer does not reflect to the buffer stored in this
+ JSON value.
 */
 wxJSONValue::wxJSONValue( const wxMemoryBuffer& buff )
 {
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_MEMORYBUFF );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_memBuff = new wxMemoryBuffer();
         const void* ptr = buff.GetData();
         size_t buffLen  = buff.GetDataLen();
-        if ( buffLen > 0 )  {
+        if ( buffLen > 0 )
+        {
             data->m_memBuff->AppendData( ptr, buffLen );
         }
     }
 }
 
-//! Construct a JSON value object of type \e memory \e buffer
-/*!
- Note that this ctor makes a deep copy of \c buff so changes made
- to the original buffer does not reflect to the buffer stored in this
- JSON value.
+//! Construct a JSON value object of type \e memory \e buffer
+/*!
+ Note that this ctor makes a deep copy of \c buff so changes made
+ to the original buffer does not reflect to the buffer stored in this
+ JSON value.
 */
 wxJSONValue::wxJSONValue( const void* buff, size_t len )
 {
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_MEMORYBUFF );
     wxJSON_ASSERT( data );
-    if ( data != 0 && len > 0 ) {
+    if ( data != 0 && len > 0 )
+    {
         data->m_memBuff = new wxMemoryBuffer();
         data->m_memBuff->AppendData( buff, len );
     }
@@ -416,8 +432,8 @@
 #if defined( WXJSON_USE_VALUE_COUNTER )
     m_progr = sm_progr;
     ++sm_progr;
-    wxLogTrace( cowTraceMask, _T("(%s) Copy ctor - progr=%d other progr=%d"),
-              __PRETTY_FUNCTION__, m_progr, other.m_progr );
+    wxLogTrace( cowTraceMask, _T( "(%s) Copy ctor - progr=%d other progr=%d" ),
+                __PRETTY_FUNCTION__, m_progr, other.m_progr );
 #endif
 }
 
@@ -488,42 +504,50 @@
 {
     wxJSONRefData* data = GetRefData();
     wxJSONType type = wxJSONTYPE_INVALID;
-    if ( data )  {
+    if ( data )
+    {
         type = data->m_type;
 
         // for integers and unsigned ints check the storage requirements
         // note that ints are stored as 'long' or as 'long long'
-        switch ( type )  {
-            case wxJSONTYPE_INT :
+        switch ( type )
+        {
+        case wxJSONTYPE_INT :
             // check if the integer fits in a SHORT INT
-                if ( data->m_value.VAL_INT >= SHORT_MIN &&
-                                data->m_value.VAL_INT <= SHORT_MAX ) {
-                    type = wxJSONTYPE_SHORT;
-                }
+            if ( data->m_value.VAL_INT >= SHORT_MIN &&
+                    data->m_value.VAL_INT <= SHORT_MAX )
+            {
+                type = wxJSONTYPE_SHORT;
+            }
             // check if the value fits in LONG INT
-                else if ( data->m_value.VAL_INT >= LONG_MIN
-                                && data->m_value.VAL_INT <= LONG_MAX ) {
-                    type = wxJSONTYPE_LONG;
-                }
-            else {
+            else if ( data->m_value.VAL_INT >= LONG_MIN
+                      && data->m_value.VAL_INT <= LONG_MAX )
+            {
+                type = wxJSONTYPE_LONG;
+            }
+            else
+            {
                 type = wxJSONTYPE_INT64;
             }
             break;
 
-            case wxJSONTYPE_UINT :
-                if ( data->m_value.VAL_UINT <= USHORT_MAX ) {
-                    type = wxJSONTYPE_USHORT;
-                }
-                else if ( data->m_value.VAL_UINT <= ULONG_MAX ) {
-                    type = wxJSONTYPE_ULONG;
-                }
-                else  {
-                    type = wxJSONTYPE_UINT64;
-                }
-                break;
+        case wxJSONTYPE_UINT :
+            if ( data->m_value.VAL_UINT <= USHORT_MAX )
+            {
+                type = wxJSONTYPE_USHORT;
+            }
+            else if ( data->m_value.VAL_UINT <= ULONG_MAX )
+            {
+                type = wxJSONTYPE_ULONG;
+            }
+            else
+            {
+                type = wxJSONTYPE_UINT64;
+            }
+            break;
 
-            default :
-                break;
+        default :
+            break;
         }
     }
     return type;
@@ -536,7 +560,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_NULL )  {
+    if ( type == wxJSONTYPE_NULL )
+    {
         r = true;
     }
     return r;
@@ -560,7 +585,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type != wxJSONTYPE_INVALID )  {
+    if ( type != wxJSONTYPE_INVALID )
+    {
         r = true;
     }
     return r;
@@ -594,12 +620,15 @@
     wxJSONType type = GetType();
     bool r = false;
     // if the type is SHORT the value fits into an INT, too
-    if ( type == wxJSONTYPE_SHORT )  {
+    if ( type == wxJSONTYPE_SHORT )
+    {
         r = true;
     }
-    else if ( type == wxJSONTYPE_LONG )  {
+    else if ( type == wxJSONTYPE_LONG )
+    {
         // in case of LONG, check if the bit width is the same
-        if ( INT_MAX == LONG_MAX )  {
+        if ( INT_MAX == LONG_MAX )
+        {
             r = true;
         }
     }
@@ -625,7 +654,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_SHORT )  {
+    if ( type == wxJSONTYPE_SHORT )
+    {
         r = true;
     }
     return r;
@@ -659,11 +689,14 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_USHORT )  {
+    if ( type == wxJSONTYPE_USHORT )
+    {
         r = true;
     }
-    else if ( type == wxJSONTYPE_ULONG )  {
-        if ( INT_MAX == LONG_MAX )  {
+    else if ( type == wxJSONTYPE_ULONG )
+    {
+        if ( INT_MAX == LONG_MAX )
+        {
             r = true;
         }
     }
@@ -689,7 +722,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_USHORT )  {
+    if ( type == wxJSONTYPE_USHORT )
+    {
         r = true;
     }
     return r;
@@ -715,7 +749,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_LONG || type == wxJSONTYPE_SHORT )  {
+    if ( type == wxJSONTYPE_LONG || type == wxJSONTYPE_SHORT )
+    {
         r = true;
     }
     return r;
@@ -740,7 +775,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_ULONG || type == wxJSONTYPE_USHORT )  {
+    if ( type == wxJSONTYPE_ULONG || type == wxJSONTYPE_USHORT )
+    {
         r = true;
     }
     return r;
@@ -754,7 +790,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_BOOL )  {
+    if ( type == wxJSONTYPE_BOOL )
+    {
         r = true;
     }
     return r;
@@ -766,7 +803,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_DOUBLE )  {
+    if ( type == wxJSONTYPE_DOUBLE )
+    {
         r = true;
     }
     return r;
@@ -778,7 +816,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_STRING )  {
+    if ( type == wxJSONTYPE_STRING )
+    {
         r = true;
     }
     return r;
@@ -798,7 +837,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_CSTRING )  {
+    if ( type == wxJSONTYPE_CSTRING )
+    {
         r = true;
     }
     return r;
@@ -810,7 +850,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_ARRAY )  {
+    if ( type == wxJSONTYPE_ARRAY )
+    {
         r = true;
     }
     return r;
@@ -822,7 +863,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_OBJECT )  {
+    if ( type == wxJSONTYPE_OBJECT )
+    {
         r = true;
     }
     return r;
@@ -834,7 +876,8 @@
 {
     wxJSONType type = GetType();
     bool r = false;
-    if ( type == wxJSONTYPE_MEMORYBUFF )  {
+    if ( type == wxJSONTYPE_MEMORYBUFF )
+    {
         r = true;
     }
     return r;
@@ -861,9 +904,9 @@
 {
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    int i = (int) data->m_value.VAL_INT;
+    int i = ( int ) data->m_value.VAL_INT;
 
-    wxJSON_ASSERT( IsInt());
+    wxJSON_ASSERT( IsInt() );
     return i;
 }
 
@@ -904,7 +947,7 @@
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
     double d = data->m_value.m_valDouble;
-    wxJSON_ASSERT( IsDouble());
+    wxJSON_ASSERT( IsDouble() );
     return d;
 }
 
@@ -930,7 +973,7 @@
 
  \li if the value is of type wxJSONTYPE_INVALID, the literal string \b &lt;invalid&gt;
     is returned. Note that this is NOT a valid JSON text.
- 
+
  \li if the value is of type wxJSONTYPE_MEMORYBUFF the string returned contains the
     hexadecimal digits of the first 5 bytes preceeded by the length of the buffer,
     enclosed in parenthesis
@@ -953,57 +996,58 @@
     wxJSON_ASSERT( data );
     wxString s;
     int size = Size();
-    switch ( data->m_type )  {
-        case wxJSONTYPE_STRING :
-            s.assign( data->m_valString);
-            break;
-        case wxJSONTYPE_CSTRING :
-            s.assign( data->m_value.m_valCString);
-            break;
- /*       case wxJSONTYPE_INT :
-            #if defined( wxJSON_64BIT_INT )
-                  s.Printf( _T("%") wxLongLongFmtSpec _T("i"),
-                        data->m_value.m_valInt64 );
-            #else
-            s.Printf( _T("%ld"), data->m_value.m_valLong );
-            #endif
-            break;
-        case wxJSONTYPE_UINT :
-            #if defined( wxJSON_64BIT_INT )
-            s.Printf( _T("%") wxLongLongFmtSpec _T("u"),
-                        data->m_value.m_valUInt64 );
-            #else
-            s.Printf( _T("%lu"), data->m_value.m_valULong );
-            #endif
-            break;*/
-        case wxJSONTYPE_DOUBLE :
-            s.Printf( _T("%.10g"), data->m_value.m_valDouble );
-            break;
-        case wxJSONTYPE_BOOL :
-            s.assign( ( data->m_value.m_valBool ?
-                         _T("true") : _T("false") ));
-            break;
-        case wxJSONTYPE_NULL :
-            s.assign( _T( "null"));
-            break;
-        case wxJSONTYPE_INVALID :
-            s.assign( _T( "<invalid>"));
-            break;
-        case wxJSONTYPE_ARRAY :
-            s.Printf( _T("[%d]"), size );
-            break;
-        case wxJSONTYPE_OBJECT :
-            s.Printf( _T("{%d}"), size );
-            break;
-        case wxJSONTYPE_MEMORYBUFF :
-            s = MemoryBuffToString( *(data->m_memBuff), 5 );
-            break;
-        default :
-            s.assign( _T( "wxJSONValue::AsString(): Unknown JSON type \'"));
-            s.append( TypeToString( data->m_type ));
-            s.append( _T( "\'" ));
-            wxFAIL_MSG( s );
-            break;
+    switch ( data->m_type )
+    {
+    case wxJSONTYPE_STRING :
+        s.assign( data->m_valString );
+        break;
+    case wxJSONTYPE_CSTRING :
+        s.assign( data->m_value.m_valCString );
+        break;
+    /*       case wxJSONTYPE_INT :
+               #if defined( wxJSON_64BIT_INT )
+                     s.Printf( _T("%") wxLongLongFmtSpec _T("i"),
+                           data->m_value.m_valInt64 );
+               #else
+               s.Printf( _T("%ld"), data->m_value.m_valLong );
+               #endif
+               break;
+           case wxJSONTYPE_UINT :
+               #if defined( wxJSON_64BIT_INT )
+               s.Printf( _T("%") wxLongLongFmtSpec _T("u"),
+                           data->m_value.m_valUInt64 );
+               #else
+               s.Printf( _T("%lu"), data->m_value.m_valULong );
+               #endif
+               break;*/
+    case wxJSONTYPE_DOUBLE :
+        s.Printf( _T( "%.10g" ), data->m_value.m_valDouble );
+        break;
+    case wxJSONTYPE_BOOL :
+        s.assign( ( data->m_value.m_valBool ?
+                    _T( "true" ) : _T( "false" ) ) );
+        break;
+    case wxJSONTYPE_NULL :
+        s.assign( _T( "null" ) );
+        break;
+    case wxJSONTYPE_INVALID :
+        s.assign( _T( "<invalid>" ) );
+        break;
+    case wxJSONTYPE_ARRAY :
+        s.Printf( _T( "[%d]" ), size );
+        break;
+    case wxJSONTYPE_OBJECT :
+        s.Printf( _T( "{%d}" ), size );
+        break;
+    case wxJSONTYPE_MEMORYBUFF :
+        s = MemoryBuffToString( *( data->m_memBuff ), 5 );
+        break;
+    default :
+        s.assign( _T( "wxJSONValue::AsString(): Unknown JSON type \'" ) );
+        s.append( TypeToString( data->m_type ) );
+        s.append( _T( "\'" ) );
+        wxFAIL_MSG( s );
+        break;
     }
     return s;
 }
@@ -1029,15 +1073,16 @@
     const wxChar* s = 0;
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    switch ( data->m_type )  {
-        case wxJSONTYPE_CSTRING :
-            s = data->m_value.m_valCString;
-            break;
-        case wxJSONTYPE_STRING :
-            s = data->m_valString.c_str();
-            break;
-        default :
-            break;
+    switch ( data->m_type )
+    {
+    case wxJSONTYPE_CSTRING :
+        s = data->m_value.m_valCString;
+        break;
+    case wxJSONTYPE_STRING :
+        s = data->m_valString.c_str();
+        break;
+    default :
+        break;
     }
     return s;
 }
@@ -1060,9 +1105,9 @@
 {
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    unsigned int ui = (unsigned) data->m_value.VAL_UINT;
+    unsigned int ui = ( unsigned ) data->m_value.VAL_UINT;
 
-    wxJSON_ASSERT( IsUInt());
+    wxJSON_ASSERT( IsUInt() );
     return ui;
 }
 
@@ -1085,9 +1130,9 @@
     long int l;
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    l = (long) data->m_value.VAL_INT;
+    l = ( long ) data->m_value.VAL_INT;
 
-    wxJSON_ASSERT( IsLong());
+    wxJSON_ASSERT( IsLong() );
     return l;
 }
 
@@ -1108,9 +1153,9 @@
 {
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    unsigned long int ul = (unsigned long) data->m_value.VAL_UINT;
+    unsigned long int ul = ( unsigned long ) data->m_value.VAL_UINT;
 
-    wxJSON_ASSERT( IsULong());  // expands only in debug builds
+    wxJSON_ASSERT( IsULong() ); // expands only in debug builds
     return ul;
 }
 
@@ -1133,9 +1178,9 @@
     short int i;
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    i = (short) data->m_value.VAL_INT;
+    i = ( short ) data->m_value.VAL_INT;
 
-    wxJSON_ASSERT( IsShort());
+    wxJSON_ASSERT( IsShort() );
     return i;
 }
 
@@ -1157,9 +1202,9 @@
     unsigned short ui;
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    ui = (unsigned short) data->m_value.VAL_UINT;
+    ui = ( unsigned short ) data->m_value.VAL_UINT;
 
-    wxJSON_ASSERT( IsUShort());
+    wxJSON_ASSERT( IsUShort() );
     return ui;
 }
 
@@ -1195,7 +1240,8 @@
 wxJSONValue::AsInt( int& i ) const
 {
     bool r = false;
-    if ( IsInt() )    {
+    if ( IsInt() )
+    {
         i = AsInt();
         r = true;
     }
@@ -1206,7 +1252,8 @@
 wxJSONValue::AsUInt( unsigned int& ui ) const
 {
     bool r = false;
-    if ( IsUInt() )    {
+    if ( IsUInt() )
+    {
         ui = AsUInt();
         r = true;
     }
@@ -1217,7 +1264,8 @@
 wxJSONValue::AsShort( short int& s ) const
 {
     bool r = false;
-    if ( IsShort() )    {
+    if ( IsShort() )
+    {
         s = AsShort();
         r = true;
     }
@@ -1228,7 +1276,8 @@
 wxJSONValue::AsUShort( unsigned short& us ) const
 {
     bool r = false;
-    if ( IsUShort() )    {
+    if ( IsUShort() )
+    {
         us = AsUShort();
         r = true;
     }
@@ -1239,7 +1288,8 @@
 wxJSONValue::AsLong( long int& l ) const
 {
     bool r = false;
-    if ( IsLong() )    {
+    if ( IsLong() )
+    {
         l = AsLong();
         r = true;
     }
@@ -1250,7 +1300,8 @@
 wxJSONValue::AsULong( unsigned long& ul ) const
 {
     bool r = false;
-    if ( IsULong() )    {
+    if ( IsULong() )
+    {
         ul = AsULong();
         r = true;
     }
@@ -1262,7 +1313,8 @@
 wxJSONValue::AsBool( bool& b ) const
 {
     bool r = false;
-    if ( IsBool() )    {
+    if ( IsBool() )
+    {
         b = AsBool();
         r = true;
     }
@@ -1273,7 +1325,8 @@
 wxJSONValue::AsDouble( double& d ) const
 {
     bool r = false;
-    if ( IsDouble() )    {
+    if ( IsDouble() )
+    {
         d = AsDouble();
         r = true;
     }
@@ -1289,13 +1342,14 @@
  only if \c IsString() returns TRUE.
  Also note that the string value is only stored in \c str if this object actually
  contains a \b string or \b c-string value.
- \c str will never contain a string representation of other types. 
+ \c str will never contain a string representation of other types.
 */
 bool
 wxJSONValue::AsString( wxString& str ) const
 {
     bool r = IsString();
-    if ( r )    {
+    if ( r )
+    {
         str = AsString();
     }
     return r;
@@ -1305,8 +1359,9 @@
 wxJSONValue::AsCString( wxChar* ch ) const
 {
     bool r = IsCString();
-    if ( r )    {
-        ch = (wxChar*) AsCString();
+    if ( r )
+    {
+        ch = ( wxChar* ) AsCString();
     }
     return r;
 }
@@ -1318,8 +1373,8 @@
  Note that as of wxWidgets 2.8 and 2.9 the \b wxMemoryBuffer object uses
  reference counting when copying the actual buffer but the class itself
  is not a \e copy-on-write structure so changes made to one buffer affects
- all other copies made from it.
- This means that if you make a change to the returned copy of the memory
+ all other copies made from it.
+ This means that if you make a change to the returned copy of the memory
  buffer, the change affects also the memory buffer stored in this JSON value.
 
  If this JSON object does not contain a \e wxJSONTYPE_MEMORYBUFF type
@@ -1328,7 +1383,7 @@
  type contains a valid, empty memory buffer.
  You have to use the IsMemoryBuff() function to known the type of the
  JSON value contained in this object, or the overloaded version of
- this function. 
+ this function.
 */
 wxMemoryBuffer
 wxJSONValue::AsMemoryBuff() const
@@ -1336,11 +1391,12 @@
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
     wxMemoryBuffer buff;
-    if ( data->m_memBuff ) {
-        buff = *(data->m_memBuff);
+    if ( data->m_memBuff )
+    {
+        buff = *( data->m_memBuff );
     }
 
-    wxJSON_ASSERT( IsMemoryBuff());
+    wxJSON_ASSERT( IsMemoryBuff() );
     return buff;
 }
 
@@ -1352,8 +1408,8 @@
  Note that as of wxWidgets 2.8 and 2.9 the \b wxMemoryBuffer object uses
  reference counting when copying the actual buffer but the class itself
  is not a \e copy-on-write structure so changes made to one buffer affects
- all other copies made from it.
- This means that if you make a change to the returned copy of the memory
+ all other copies made from it.
+ This means that if you make a change to the returned copy of the memory
  buffer, the change affects also the memory buffer stored in this JSON value.
 
  If this JSON object does not contain a \e wxJSONTYPE_MEMORYBUFF type
@@ -1362,13 +1418,14 @@
  type contains a valid, empty memory buffer.
  You have to use the IsMemoryBuff() function to known the type of the
  JSON value contained in this object, or the overloaded version of
- this function. 
+ this function.
 */
 bool
 wxJSONValue::AsMemoryBuff( wxMemoryBuffer& buff ) const
 {
     bool r = IsMemoryBuff();
-    if ( r )    {
+    if ( r )
+    {
         buff = AsMemoryBuff();
     }
     return r;
@@ -1391,7 +1448,8 @@
     wxJSON_ASSERT( data );
 
     const wxJSONInternalMap* v = 0;
-    if ( data->m_type == wxJSONTYPE_OBJECT ) {
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
         v = &( data->m_valMap );
     }
     return v;
@@ -1411,7 +1469,8 @@
     wxJSON_ASSERT( data );
 
     const wxJSONInternalArray* v = 0;
-    if ( data->m_type == wxJSONTYPE_ARRAY ) {
+    if ( data->m_type == wxJSONTYPE_ARRAY )
+    {
         v = &( data->m_valArray );
     }
     return v;
@@ -1429,7 +1488,8 @@
 {
     bool r = false;
     int size = Size();
-    if ( index < (unsigned) size )  {
+    if ( index < ( unsigned ) size )
+    {
         r = true;
     }
     return r;
@@ -1446,9 +1506,11 @@
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
 
-    if ( data && data->m_type == wxJSONTYPE_OBJECT )  {
+    if ( data && data->m_type == wxJSONTYPE_OBJECT )
+    {
         wxJSONInternalMap::iterator it = data->m_valMap.find( key );
-        if ( it != data->m_valMap.end() )  {
+        if ( it != data->m_valMap.end() )
+        {
             r = true;
         }
     }
@@ -1469,11 +1531,13 @@
     wxJSON_ASSERT( data );
 
     int size = -1;
-    if ( data->m_type == wxJSONTYPE_ARRAY )  {
-        size = (int) data->m_valArray.GetCount();
-    }
-    if ( data->m_type == wxJSONTYPE_OBJECT )  {
-        size = (int) data->m_valMap.size();
+    if ( data->m_type == wxJSONTYPE_ARRAY )
+    {
+        size = ( int ) data->m_valArray.GetCount();
+    }
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
+        size = ( int ) data->m_valMap.size();
     }
     return size;
 }
@@ -1497,9 +1561,11 @@
     wxJSON_ASSERT( data->m_type == wxJSONTYPE_OBJECT );
 
     wxArrayString arr;
-    if ( data->m_type == wxJSONTYPE_OBJECT )   {
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
         wxJSONInternalMap::iterator it;
-        for ( it = data->m_valMap.begin(); it != data->m_valMap.end(); it++ )  {
+        for ( it = data->m_valMap.begin(); it != data->m_valMap.end(); it++ )
+        {
             arr.Add( it->first );
         }
     }
@@ -1525,7 +1591,8 @@
 {
     wxJSONRefData* data = COW();
     wxJSON_ASSERT( data );
-    if ( data->m_type != wxJSONTYPE_ARRAY )  {
+    if ( data->m_type != wxJSONTYPE_ARRAY )
+    {
         // we have to change the type of the actual object to the array type
         SetType( wxJSONTYPE_ARRAY );
     }
@@ -1663,15 +1730,16 @@
     wxJSON_ASSERT( data );
 
     bool r = false;
-    if ( data->m_type == wxJSONTYPE_STRING )  {
+    if ( data->m_type == wxJSONTYPE_STRING )
+    {
         wxJSONRefData* data = COW();
         wxJSON_ASSERT( data );
         data->m_valString.append( str );
-    r = true;
+        r = true;
     }
     return r;
 }
-
+
 //! Concatenate a memory buffer to this memory buffer object.
 /*!
  The function concatenates \c buff to the \b wxMemoryBuffer object contained
@@ -1679,22 +1747,23 @@
  If the value stored in this value is not a memory buffer object
  the function does nothing and returns FALSE.
 */
-bool
-wxJSONValue::Cat( const wxMemoryBuffer& buff )
+bool
+wxJSONValue::Cat( const wxMemoryBuffer& buff )
 {
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
 
     bool r = false;
-    if ( data->m_type == wxJSONTYPE_MEMORYBUFF )  {
+    if ( data->m_type == wxJSONTYPE_MEMORYBUFF )
+    {
         wxJSONRefData* data = COW();
         wxJSON_ASSERT( data );
-        data->m_memBuff->AppendData( buff.GetData(), buff.GetDataLen());
+        data->m_memBuff->AppendData( buff.GetData(), buff.GetDataLen() );
         r = true;
     }
     return r;
 }
-
+
 
 //! \overload Cat( const wxString& )
 bool
@@ -1704,7 +1773,8 @@
     wxJSON_ASSERT( data );
 
     bool r = false;
-    if ( data->m_type == wxJSONTYPE_STRING )  {
+    if ( data->m_type == wxJSONTYPE_STRING )
+    {
         wxJSONRefData* data = COW();
         wxJSON_ASSERT( data );
         data->m_valString.append( str );
@@ -1729,7 +1799,8 @@
     wxJSON_ASSERT( data );
 
     bool r = false;
-    if ( data->m_type == wxJSONTYPE_ARRAY )  {
+    if ( data->m_type == wxJSONTYPE_ARRAY )
+    {
         data->m_valArray.RemoveAt( index );
         r = true;
     }
@@ -1745,9 +1816,11 @@
     wxJSON_ASSERT( data );
 
     bool r = false;
-    if ( data->m_type == wxJSONTYPE_OBJECT )  {
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
         wxJSONInternalMap::size_type count = data->m_valMap.erase( key );
-        if ( count > 0 )  {
+        if ( count > 0 )
+        {
             r = true;
         }
     }
@@ -1787,15 +1860,17 @@
     wxJSONRefData* data = COW();
     wxJSON_ASSERT( data );
 
-    if ( data->m_type != wxJSONTYPE_ARRAY )  {
+    if ( data->m_type != wxJSONTYPE_ARRAY )
+    {
         data = SetType( wxJSONTYPE_ARRAY );
     }
     int size = Size();
     wxJSON_ASSERT( size >= 0 );
     // if the desired element does not yet exist, we create as many
     // elements as needed; the new values will be 'null' values
-    if ( index >= (unsigned) size )  {
-        wxJSONValue v( wxJSONTYPE_NULL);
+    if ( index >= ( unsigned ) size )
+    {
+        wxJSONValue v( wxJSONTYPE_NULL );
         int missing = index - size + 1;
         data->m_valArray.Add( v, missing );
     }
@@ -1814,22 +1889,23 @@
 wxJSONValue&
 wxJSONValue::Item( const wxString& key )
 {
-    wxLogTrace( traceMask, _T("(%s) searched key=\'%s\'"), __PRETTY_FUNCTION__, key.c_str());
+    wxLogTrace( traceMask, _T( "(%s) searched key=\'%s\'" ), __PRETTY_FUNCTION__, key.c_str() );
 #ifdef __WXOSX__
 //    wxLogTrace( traceMask, _T("(%s) actual object: %s"), __PRETTY_FUNCTION__, GetInfo().c_str());
 #else
-    wxLogTrace( traceMask, _T("(%s) actual object: %s"), __PRETTY_FUNCTION__, GetInfo().c_str());
+    wxLogTrace( traceMask, _T( "(%s) actual object: %s" ), __PRETTY_FUNCTION__, GetInfo().c_str() );
 #endif
     wxJSONRefData* data = COW();
     wxJSON_ASSERT( data );
 
-    if ( data->m_type != wxJSONTYPE_OBJECT )  {
+    if ( data->m_type != wxJSONTYPE_OBJECT )
+    {
         // deletes the contained value;
         data = SetType( wxJSONTYPE_OBJECT );
         return data->m_valMap[key];
     }
-    wxLogTrace( traceMask, _T("(%s) searching key \'%s' in the actual object"),
-                 __PRETTY_FUNCTION__, key.c_str() );
+    wxLogTrace( traceMask, _T( "(%s) searching key \'%s' in the actual object" ),
+                __PRETTY_FUNCTION__, key.c_str() );
     return data->m_valMap[key];
 }
 
@@ -1847,10 +1923,12 @@
     wxJSON_ASSERT( data );
 
     wxJSONValue v( wxJSONTYPE_INVALID );
-    if ( data->m_type == wxJSONTYPE_ARRAY )  {
+    if ( data->m_type == wxJSONTYPE_ARRAY )
+    {
         int size = Size();
         wxJSON_ASSERT( size >= 0 );
-        if ( index < (unsigned) size )  {
+        if ( index < ( unsigned ) size )
+        {
             v = data->m_valArray.Item( index );
         }
     }
@@ -1866,19 +1944,21 @@
 wxJSONValue
 wxJSONValue::ItemAt( const wxString& key ) const
 {
-    wxLogTrace( traceMask, _T("(%s) searched key=\'%s\'"), __PRETTY_FUNCTION__, key.c_str());
+    wxLogTrace( traceMask, _T( "(%s) searched key=\'%s\'" ), __PRETTY_FUNCTION__, key.c_str() );
 #ifdef __WXOSX__
 //    wxLogTrace( traceMask, _T("(%s) actual object: %s"), __PRETTY_FUNCTION__, GetInfo().c_str());
 #else
-    wxLogTrace( traceMask, _T("(%s) actual object: %s"), __PRETTY_FUNCTION__, GetInfo().c_str());
+    wxLogTrace( traceMask, _T( "(%s) actual object: %s" ), __PRETTY_FUNCTION__, GetInfo().c_str() );
 #endif
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
 
     wxJSONValue v( wxJSONTYPE_INVALID );
-    if ( data->m_type == wxJSONTYPE_OBJECT )  {
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
         wxJSONInternalMap::const_iterator it = data->m_valMap.find( key );
-        if ( it != data->m_valMap.end() )  {
+        if ( it != data->m_valMap.end() )
+        {
             v = it->second;
         }
     }
@@ -2039,11 +2119,11 @@
 }
 
 
-//! Assigns to this object a memory buffer type
-/*!
- As with the ctor, this function makes a deep copy of the
- memory buffer \c buff so changes made to the original buffer
- does not reflect to the memory buffer stored in this JSON value.
+//! Assigns to this object a memory buffer type
+/*!
+ As with the ctor, this function makes a deep copy of the
+ memory buffer \c buff so changes made to the original buffer
+ does not reflect to the memory buffer stored in this JSON value.
 */
 wxJSONValue&
 wxJSONValue::operator = ( const wxMemoryBuffer& buff )
@@ -2052,7 +2132,8 @@
     data->m_memBuff = new wxMemoryBuffer();
     const void* ptr = buff.GetData();
     size_t      len = buff.GetDataLen();
-    if ( data->m_memBuff && len )  {
+    if ( data->m_memBuff && len )
+    {
         data->m_memBuff->AppendData( ptr, len );
     }
     return *this;
@@ -2115,9 +2196,11 @@
 
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
-    if ( data->m_type == wxJSONTYPE_OBJECT )  {
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
         wxJSONInternalMap::iterator it = data->m_valMap.find( key );
-        if ( it != data->m_valMap.end() )  {
+        if ( it != data->m_valMap.end() )
+        {
             v = it->second;
         }
     }
@@ -2142,10 +2225,12 @@
 
     wxJSONValue* vp = 0;
 
-    if ( data->m_type == wxJSONTYPE_ARRAY )  {
+    if ( data->m_type == wxJSONTYPE_ARRAY )
+    {
         size_t size = data->m_valArray.GetCount();
-        if ( index < size )  {
-            vp = &(data->m_valArray.Item( index ));
+        if ( index < size )
+        {
+            vp = &( data->m_valArray.Item( index ) );
         }
     }
     return vp;
@@ -2166,10 +2251,12 @@
 
     wxJSONValue* vp = 0;
 
-    if ( data->m_type == wxJSONTYPE_OBJECT )  {
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
         wxJSONInternalMap::iterator it = data->m_valMap.find( key );
-        if ( it != data->m_valMap.end() )  {
-            vp = &(it->second);
+        if ( it != data->m_valMap.end() )
+        {
+            vp = &( it->second );
         }
     }
     return vp;
@@ -2191,29 +2278,31 @@
 wxString
 wxJSONValue::TypeToString( wxJSONType type )
 {
-  static const wxChar* str[] = {
-    _T( "wxJSONTYPE_INVALID" ),   // 0
-    _T( "wxJSONTYPE_NULL" ),    // 1
-    _T( "wxJSONTYPE_INT" ),     // 2
-    _T( "wxJSONTYPE_UINT" ),    // 3
-    _T( "wxJSONTYPE_DOUBLE" ),  // 4
-    _T( "wxJSONTYPE_STRING" ),  // 5
-    _T( "wxJSONTYPE_CSTRING" ), // 6
-    _T( "wxJSONTYPE_BOOL" ),    // 7
-    _T( "wxJSONTYPE_ARRAY" ),   // 8
-    _T( "wxJSONTYPE_OBJECT" ),  // 9
-    _T( "wxJSONTYPE_LONG" ),    // 10
-    _T( "wxJSONTYPE_INT64" ),   // 11
-    _T( "wxJSONTYPE_ULONG" ),   // 12
-    _T( "wxJSONTYPE_UINT64" ),  // 13
-    _T( "wxJSONTYPE_SHORT" ),   // 14
-    _T( "wxJSONTYPE_USHORT" ),  // 15
-    _T( "wxJSONTYPE_MEMORYBUFF" ),  // 16
-  };
+    static const wxChar* str[] =
+    {
+        _T( "wxJSONTYPE_INVALID" ),   // 0
+        _T( "wxJSONTYPE_NULL" ),    // 1
+        _T( "wxJSONTYPE_INT" ),     // 2
+        _T( "wxJSONTYPE_UINT" ),    // 3
+        _T( "wxJSONTYPE_DOUBLE" ),  // 4
+        _T( "wxJSONTYPE_STRING" ),  // 5
+        _T( "wxJSONTYPE_CSTRING" ), // 6
+        _T( "wxJSONTYPE_BOOL" ),    // 7
+        _T( "wxJSONTYPE_ARRAY" ),   // 8
+        _T( "wxJSONTYPE_OBJECT" ),  // 9
+        _T( "wxJSONTYPE_LONG" ),    // 10
+        _T( "wxJSONTYPE_INT64" ),   // 11
+        _T( "wxJSONTYPE_ULONG" ),   // 12
+        _T( "wxJSONTYPE_UINT64" ),  // 13
+        _T( "wxJSONTYPE_SHORT" ),   // 14
+        _T( "wxJSONTYPE_USHORT" ),  // 15
+        _T( "wxJSONTYPE_MEMORYBUFF" ),  // 16
+    };
 
     wxString s;
-    int idx = (int) type;
-    if ( idx >= 0 && idx < 17 )  {
+    int idx = ( int ) type;
+    if ( idx >= 0 && idx < 17 )
+    {
         s = str[idx];
     }
     return s;
@@ -2248,56 +2337,62 @@
     wxJSONType type = GetType();
 
     wxString s;
-    if ( indent > 0 )   {
+    if ( indent > 0 )
+    {
         s.append( indent, ' ' );
     }
 
     wxString s1;
     wxString s2;
 #if defined( WXJSON_USE_VALUE_COUNTER )
-    s1.Printf( _T("Object: Progr=%d Type=%s Size=%d comments=%d\n"),
-        m_progr,
-        TypeToString( type ).c_str(),
-        Size(),
-        data->m_comments.GetCount() );
-  s2.Printf(_T("      : RefData=%p Progr=%d Num shares=%d\n"),
-            data, data->m_progr, data->GetRefCount() );
+    s1.Printf( _T( "Object: Progr=%d Type=%s Size=%d comments=%d\n" ),
+               m_progr,
+               TypeToString( type ).c_str(),
+               Size(),
+               data->m_comments.GetCount() );
+    s2.Printf( _T( "      : RefData=%p Progr=%d Num shares=%d\n" ),
+               data, data->m_progr, data->GetRefCount() );
 #else
-  s1.Printf( _T("Object: Type=%s Size=%d comments=%d\n"),
-            TypeToString( type ).c_str(),
-            Size(),
-            data->m_comments.GetCount() );
-  s2.Printf(_T("      : RefData=%p Num shares=%d\n"),
-            data, data->GetRefCount() );
+    s1.Printf( _T( "Object: Type=%s Size=%d comments=%d\n" ),
+               TypeToString( type ).c_str(),
+               Size(),
+               data->m_comments.GetCount() );
+    s2.Printf( _T( "      : RefData=%p Num shares=%d\n" ),
+               data, data->GetRefCount() );
 #endif
-  s.append( s1 );
-  if ( indent > 0 )   {
-    s.append( indent, ' ' );
-  }
-  s.append( s2 );
-
-  wxString sub;
-
-  // if we have to do a deep dump, we call the Dump() function for
-  // every sub-item
-  if ( deep )   {
-    indent += 3;
-    const wxJSONInternalMap* map;
-    int size;;
-    wxJSONInternalMap::const_iterator it;
-    switch ( type )    {
+    s.append( s1 );
+    if ( indent > 0 )
+    {
+        s.append( indent, ' ' );
+    }
+    s.append( s2 );
+
+    wxString sub;
+
+    // if we have to do a deep dump, we call the Dump() function for
+    // every sub-item
+    if ( deep )
+    {
+        indent += 3;
+        const wxJSONInternalMap* map;
+        int size;;
+        wxJSONInternalMap::const_iterator it;
+        switch ( type )
+        {
         case wxJSONTYPE_OBJECT :
             map = AsMap();
             size = Size();
-            for ( it = map->begin(); it != map->end(); ++it )  {
+            for ( it = map->begin(); it != map->end(); ++it )
+            {
                 const wxJSONValue& v = it->second;
                 sub = v.Dump( true, indent );
                 s.append( sub );
             }
-        break;
+            break;
         case wxJSONTYPE_ARRAY :
             size = Size();
-            for ( int i = 0; i < size; i++ )  {
+            for ( int i = 0; i < size; i++ )
+            {
                 const wxJSONValue* v = Find( i );
                 wxJSON_ASSERT( v );
                 sub = v->Dump( true, indent );
@@ -2325,22 +2420,24 @@
 
     wxString s;
 #if defined( WXJSON_USE_VALUE_CONTER )
-    s.Printf( _T("Object: Progr=%d Type=%s Size=%d comments=%d\n"),
-            data->m_progr,
-            wxJSONValue::TypeToString( data->m_type ).c_str(),
-            Size(),
-            data->m_comments.GetCount() );
+    s.Printf( _T( "Object: Progr=%d Type=%s Size=%d comments=%d\n" ),
+              data->m_progr,
+              wxJSONValue::TypeToString( data->m_type ).c_str(),
+              Size(),
+              data->m_comments.GetCount() );
 #else
-    s.Printf( _T("Object: Type=%s Size=%d comments=%d\n"),
-            wxJSONValue::TypeToString( data->m_type ).c_str(),
-            Size(), data->m_comments.GetCount() );
+    s.Printf( _T( "Object: Type=%s Size=%d comments=%d\n" ),
+              wxJSONValue::TypeToString( data->m_type ).c_str(),
+              Size(), data->m_comments.GetCount() );
 #endif
-    if ( data->m_type == wxJSONTYPE_OBJECT ) {
+    if ( data->m_type == wxJSONTYPE_OBJECT )
+    {
         wxArrayString arr = GetMemberNames();
-        for ( unsigned int i = 0; i < arr.size(); i++ )  {
-            s.append( _T("    Member name: "));
+        for ( unsigned int i = 0; i < arr.size(); i++ )
+        {
+            s.append( _T( "    Member name: " ) );
             s.append( arr[i] );
-            s.append( _T("\n") );
+            s.append( _T( "\n" ) );
         }
     }
     return s;
@@ -2387,77 +2484,93 @@
     wxJSONRefData* data = GetRefData();
     wxJSONRefData* otherData = other.GetRefData();
 
-    if ( data == otherData ) {
-        wxLogTrace( compareTraceMask, _T("(%s) objects share the same referenced data - r=TRUE"),
-             __PRETTY_FUNCTION__ );
-    return true;
+    if ( data == otherData )
+    {
+        wxLogTrace( compareTraceMask, _T( "(%s) objects share the same referenced data - r=TRUE" ),
+                    __PRETTY_FUNCTION__ );
+        return true;
     }
 
 
     // if the type does not match the function compares the values if
     // they are of compatible types such as INT, UINT and DOUBLE
-    if ( data->m_type != otherData->m_type )  {
+    if ( data->m_type != otherData->m_type )
+    {
         // if the types are not compatible, returns false
         // otherwise compares the compatible types: INT, UINT and DOUBLE
         double val;
-        switch ( data->m_type )  {
-            case wxJSONTYPE_INT :
-                if ( otherData->m_type == wxJSONTYPE_UINT )    {
-                    // compare the bits and returns true if value is between 0 and LLONG_MAX
-                    if ( (data->m_value.VAL_UINT <= LLONG_MAX ) &&
-                            (data->m_value.VAL_UINT == otherData->m_value.VAL_UINT))
-                        {
-                                r = true;
-                        }
-                }
-                else if ( otherData->m_type == wxJSONTYPE_DOUBLE )    {
-                    val = data->m_value.VAL_INT;
-                    if ( val == otherData->m_value.m_valDouble )    {
-                        r = true;
-                    }
-                }
-                else    {
-                    r = false;
-                }
-                break;
-            case wxJSONTYPE_UINT :
-                if ( otherData->m_type == wxJSONTYPE_INT )    {
-                    // compare the bits and returns true if value is between 0 and LLONG_MAX
-                    if ( (data->m_value.VAL_UINT <= LLONG_MAX ) &&
-                            (data->m_value.VAL_UINT == otherData->m_value.VAL_UINT))
-                        {
-                            r = true;
-                        }
+        switch ( data->m_type )
+        {
+        case wxJSONTYPE_INT :
+            if ( otherData->m_type == wxJSONTYPE_UINT )
+            {
+                // compare the bits and returns true if value is between 0 and LLONG_MAX
+                if ( ( data->m_value.VAL_UINT <= LLONG_MAX ) &&
+                        ( data->m_value.VAL_UINT == otherData->m_value.VAL_UINT ) )
+                {
+                    r = true;
                 }
-                else if ( otherData->m_type == wxJSONTYPE_DOUBLE )    {
-                    val = data->m_value.VAL_UINT;
-                    if ( val == otherData->m_value.m_valDouble )    {
-                        r = true;
-                    }
+            }
+            else if ( otherData->m_type == wxJSONTYPE_DOUBLE )
+            {
+                val = data->m_value.VAL_INT;
+                if ( val == otherData->m_value.m_valDouble )
+                {
+                    r = true;
                 }
-                else    {
-                    r = false;
+            }
+            else
+            {
+                r = false;
+            }
+            break;
+        case wxJSONTYPE_UINT :
+            if ( otherData->m_type == wxJSONTYPE_INT )
+            {
+                // compare the bits and returns true if value is between 0 and LLONG_MAX
+                if ( ( data->m_value.VAL_UINT <= LLONG_MAX ) &&
+                        ( data->m_value.VAL_UINT == otherData->m_value.VAL_UINT ) )
+                {
+                    r = true;
                 }
-                break;
-            case wxJSONTYPE_DOUBLE :
-                if ( otherData->m_type == wxJSONTYPE_INT )    {
-                    val = otherData->m_value.VAL_INT;
-                    if ( val == data->m_value.m_valDouble )    {
-                        r = true;
-                    }
+            }
+            else if ( otherData->m_type == wxJSONTYPE_DOUBLE )
+            {
+                val = data->m_value.VAL_UINT;
+                if ( val == otherData->m_value.m_valDouble )
+                {
+                    r = true;
                 }
-                else if ( otherData->m_type == wxJSONTYPE_UINT )    {
-                    val = otherData->m_value.VAL_UINT;
-                    if ( val == data->m_value.m_valDouble )    {
-                        r = true;
-                    }
+            }
+            else
+            {
+                r = false;
+            }
+            break;
+        case wxJSONTYPE_DOUBLE :
+            if ( otherData->m_type == wxJSONTYPE_INT )
+            {
+                val = otherData->m_value.VAL_INT;
+                if ( val == data->m_value.m_valDouble )
+                {
+                    r = true;
                 }
-                else    {
-                    r = false;
+            }
+            else if ( otherData->m_type == wxJSONTYPE_UINT )
+            {
+                val = otherData->m_value.VAL_UINT;
+                if ( val == data->m_value.m_valDouble )
+                {
+                    r = true;
                 }
-                break;
-            default:
+            }
+            else
+            {
                 r = false;
+            }
+            break;
+        default:
+            r = false;
             break;
         }
         return r;
@@ -2472,102 +2585,116 @@
     r = true;
     int r1;
 
-    switch ( data->m_type )  {
-        case wxJSONTYPE_INVALID :
-        case wxJSONTYPE_NULL :
-            // there is no need to compare the values
-            break;
-        case wxJSONTYPE_INT :
-            if ( data->m_value.VAL_INT != otherData->m_value.VAL_INT )  {
-                r = false;
-            }
-            break;
-        case wxJSONTYPE_UINT :
-            if ( data->m_value.VAL_UINT != otherData->m_value.VAL_UINT )  {
-                r = false;
-            }
-            break;
-        case wxJSONTYPE_DOUBLE :
-            if ( data->m_value.m_valDouble != otherData->m_value.m_valDouble )  {
-                r = false;
-            }
-            break;
-        case wxJSONTYPE_CSTRING :
-            s1 = wxString( data->m_value.m_valCString );
-            s2 = wxString( otherData->m_value.m_valCString );
-            if ( s1 != s2 )  {
-                r = false;
-            }
-            break;
-        case wxJSONTYPE_BOOL :
-            if ( data->m_value.m_valBool != otherData->m_value.m_valBool )  {
-                r = false;
-            }
-            break;
-        case wxJSONTYPE_STRING :
-            if ( data->m_valString != otherData->m_valString )  {
-                r = false;
-            }
-            break;
-        case wxJSONTYPE_MEMORYBUFF :
-            // we cannot simply use the operator ==; we need a deep comparison
-            r1 = CompareMemoryBuff( *(data->m_memBuff), *(otherData->m_memBuff));
-            if ( r1 != 0 )   {
-                r = false;
-            }
-            break;
-        case wxJSONTYPE_ARRAY :
-            size = Size();
-            wxLogTrace( compareTraceMask, _T("(%s) Comparing an array object - size=%d"),
+    switch ( data->m_type )
+    {
+    case wxJSONTYPE_INVALID :
+    case wxJSONTYPE_NULL :
+        // there is no need to compare the values
+        break;
+    case wxJSONTYPE_INT :
+        if ( data->m_value.VAL_INT != otherData->m_value.VAL_INT )
+        {
+            r = false;
+        }
+        break;
+    case wxJSONTYPE_UINT :
+        if ( data->m_value.VAL_UINT != otherData->m_value.VAL_UINT )
+        {
+            r = false;
+        }
+        break;
+    case wxJSONTYPE_DOUBLE :
+        if ( data->m_value.m_valDouble != otherData->m_value.m_valDouble )
+        {
+            r = false;
+        }
+        break;
+    case wxJSONTYPE_CSTRING :
+        s1 = wxString( data->m_value.m_valCString );
+        s2 = wxString( otherData->m_value.m_valCString );
+        if ( s1 != s2 )
+        {
+            r = false;
+        }
+        break;
+    case wxJSONTYPE_BOOL :
+        if ( data->m_value.m_valBool != otherData->m_value.m_valBool )
+        {
+            r = false;
+        }
+        break;
+    case wxJSONTYPE_STRING :
+        if ( data->m_valString != otherData->m_valString )
+        {
+            r = false;
+        }
+        break;
+    case wxJSONTYPE_MEMORYBUFF :
+        // we cannot simply use the operator ==; we need a deep comparison
+        r1 = CompareMemoryBuff( *( data->m_memBuff ), *( otherData->m_memBuff ) );
+        if ( r1 != 0 )
+        {
+            r = false;
+        }
+        break;
+    case wxJSONTYPE_ARRAY :
+        size = Size();
+        wxLogTrace( compareTraceMask, _T( "(%s) Comparing an array object - size=%d" ),
                     __PRETTY_FUNCTION__, size );
 
-            if ( size != other.Size() )  {
-                wxLogTrace( compareTraceMask, _T("(%s) Sizes does not match"),
+        if ( size != other.Size() )
+        {
+            wxLogTrace( compareTraceMask, _T( "(%s) Sizes does not match" ),
                         __PRETTY_FUNCTION__ );
-                return false;
-            }
-            // compares every element in this object with the element of
-            // the same index in the 'other' object
-            for ( int i = 0; i < size; i++ )  {
-                wxLogTrace( compareTraceMask, _T("(%s) Comparing array element=%d"),
+            return false;
+        }
+        // compares every element in this object with the element of
+        // the same index in the 'other' object
+        for ( int i = 0; i < size; i++ )
+        {
+            wxLogTrace( compareTraceMask, _T( "(%s) Comparing array element=%d" ),
                         __PRETTY_FUNCTION__, i );
-                wxJSONValue v1 = ItemAt( i );
-                wxJSONValue v2 = other.ItemAt( i );
+            wxJSONValue v1 = ItemAt( i );
+            wxJSONValue v2 = other.ItemAt( i );
 
-                if ( !v1.IsSameAs( v2 ))  {
-                    return false;
-                }
+            if ( !v1.IsSameAs( v2 ) )
+            {
+                return false;
             }
-            break;
-        case wxJSONTYPE_OBJECT :
-            size = Size();
-            wxLogTrace( compareTraceMask, _T("(%s) Comparing a map obejct - size=%d"),
-                        __PRETTY_FUNCTION__, size );
+        }
+        break;
+    case wxJSONTYPE_OBJECT :
+        size = Size();
+        wxLogTrace( compareTraceMask, _T( "(%s) Comparing a map obejct - size=%d" ),
+                    __PRETTY_FUNCTION__, size );
 
-            if ( size != other.Size() )  {
-                wxLogTrace( compareTraceMask, _T("(%s) Comparison failed - sizes does not match"),
-                                __PRETTY_FUNCTION__ );
+        if ( size != other.Size() )
+        {
+            wxLogTrace( compareTraceMask, _T( "(%s) Comparison failed - sizes does not match" ),
+                        __PRETTY_FUNCTION__ );
+            return false;
+        }
+        // for every key calls itself on the value found in
+        // the other object. if 'key' does no exist, returns FALSE
+        for ( it = data->m_valMap.begin(); it != data->m_valMap.end(); it++ )
+        {
+            wxString key = it->first;
+            wxLogTrace( compareTraceMask, _T( "(%s) Comparing map object - key=%s" ),
+                        __PRETTY_FUNCTION__, key.c_str() );
+            wxJSONValue otherVal = other.ItemAt( key );
+            bool isSame = it->second.IsSameAs( otherVal );
+            if ( !isSame )
+            {
+                wxLogTrace( compareTraceMask, _T( "(%s) Comparison failed for the last object" ),
+                            __PRETTY_FUNCTION__ );
                 return false;
             }
-            // for every key calls itself on the value found in
-            // the other object. if 'key' does no exist, returns FALSE
-            for ( it = data->m_valMap.begin(); it != data->m_valMap.end(); it++ )  {
-                wxString key = it->first;
-                wxLogTrace( compareTraceMask, _T("(%s) Comparing map object - key=%s"),
-                                __PRETTY_FUNCTION__, key.c_str() );
-                wxJSONValue otherVal = other.ItemAt( key );
-                bool isSame = it->second.IsSameAs( otherVal );
-                if ( !isSame )  {
-                    wxLogTrace( compareTraceMask, _T("(%s) Comparison failed for the last object"),
-                                    __PRETTY_FUNCTION__ );
-                    return false;
-                }
-            }
-            break;
-        default :
-            // should never happen
-            wxFAIL_MSG( _T("wxJSONValue::IsSameAs() unexpected wxJSONType"));
-            break;
+        }
+        break;
+    default :
+        // should never happen
+        wxFAIL_MSG( _T( "wxJSONValue::IsSameAs() unexpected wxJSONType" ) );
+        break;
     }
     return r;
 }
@@ -2603,50 +2730,60 @@
     wxJSONRefData* data = COW();
     wxJSON_ASSERT( data );
 
-    wxLogTrace( traceMask, _T("(%s) comment=%s"), __PRETTY_FUNCTION__, str.c_str() );
+    wxLogTrace( traceMask, _T( "(%s) comment=%s" ), __PRETTY_FUNCTION__, str.c_str() );
     int r = -1;
     int len = str.length();
-    if ( len < 2 )  {
-        wxLogTrace( traceMask, _T("     error: len < 2") );
+    if ( len < 2 )
+    {
+        wxLogTrace( traceMask, _T( "     error: len < 2" ) );
         return -1;
     }
-    if ( str[0] != '/' )  {
-        wxLogTrace( traceMask, _T("     error: does not start with\'/\'") );
+    if ( str[0] != '/' )
+    {
+        wxLogTrace( traceMask, _T( "     error: does not start with\'/\'" ) );
         return -1;
     }
-    if ( str[1] == '/' )  {       // a C++ comment: check that it ends with '\n'
-        wxLogTrace( traceMask, _T("     C++ comment" ));
-        if ( str.GetChar(len - 1) != '\n' )  {
+    if ( str[1] == '/' )          // a C++ comment: check that it ends with '\n'
+    {
+        wxLogTrace( traceMask, _T( "     C++ comment" ) );
+        if ( str.GetChar( len - 1 ) != '\n' )
+        {
             wxString temp( str );
             temp.append( 1, '\n' );
             data->m_comments.Add( temp );
-            wxLogTrace( traceMask, _T("     C++ comment: LF added") );
+            wxLogTrace( traceMask, _T( "     C++ comment: LF added" ) );
         }
-        else  {
+        else
+        {
             data->m_comments.Add( str );
         }
         r = data->m_comments.size();
     }
-    else if ( str[1] == '*' )  {  // a C-style comment: check that it ends with '*/'
-        wxLogTrace( traceMask, _T("     C-style comment") );
+    else if ( str[1] == '*' )     // a C-style comment: check that it ends with '*/'
+    {
+        wxLogTrace( traceMask, _T( "     C-style comment" ) );
         int lastPos = len - 1;
         wxChar ch = str.GetChar( lastPos );
         // skip leading whitespaces
-        while ( ch == ' ' || ch == '\n' || ch == '\t' )  {
+        while ( ch == ' ' || ch == '\n' || ch == '\t' )
+        {
             --lastPos;
             ch = str.GetChar( lastPos );
         }
-        if ( str.GetChar( lastPos ) == '/' &&  str.GetChar( lastPos - 1 ) == '*' ) {
+        if ( str.GetChar( lastPos ) == '/' &&  str.GetChar( lastPos - 1 ) == '*' )
+        {
             data->m_comments.Add( str );
             r = data->m_comments.size();
         }
     }
-    else  {
-        wxLogTrace( traceMask, _T("     error: is not a valid comment string") );
+    else
+    {
+        wxLogTrace( traceMask, _T( "     error: is not a valid comment string" ) );
         r = -1;
     }
     // if the comment was stored, store the position
-    if ( r >= 0 && position != wxJSONVALUE_COMMENT_DEFAULT )  {
+    if ( r >= 0 && position != wxJSONVALUE_COMMENT_DEFAULT )
+    {
         data->m_commentPos = position;
     }
     return r;
@@ -2662,10 +2799,13 @@
 int
 wxJSONValue::AddComment( const wxArrayString& comments, int position )
 {
-    int siz = comments.GetCount(); int r = 0;
-    for ( int i = 0; i < siz; i++ ) {
+    int siz = comments.GetCount();
+    int r = 0;
+    for ( int i = 0; i < siz; i++ )
+    {
         int r2 = AddComment( comments[i], position );
-        if ( r2 >= 0 )  {
+        if ( r2 >= 0 )
+        {
             ++r;
         }
     }
@@ -2687,12 +2827,15 @@
 
     wxString s;
     int size = data->m_comments.GetCount();
-    if ( idx < 0 )  {
-        for ( int i = 0; i < size; i++ )  {
+    if ( idx < 0 )
+    {
+        for ( int i = 0; i < size; i++ )
+        {
             s.append( data->m_comments[i] );
         }
     }
-    else if ( idx < size )  {
+    else if ( idx < size )
+    {
         s = data->m_comments[idx];
     }
     return s;
@@ -2706,7 +2849,7 @@
     wxJSON_ASSERT( data );
 
     int d = data->m_comments.GetCount();
-    wxLogTrace( traceMask, _T("(%s) comment count=%d"), __PRETTY_FUNCTION__, d );
+    wxLogTrace( traceMask, _T( "(%s) comment count=%d" ), __PRETTY_FUNCTION__, d );
     return d;
 }
 
@@ -2811,8 +2954,9 @@
     wxJSONType oldType = GetType();
 
     // check that type is within the allowed range
-    wxJSON_ASSERT((type >= wxJSONTYPE_INVALID) && (type <= wxJSONTYPE_MEMORYBUFF));
-    if ( (type < wxJSONTYPE_INVALID) || (type > wxJSONTYPE_MEMORYBUFF) )  {
+    wxJSON_ASSERT( ( type >= wxJSONTYPE_INVALID ) && ( type <= wxJSONTYPE_MEMORYBUFF ) );
+    if ( ( type < wxJSONTYPE_INVALID ) || ( type > wxJSONTYPE_MEMORYBUFF ) )
+    {
         type = wxJSONTYPE_INVALID;
     }
 
@@ -2826,16 +2970,19 @@
     data = COW();
 
     // do nothing if the actual type is the same as 'type'
-    if ( type == oldType )  {
+    if ( type == oldType )
+    {
         return data;
     }
 
     // change the type of the referened structure
     // NOTE: integer types are always stored as the generic integer types
-    if ( type == wxJSONTYPE_LONG || type == wxJSONTYPE_INT64 || type == wxJSONTYPE_SHORT )  {
+    if ( type == wxJSONTYPE_LONG || type == wxJSONTYPE_INT64 || type == wxJSONTYPE_SHORT )
+    {
         type = wxJSONTYPE_INT;
     }
-    if ( type == wxJSONTYPE_ULONG || type == wxJSONTYPE_UINT64 || type == wxJSONTYPE_USHORT )  {
+    if ( type == wxJSONTYPE_ULONG || type == wxJSONTYPE_UINT64 || type == wxJSONTYPE_USHORT )
+    {
         type = wxJSONTYPE_UINT;
     }
 
@@ -2843,32 +2990,35 @@
     data->m_type = type;
 
     // clears complex objects of the old type
-    switch ( oldType )  {
-        case wxJSONTYPE_STRING:
-            data->m_valString.clear();
-            break;
-        case wxJSONTYPE_ARRAY:
-            data->m_valArray.Clear();
-            break;
-        case wxJSONTYPE_OBJECT:
-            data->m_valMap.clear();
-            break;
-        case wxJSONTYPE_MEMORYBUFF:
-            // we first have to delete the actual memory buffer, if any
-            if ( data->m_memBuff )  {
-                delete data->m_memBuff;
-                data->m_memBuff = 0;
-            }
-            break;
-        default :
-            // there is not need to clear primitive types
-            break;
+    switch ( oldType )
+    {
+    case wxJSONTYPE_STRING:
+        data->m_valString.clear();
+        break;
+    case wxJSONTYPE_ARRAY:
+        data->m_valArray.Clear();
+        break;
+    case wxJSONTYPE_OBJECT:
+        data->m_valMap.clear();
+        break;
+    case wxJSONTYPE_MEMORYBUFF:
+        // we first have to delete the actual memory buffer, if any
+        if ( data->m_memBuff )
+        {
+            delete data->m_memBuff;
+            data->m_memBuff = 0;
+        }
+        break;
+    default :
+        // there is not need to clear primitive types
+        break;
     }
 
     // if the WXJSON_USE_CSTRING macro is not defined, the class forces
     // C-string to be stored as wxString objects
 #if !defined( WXJSON_USE_CSTRING )
-    if ( data->m_type == wxJSONTYPE_CSTRING )  {
+    if ( data->m_type == wxJSONTYPE_CSTRING )
+    {
         data->m_type = wxJSONTYPE_STRING;
     }
 #endif
@@ -2891,7 +3041,8 @@
     // return ZERO if there is not a referenced data structure
     int n = 0;
     wxJSONRefData* data = GetRefData();
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         n = data->m_lineNo;
     }
     return n;
@@ -2908,26 +3059,27 @@
 
 //! Set the pointer to the referenced data.
 void
-wxJSONValue::SetRefData(wxJSONRefData* data)
+wxJSONValue::SetRefData( wxJSONRefData* data )
 {
     m_refData = data;
 }
 
 //! Increments the referenced data counter.
 void
-wxJSONValue::Ref(const wxJSONValue& clone)
+wxJSONValue::Ref( const wxJSONValue& clone )
 {
     // nothing to be done
-    if (m_refData == clone.m_refData)
+    if ( m_refData == clone.m_refData )
         return;
 
     // delete reference to old data
     UnRef();
 
     // reference new data
-    if ( clone.m_refData )    {
+    if ( clone.m_refData )
+    {
         m_refData = clone.m_refData;
-        ++(m_refData->m_refCount);
+        ++( m_refData->m_refCount );
     }
 }
 
@@ -2940,10 +3092,12 @@
 void
 wxJSONValue::UnRef()
 {
-    if ( m_refData )   {
-        wxASSERT_MSG( m_refData->m_refCount > 0, _T("invalid ref data count") );
+    if ( m_refData )
+    {
+        wxASSERT_MSG( m_refData->m_refCount > 0, _T( "invalid ref data count" ) );
 
-        if ( --m_refData->m_refCount == 0 )    {
+        if ( --m_refData->m_refCount == 0 )
+        {
             delete m_refData;
             m_refData = NULL;
         }
@@ -3014,17 +3168,19 @@
     // if the data contains a wxMemoryBuffer object, then we have
     // to make a deep copy of the buffer by allocating a new one because
     // wxMemoryBuffer is not a copy-on-write structure
-    if ( other->m_memBuff ) {
+    if ( other->m_memBuff )
+    {
         data->m_memBuff = new wxMemoryBuffer();
         const void* ptr = data->m_memBuff->GetData();
         size_t len      = data->m_memBuff->GetDataLen();
-        if ( data->m_memBuff && len )   {
+        if ( data->m_memBuff && len )
+        {
             data->m_memBuff->AppendData( ptr, len );
         }
     }
 
-    wxLogTrace( cowTraceMask, _T("(%s) CloneRefData() PROGR: other=%d data=%d"),
-            __PRETTY_FUNCTION__, other->GetRefCount(), data->GetRefCount() );
+    wxLogTrace( cowTraceMask, _T( "(%s) CloneRefData() PROGR: other=%d data=%d" ),
+                __PRETTY_FUNCTION__, other->GetRefCount(), data->GetRefCount() );
 
     return data;
 }
@@ -3057,12 +3213,12 @@
 wxJSONValue::COW()
 {
     wxJSONRefData* data = GetRefData();
-    wxLogTrace( cowTraceMask, _T("(%s) COW() START data=%p data->m_count=%d"),
-             __PRETTY_FUNCTION__, data, data->GetRefCount());
+    wxLogTrace( cowTraceMask, _T( "(%s) COW() START data=%p data->m_count=%d" ),
+                __PRETTY_FUNCTION__, data, data->GetRefCount() );
     UnShare();
     data = GetRefData();
-    wxLogTrace( cowTraceMask, _T("(%s) COW() END data=%p data->m_count=%d"),
-             __PRETTY_FUNCTION__, data, data->GetRefCount());
+    wxLogTrace( cowTraceMask, _T( "(%s) COW() END data=%p data->m_count=%d" ),
+                __PRETTY_FUNCTION__, data, data->GetRefCount() );
     return GetRefData();
 }
 
@@ -3070,21 +3226,23 @@
 void
 wxJSONValue::AllocExclusive()
 {
-    if ( !m_refData )    {
+    if ( !m_refData )
+    {
         m_refData = CreateRefData();
     }
-    else if ( m_refData->GetRefCount() > 1 )    {
+    else if ( m_refData->GetRefCount() > 1 )
+    {
         // note that ref is not going to be destroyed in this case
         const wxJSONRefData* ref = m_refData;
         UnRef();
 
         // ... so we can still access it
-        m_refData = CloneRefData(ref);
+        m_refData = CloneRefData( ref );
     }
     //else: ref count is 1, we are exclusive owners of m_refData anyhow
 
     wxASSERT_MSG( m_refData && m_refData->GetRefCount() == 1,
-                  _T("wxObject::AllocExclusive() failed.") );
+                  _T( "wxObject::AllocExclusive() failed." ) );
 }
 
 //! Convert memory buffer object to a string representation.
@@ -3095,8 +3253,8 @@
  in the memory buffer; bytes are separated by a space character.
  The string starts with the actual lenght of the data enclosed in parenthesis.
  The string will contain \c len bytes if \c len is less than the length
- of the actual data in \c buff.
- Note that the (len) printed in the output referes to the length of the buffer
+ of the actual data in \c buff.
+ Note that the (len) printed in the output referes to the length of the buffer
  which may be greater than the length that has to be printed.
 
  \b Example:
@@ -3121,19 +3279,19 @@
  binary memory buffer pointed to by \c buff for \c len bytes.
  The string is composed of two hexadecimal digits for every byte contained
  in the memory buffer; bytes are separated by a space character.
- The string starts with pointer to binary data followed by the lenght of the
+ The string starts with pointer to binary data followed by the lenght of the
  data enclosed in parenthesis.
 
  \b Example:
  This is an example of printing ten bytes from a memory buffer:
  \code
    0x80974653 (10) 00 01 02 03 04 05 06 07 08 09
- \endcode
-
- @param buff the pointer to the memory buffer data
- @len   the length of the data that has to be printed
- @actualLen the real lenght of the memory buffer that has to be printed
-        just afetr the pointer; may be greater than \c len. If this parameter
+ \endcode
+
+ @param buff the pointer to the memory buffer data
+ @len   the length of the data that has to be printed
+ @actualLen the real lenght of the memory buffer that has to be printed
+        just afetr the pointer; may be greater than \c len. If this parameter
         is -1 then it is equal to \c len
 */
 wxString
@@ -3141,12 +3299,14 @@
 {
     wxString s;
     size_t buffLen = actualLen;
-    if (buffLen == (size_t) -1 )    {
+    if ( buffLen == ( size_t ) -1 )
+    {
         buffLen = len;
     }
-    s.Printf( _T("%p (%u) "), buff, buffLen );
-    unsigned char*  ptr = (unsigned char*) buff;
-    for ( unsigned int i = 0; i < len; i++ ) {
+    s.Printf( _T( "%p (%u) " ), buff, buffLen );
+    unsigned char*  ptr = ( unsigned char* ) buff;
+    for ( unsigned int i = 0; i < len; i++ )
+    {
         unsigned char c = *ptr;
         ++ptr;
         // now convert the character
@@ -3154,10 +3314,12 @@
         char c2 = c % 16;
         c1 += '0';
         c2 += '0';
-        if ( c1 > '9' )  {
+        if ( c1 > '9' )
+        {
             c1 += 7;
         }
-        if ( c2 > '9' )  {
+        if ( c2 > '9' )
+        {
             c2 += 7;
         }
         s.Append( c1, 1 );
@@ -3200,13 +3362,16 @@
     int r;
     size_t buff1Len = buff1.GetDataLen();
     size_t buff2Len = buff2.GetDataLen();
-    if ( buff1Len > buff2Len )  {
+    if ( buff1Len > buff2Len )
+    {
         r = 1;
     }
-    else if ( buff1Len < buff2Len )  {
+    else if ( buff1Len < buff2Len )
+    {
         r = -1;
     }
-    else    {
+    else
+    {
         r = memcmp( buff1.GetData(), buff2.GetData(), buff1Len );
     }
     return r;
@@ -3260,15 +3425,19 @@
 wxJSONValue::ArrayToMemoryBuff( const wxJSONValue& value )
 {
     wxMemoryBuffer buff;
-    if ( value.IsArray() )  {
+    if ( value.IsArray() )
+    {
         int len = value.Size();
-        for ( int i = 0; i < len; i++ )  {
-            short int byte; unsigned char c;
+        for ( int i = 0; i < len; i++ )
+        {
+            short int byte;
+            unsigned char c;
             // we do not use opertaor [] because it is not const
             // bool r = value[i].AsShort( byte );
-            bool r = value.ItemAt(i).AsShort( byte );
-            if ( r && ( byte >= 0 && byte <= 255 ) )  {
-                c = (unsigned char) byte;
+            bool r = value.ItemAt( i ).AsShort( byte );
+            if ( r && ( byte >= 0 && byte <= 255 ) )
+            {
+                c = ( unsigned char ) byte;
                 buff.AppendByte( c );
             }
         }
@@ -3292,7 +3461,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_INT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_value.VAL_INT = i;
     }
 }
@@ -3303,7 +3473,8 @@
     m_refData = 0;
     wxJSONRefData* data = Init( wxJSONTYPE_UINT );
     wxJSON_ASSERT( data );
-    if ( data != 0 ) {
+    if ( data != 0 )
+    {
         data->m_value.VAL_UINT = ui;
     }
 }
@@ -3357,7 +3528,8 @@
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
     bool r = false;
-    if ( data->m_type == wxJSONTYPE_INT ) {
+    if ( data->m_type == wxJSONTYPE_INT )
+    {
         r = true;
     }
     return r;
@@ -3380,7 +3552,8 @@
     wxJSONRefData* data = GetRefData();
     wxJSON_ASSERT( data );
     bool r = false;
-    if ( data->m_type == wxJSONTYPE_UINT ) {
+    if ( data->m_type == wxJSONTYPE_UINT )
+    {
         r = true;
     }
     return r;
@@ -3402,7 +3575,7 @@
 wxJSONValue::AsInt32() const
 {
     wxInt32 i;
-    i = (wxInt32) AsLong();
+    i = ( wxInt32 ) AsLong();
     return i;
 }
 
@@ -3422,7 +3595,7 @@
 wxJSONValue::AsUInt32() const
 {
     wxUint32 ui;
-    ui = (wxUint32) AsULong();
+    ui = ( wxUint32 ) AsULong();
     return ui;
 }
 
@@ -3448,7 +3621,7 @@
     wxJSON_ASSERT( data );
     wxInt64 i64 = data->m_value.m_valInt64;
 
-    wxJSON_ASSERT( IsInt64());  // exapnds only in debug builds
+    wxJSON_ASSERT( IsInt64() ); // exapnds only in debug builds
     return i64;
 }
 
@@ -3473,7 +3646,7 @@
     wxJSON_ASSERT( data );
     wxUint64 ui64 = data->m_value.m_valUInt64;
 
-    wxJSON_ASSERT( IsUInt64());  // exapnds only in debug builds
+    wxJSON_ASSERT( IsUInt64() ); // exapnds only in debug builds
     return ui64;
 }
 
@@ -3481,7 +3654,8 @@
 wxJSONValue::AsInt32( wxInt32& i32 ) const
 {
     bool r = IsInt32();
-    if ( r )    {
+    if ( r )
+    {
         i32 = AsInt32();
     }
     return r;
@@ -3491,7 +3665,8 @@
 wxJSONValue::AsUInt32( wxUint32& ui32 ) const
 {
     bool r = IsUInt32();
-    if ( r )    {
+    if ( r )
+    {
         ui32 = AsUInt32();
     }
     return r;
@@ -3501,7 +3676,8 @@
 wxJSONValue::AsInt64( wxInt64& i64 ) const
 {
     bool r = IsInt64();
-    if ( r )    {
+    if ( r )
+    {
         i64 = AsInt64();
     }
     return r;
@@ -3511,7 +3687,8 @@
 wxJSONValue::AsUInt64( wxUint64& ui64 ) const
 {
     bool r = IsUInt64();
-    if ( r )    {
+    if ( r )
+    {
         ui64 = AsUInt64();
     }
     return r;
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/jsonval.h opencpn-plugin-logbookkonni-1.2024/src/jsonval.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/jsonval.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/jsonval.h	2016-02-25 13:06:29.000000000 +0000
@@ -12,23 +12,23 @@
 #define _WX_JSONVAL_H
 #ifndef __WXOSX__
 #ifdef __GNUG__
-    #pragma interface "jsonval.h"
+#pragma interface "jsonval.h"
 #endif
 #endif
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+#pragma hdrstop
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
-    #include <wx/object.h>
-    #include <wx/hashmap.h>
-    #include <wx/dynarray.h>
-    #include <wx/arrstr.h>
+#include <wx/object.h>
+#include <wx/hashmap.h>
+#include <wx/dynarray.h>
+#include <wx/arrstr.h>
 #endif
 
 
@@ -39,19 +39,20 @@
 class WXDLLIMPEXP_JSON wxJSONRefData;
 
 #if defined( wxJSON_USE_STL )
-    // if compiling on MinGW we use the STL-style declaration of wxWidget's
-    // container classes
-    class WXDLLIMPEXP_JSON wxJSONValue;
-    WX_DECLARE_OBJARRAY( wxJSONValue, wxJSONInternalArray );
-    WX_DECLARE_STRING_HASH_MAP( wxJSONValue, wxJSONInternalMap );
+// if compiling on MinGW we use the STL-style declaration of wxWidget's
+// container classes
+class WXDLLIMPEXP_JSON wxJSONValue;
+WX_DECLARE_OBJARRAY( wxJSONValue, wxJSONInternalArray );
+WX_DECLARE_STRING_HASH_MAP( wxJSONValue, wxJSONInternalMap );
 #else
-    class WXDLLIMPEXP_JSON wxJSONInternalMap;
-    class WXDLLIMPEXP_JSON wxJSONInternalArray;
+class WXDLLIMPEXP_JSON wxJSONInternalMap;
+class WXDLLIMPEXP_JSON wxJSONInternalArray;
 #endif
 
 
 //! The type of the value held by the wxJSONRefData class
-enum wxJSONType {
+enum wxJSONType
+{
     wxJSONTYPE_INVALID = 0,  /*!< the object is not uninitialized        */
     wxJSONTYPE_NULL,       /*!< the object contains a NULL value         */
     wxJSONTYPE_INT,        /*!< the object contains an integer           */
@@ -73,11 +74,12 @@
 
 // the comment position: every value only has one comment position
 // althrough comments may be splitted into several lines
-enum {
-  wxJSONVALUE_COMMENT_DEFAULT = 0,
-  wxJSONVALUE_COMMENT_BEFORE,
-  wxJSONVALUE_COMMENT_AFTER,
-  wxJSONVALUE_COMMENT_INLINE,
+enum
+{
+    wxJSONVALUE_COMMENT_DEFAULT = 0,
+    wxJSONVALUE_COMMENT_BEFORE,
+    wxJSONVALUE_COMMENT_AFTER,
+    wxJSONVALUE_COMMENT_INLINE,
 };
 
 /***********************************************************************
@@ -277,11 +279,11 @@
     wxJSONRefData*  COW();
 
     // overidden from wxObject
-    virtual wxJSONRefData*  CloneRefData(const wxJSONRefData *data) const;
+    virtual wxJSONRefData*  CloneRefData( const wxJSONRefData *data ) const;
     virtual wxJSONRefData*  CreateRefData() const;
 
-    void            SetRefData(wxJSONRefData* data);
-    void            Ref(const wxJSONValue& clone);
+    void            SetRefData( wxJSONRefData* data );
+    void            Ref( const wxJSONValue& clone );
     void            UnRef();
     void            UnShare();
     void            AllocExclusive();
@@ -299,10 +301,10 @@
 
 
 #if !defined( wxJSON_USE_STL )
-    // if using wxWidget's implementation of container classes we declare
-    // the OBJARRAY are HASH_MAP _after_ the wxJSONValue is fully known
-    WX_DECLARE_OBJARRAY( wxJSONValue, wxJSONInternalArray );
-    WX_DECLARE_STRING_HASH_MAP( wxJSONValue, wxJSONInternalMap );
+// if using wxWidget's implementation of container classes we declare
+// the OBJARRAY are HASH_MAP _after_ the wxJSONValue is fully known
+WX_DECLARE_OBJARRAY( wxJSONValue, wxJSONInternalArray );
+WX_DECLARE_STRING_HASH_MAP( wxJSONValue, wxJSONInternalMap );
 #endif
 
 
@@ -326,7 +328,8 @@
  To know more about the internal structure of the wxJSONValue class
  see \ref pg_json_internals.
 */
-union wxJSONValueHolder  {
+union wxJSONValueHolder
+{
     int             m_valInt;
     unsigned int    m_valUInt;
     short int       m_valShort;
@@ -340,7 +343,7 @@
     wxInt64         m_valInt64;
     wxUint64        m_valUInt64;
 #endif
-    };
+};
 
 //
 // access to the (unsigned) integer value is done through
@@ -348,11 +351,11 @@
 // data member of the 'long long' integer if 64-bits integer
 // support is enabled
 #if defined( wxJSON_64BIT_INT )
- #define VAL_INT  m_valInt64
- #define VAL_UINT m_valUInt64
+#define VAL_INT  m_valInt64
+#define VAL_UINT m_valUInt64
 #else
- #define VAL_INT  m_valLong
- #define VAL_UINT m_valULong
+#define VAL_INT  m_valLong
+#define VAL_UINT m_valULong
 #endif
 
 
@@ -421,7 +424,7 @@
 
     //! The pointer to the memory buffer object
     /*!
-     Note that despite using reference counting, the \b wxMemoryBuffer is not a 
+     Note that despite using reference counting, the \b wxMemoryBuffer is not a
      \e copy-on-write structure so the wxJSON library uses some tricks in order to
      avoid the side effects of copying / assigning wxMemoryBuffer objects
     */
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/jsonwriter.cpp opencpn-plugin-logbookkonni-1.2024/src/jsonwriter.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/jsonwriter.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/jsonwriter.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -9,7 +9,7 @@
 /////////////////////////////////////////////////////////////////////////////
 #ifndef __WXOSX__
 #ifdef __GNUG__
-    #pragma implementation "jsonwriter.cpp"
+#pragma implementation "jsonwriter.cpp"
 #endif
 #endif
 
@@ -20,7 +20,7 @@
 #include <wx/debug.h>
 #include <wx/log.h>
 
-static const wxChar* writerTraceMask = _T("traceWriter");
+static const wxChar* writerTraceMask = _T( "traceWriter" );
 
 /*! \class wxJSONWriter
  \brief The JSON document writer
@@ -182,7 +182,7 @@
     \li wxJSONWRITER_NOUTF8_STREAM: suppress UTF-8 conversion when writing string
         values to the stream thus producing ANSI text output; only meaningfull in
         ANSI builds, this flag is simply ignored in Unicode builds.
-    \li wxJSONWRITER_MEMORYBUFF: 
+    \li wxJSONWRITER_MEMORYBUFF:
 
 
  Note that for the style wxJSONWRITER_NONE the JSON text output is a bit
@@ -197,17 +197,19 @@
     m_step   = step;
     m_style  = style;
     m_noUtf8 = false;
-    if ( m_style == wxJSONWRITER_NONE )  {
+    if ( m_style == wxJSONWRITER_NONE )
+    {
         m_indent = 0;
         m_step   = 0;
     }
     // set the default format string for doubles as
     // 10 significant digits and suppress trailing ZEROes
-    SetDoubleFmtString( "%.10g") ;
+    SetDoubleFmtString( "%.10g" ) ;
 
 #if !defined( wxJSON_USE_UNICODE )
     // in ANSI builds we can suppress UTF-8 conversion for both the writer and the reader
-    if ( m_style == wxJSONWRITER_NOUTF8_STREAM )    {
+    if ( m_style == wxJSONWRITER_NOUTF8_STREAM )
+    {
         m_noUtf8 = true;
     }
 #endif
@@ -276,11 +278,13 @@
     wxStreamBuffer* osBuff = os.GetOutputStreamBuffer();
     void* buffStart = osBuff->GetBufferStart();
 
-    if ( m_noUtf8 )    {
-        str = wxString::From8BitData( (const char*) buffStart, len );
-    }
-    else    {
-        str = wxString::FromUTF8( (const char*) buffStart, len );
+    if ( m_noUtf8 )
+    {
+        str = wxString::From8BitData( ( const char* ) buffStart, len );
+    }
+    else
+    {
+        str = wxString::FromUTF8( ( const char* ) buffStart, len );
     }
 #if !defined( wxJSON_USE_UNICODE )
     m_noUtf8 = noUtf8_bak;        // restore the old setting
@@ -313,7 +317,7 @@
 void
 wxJSONWriter::SetDoubleFmtString( const char* fmt )
 {
-    m_fmt = (char*) fmt;
+    m_fmt = ( char* ) fmt;
 }
 
 
@@ -343,7 +347,8 @@
     // some variables that cannot be allocated in the switch statement
     const wxJSONInternalMap* map = 0;
     int size;
-    m_colNo = 1; m_lineNo = 1;
+    m_colNo = 1;
+    m_lineNo = 1;
     // determine the comment position; it is one of:
     //
     //  wxJSONVALUE_COMMENT_BEFORE
@@ -352,12 +357,15 @@
     //
     // or -1 if comments have not to be written
     int commentPos = -1;
-    if ( value.GetCommentCount() > 0 && (m_style & wxJSONWRITER_WRITE_COMMENTS))  {
+    if ( value.GetCommentCount() > 0 && ( m_style & wxJSONWRITER_WRITE_COMMENTS ) )
+    {
         commentPos = value.GetCommentPos();
-        if ( ( m_style & wxJSONWRITER_COMMENTS_BEFORE) != 0 ) {
+        if ( ( m_style & wxJSONWRITER_COMMENTS_BEFORE ) != 0 )
+        {
             commentPos = wxJSONVALUE_COMMENT_BEFORE;
         }
-        else if ( (m_style & wxJSONWRITER_COMMENTS_AFTER) != 0 ) {
+        else if ( ( m_style & wxJSONWRITER_COMMENTS_AFTER ) != 0 )
+        {
             commentPos = wxJSONVALUE_COMMENT_AFTER;
         }
     }
@@ -365,26 +373,32 @@
     int lastChar = 0;  // check if WriteComment() writes the last LF char
 
     // first write the comment if it is BEFORE
-    if ( commentPos == wxJSONVALUE_COMMENT_BEFORE )   {
+    if ( commentPos == wxJSONVALUE_COMMENT_BEFORE )
+    {
         lastChar = WriteComment( os, value, true );
-        if ( lastChar < 0 )   {
+        if ( lastChar < 0 )
+        {
             return lastChar;
         }
-        else if ( lastChar != '\n' )  {
+        else if ( lastChar != '\n' )
+        {
             WriteSeparator( os );
         }
     }
 
     lastChar = WriteIndent( os );
-    if ( lastChar < 0 )   {
+    if ( lastChar < 0 )
+    {
         return lastChar;
     }
 
     // now write the key if it is not NULL
-    if ( key )   {
+    if ( key )
+    {
         lastChar = WriteKey( os, *key );
     }
-    if ( lastChar < 0 )   {
+    if ( lastChar < 0 )
+    {
         return lastChar;
     }
 
@@ -393,10 +407,11 @@
     long int count = 0;
 
     wxJSONType t = value.GetType();
-    switch ( t )  {
+    switch ( t )
+    {
     case wxJSONTYPE_INVALID :
         WriteInvalid( os );
-        wxFAIL_MSG( _T("wxJSONWriter::WriteEmpty() cannot be called (not a valid JSON text"));
+        wxFAIL_MSG( _T( "wxJSONWriter::WriteEmpty() cannot be called (not a valid JSON text" ) );
         break;
 
     case wxJSONTYPE_INT :
@@ -426,51 +441,60 @@
 
     case wxJSONTYPE_STRING :
     case wxJSONTYPE_CSTRING :
-        lastChar = WriteStringValue( os, value.AsString());
+        lastChar = WriteStringValue( os, value.AsString() );
         break;
 
     case wxJSONTYPE_MEMORYBUFF :
-        lastChar = WriteMemoryBuff( os, value.AsMemoryBuff());
+        lastChar = WriteMemoryBuff( os, value.AsMemoryBuff() );
         break;
 
     case wxJSONTYPE_ARRAY :
         ++m_level;
         os.PutC( '[' );
         // the inline comment for objects and arrays are printed in the open char
-        if ( commentPos == wxJSONVALUE_COMMENT_INLINE )   {
+        if ( commentPos == wxJSONVALUE_COMMENT_INLINE )
+        {
             commentPos = -1;  // we have already written the comment
             lastChar = WriteComment( os, value, false );
-            if ( lastChar < 0 )   {
+            if ( lastChar < 0 )
+            {
                 return lastChar;
             }
-            if ( lastChar != '\n' )   {
+            if ( lastChar != '\n' )
+            {
                 lastChar = WriteSeparator( os );
             }
         }
-        else   {    // comment is not to be printed inline, so write a LF
+        else        // comment is not to be printed inline, so write a LF
+        {
             lastChar = WriteSeparator( os );
-            if ( lastChar < 0 )   {
+            if ( lastChar < 0 )
+            {
                 return lastChar;
             }
         }
 
         // now iterate through all sub-items and call DoWrite() recursively
         size = value.Size();
-        for ( int i = 0; i < size; i++ )  {
+        for ( int i = 0; i < size; i++ )
+        {
             bool comma = false;
-            if ( i < size - 1 )  {
+            if ( i < size - 1 )
+            {
                 comma = true;
             }
             wxJSONValue v = value.ItemAt( i );
             lastChar = DoWrite( os, v, 0, comma );
-            if ( lastChar < 0 )  {
+            if ( lastChar < 0 )
+            {
                 return lastChar;
             }
 
         }
         --m_level;
         lastChar = WriteIndent( os );
-        if ( lastChar < 0 )   {
+        if ( lastChar < 0 )
+        {
             return lastChar;
         }
         os.PutC( ']' );
@@ -481,40 +505,48 @@
 
         os.PutC( '{' );
         // the inline comment for objects and arrays are printed in the open char
-        if ( commentPos == wxJSONVALUE_COMMENT_INLINE )   {
+        if ( commentPos == wxJSONVALUE_COMMENT_INLINE )
+        {
             commentPos = -1;  // we have already written the comment
             lastChar = WriteComment( os, value, false );
-            if ( lastChar < 0 )   {
+            if ( lastChar < 0 )
+            {
                 return lastChar;
             }
-            if ( lastChar != '\n' )   {
+            if ( lastChar != '\n' )
+            {
                 WriteSeparator( os );
             }
         }
-        else   {
+        else
+        {
             lastChar = WriteSeparator( os );
         }
 
         map = value.AsMap();
         size = value.Size();
         count = 0;
-        for ( it = map->begin(); it != map->end(); ++it )  {
+        for ( it = map->begin(); it != map->end(); ++it )
+        {
             // get the key and the value
             wxString key = it->first;
             const wxJSONValue& v = it->second;
             bool comma = false;
-            if ( count < size - 1 )  {
+            if ( count < size - 1 )
+            {
                 comma = true;
             }
             lastChar = DoWrite( os, v, &key, comma );
-            if ( lastChar < 0 )  {
+            if ( lastChar < 0 )
+            {
                 return lastChar;
             }
             count++;
         }
         --m_level;
         lastChar = WriteIndent( os );
-        if ( lastChar < 0 )   {
+        if ( lastChar < 0 )
+        {
             return lastChar;
         }
         os.PutC( '}' );
@@ -522,29 +554,35 @@
 
     default :
         // a not yet defined wxJSONType: we FAIL
-        wxFAIL_MSG( _T("wxJSONWriter::DoWrite() undefined wxJSONType type"));
+        wxFAIL_MSG( _T( "wxJSONWriter::DoWrite() undefined wxJSONType type" ) );
         break;
     }
 
     // writes the comma character before the inline comment
-    if ( comma )  {
+    if ( comma )
+    {
         os.PutC( ',' );
     }
 
-    if ( commentPos == wxJSONVALUE_COMMENT_INLINE )   {
+    if ( commentPos == wxJSONVALUE_COMMENT_INLINE )
+    {
         lastChar = WriteComment( os, value, false );
-        if ( lastChar < 0 )   {
+        if ( lastChar < 0 )
+        {
             return lastChar;
         }
     }
-    else if ( commentPos == wxJSONVALUE_COMMENT_AFTER )   {
+    else if ( commentPos == wxJSONVALUE_COMMENT_AFTER )
+    {
         WriteSeparator( os );
         lastChar = WriteComment( os, value, true );
-        if ( lastChar < 0 )   {
+        if ( lastChar < 0 )
+        {
             return lastChar;
         }
     }
-    if ( lastChar != '\n' )  {
+    if ( lastChar != '\n' )
+    {
         lastChar = WriteSeparator( os );
     }
     return lastChar;
@@ -561,22 +599,27 @@
     int lastChar = 0;
 
     // only write comments if the style include the WRITE_COMMENTS flag
-    if ( (m_style & wxJSONWRITER_WRITE_COMMENTS ) == 0 ) {
+    if ( ( m_style & wxJSONWRITER_WRITE_COMMENTS ) == 0 )
+    {
         return lastChar;
     }
 
     const wxArrayString cmt = value.GetCommentArray();
     int cmtSize = cmt.GetCount();
-    for ( int i = 0; i < cmtSize; i++ )    {
-        if ( indent )    {
+    for ( int i = 0; i < cmtSize; i++ )
+    {
+        if ( indent )
+        {
             WriteIndent( os );
         }
-        else    {
+        else
+        {
             os.PutC( '\t' );
         }
-        WriteString( os, cmt[i]);
+        WriteString( os, cmt[i] );
         lastChar = cmt[i].Last();
-        if ( lastChar != '\n' )   {
+        if ( lastChar != '\n' )
+        {
             os.PutC( '\n' );
             lastChar = '\n';
         }
@@ -623,20 +666,24 @@
 wxJSONWriter::WriteIndent( wxOutputStream& os, int num )
 {
     int lastChar = 0;
-    if ( !(m_style & wxJSONWRITER_STYLED) || (m_style & wxJSONWRITER_NO_INDENTATION))  {
+    if ( !( m_style & wxJSONWRITER_STYLED ) || ( m_style & wxJSONWRITER_NO_INDENTATION ) )
+    {
         return lastChar;
     }
 
     int numChars = m_indent + ( m_step * num );
     char c = ' ';
-    if ( m_style & wxJSONWRITER_TAB_INDENT ) {
+    if ( m_style & wxJSONWRITER_TAB_INDENT )
+    {
         c = '\t';
         numChars = num;
     }
 
-    for ( int i = 0; i < numChars; i++ )  {
+    for ( int i = 0; i < numChars; i++ )
+    {
         os.PutC( c );
-        if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+        if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+        {
             return -1;
         }
 
@@ -672,22 +719,25 @@
     char* writeBuff = 0;
     wxCharBuffer utf8CB = str.ToUTF8();        // the UTF-8 buffer
 #if !defined( wxJSON_USE_UNICODE )
-    wxCharBuffer ansiCB( str.c_str());        // the ANSI buffer
-    if ( m_noUtf8 )    {
+    wxCharBuffer ansiCB( str.c_str() );       // the ANSI buffer
+    if ( m_noUtf8 )
+    {
         writeBuff = ansiCB.data();
     }
-    else    {
+    else
+    {
         writeBuff = utf8CB.data();
     }
 #else
-        writeBuff = utf8CB.data();
+    writeBuff = utf8CB.data();
 #endif
 
     // NOTE: in ANSI builds UTF-8 conversion may fail (see samples/test5.cpp,
     // test 7.3) although I do not know why
-    if ( writeBuff == 0 )    {
+    if ( writeBuff == 0 )
+    {
         const char* err = "<wxJSONWriter::WriteStringValue(): error converting the string to a UTF8 buffer>";
-        os.Write( err, strlen( err ));
+        os.Write( err, strlen( err ) );
         return 0;
     }
     size_t len = strlen( writeBuff );
@@ -701,7 +751,8 @@
 
     // now write the UTF8 buffer processing the bytes
     size_t i;
-    for ( i = 0; i < len; i++ ) {
+    for ( i = 0; i < len; i++ )
+    {
         bool shouldEscape = false;
         unsigned char ch = *writeBuff;
         ++writeBuff;        // point to the next byte
@@ -712,7 +763,8 @@
         // for every character we have to check if it is a character that
         // needs to be escaped: note that characters that should be escaped
         // may be not if some writer's flags are specified
-        switch ( ch )  {
+        switch ( ch )
+        {
         case '\"' :     // quotes
             shouldEscape = true;
             escCh = '\"';
@@ -753,43 +805,54 @@
 
         // if the character is a control character that is not identified by a
         // lowercase letter, we should escape it
-        if ( !shouldEscape && ch < 32 )  {
+        if ( !shouldEscape && ch < 32 )
+        {
             char b[8];
-            snprintf( b, 8, "\\u%04X", (int) ch );
+            snprintf( b, 8, "\\u%04X", ( int ) ch );
             os.Write( b, 6 );
-            if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+            if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+            {
                 return -1;
             }
         }
 
         // the char is not a control character
-        else {
+        else
+        {
             // some characters that should be escaped are not escaped
             // if the writer was constructed with some flags
-            if ( shouldEscape && !( m_style & wxJSONWRITER_ESCAPE_SOLIDUS) )  {
-                if ( ch == '/' )  {
+            if ( shouldEscape && !( m_style & wxJSONWRITER_ESCAPE_SOLIDUS ) )
+            {
+                if ( ch == '/' )
+                {
                     shouldEscape = false;
                 }
             }
-            if ( shouldEscape && (m_style & wxJSONWRITER_MULTILINE_STRING))  {
-                if ( ch == '\n' || ch == '\t' )  {
+            if ( shouldEscape && ( m_style & wxJSONWRITER_MULTILINE_STRING ) )
+            {
+                if ( ch == '\n' || ch == '\t' )
+                {
                     shouldEscape = false;
                 }
             }
 
 
             // now write the character prepended by ESC if it should be escaped
-            if ( shouldEscape )  {
+            if ( shouldEscape )
+            {
                 os.PutC( '\\' );
                 os.PutC( escCh );
-                if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+                if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+                {
                     return -1;
                 }
             }
-            else {
+            else
+            {
                 //  a normal char or a UTF-8 units: write the character
                 os.PutC( ch );
-                if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+                if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+                {
                     return -1;
                 }
             }
@@ -797,29 +860,36 @@
 
         // check if SPLIT_STRING flag is set and if the string has to
         // be splitted
-        if ( (m_style & wxJSONWRITER_STYLED) && (m_style & wxJSONWRITER_SPLIT_STRING))   {
+        if ( ( m_style & wxJSONWRITER_STYLED ) && ( m_style & wxJSONWRITER_SPLIT_STRING ) )
+        {
             // split the string if the character written is LF
-            if ( ch == '\n' ) {
+            if ( ch == '\n' )
+            {
                 // close quotes and CR
                 os.Write( "\"\n", 2 );
                 lastChar = WriteIndent( os, m_level + 2 );     // write indentation
                 os.PutC( '\"' );               // reopen quotes
-                if ( lastChar < 0 )  {
+                if ( lastChar < 0 )
+                {
                     return lastChar;
                 }
             }
             // split the string only if there is at least wxJSONWRITER_MIN_LENGTH
             // character to write and the character written is a punctuation or space
             // BUG: the following does not work because the columns are not counted
-            else if ( (m_colNo >= wxJSONWRITER_SPLIT_COL)
-                     && (tempCol <= wxJSONWRITER_LAST_COL )) {
-                if ( IsSpace( ch ) || IsPunctuation( ch ))  {
-                    if ( len - i > wxJSONWRITER_MIN_LENGTH )  {
+            else if ( ( m_colNo >= wxJSONWRITER_SPLIT_COL )
+                      && ( tempCol <= wxJSONWRITER_LAST_COL ) )
+            {
+                if ( IsSpace( ch ) || IsPunctuation( ch ) )
+                {
+                    if ( len - i > wxJSONWRITER_MIN_LENGTH )
+                    {
                         // close quotes and CR
                         os.Write( "\"\n", 2 );
                         lastChar = WriteIndent( os, m_level + 2 );     // write indentation
                         os.PutC( '\"' );           // reopen quotes
-                        if ( lastChar < 0 )  {
+                        if ( lastChar < 0 )
+                        {
                             return lastChar;
                         }
                     }
@@ -843,8 +913,8 @@
 int
 wxJSONWriter::WriteString( wxOutputStream& os, const wxString& str )
 {
-    wxLogTrace( writerTraceMask, _T("(%s) string to write=%s"),
-                  __PRETTY_FUNCTION__, str.c_str() );
+    wxLogTrace( writerTraceMask, _T( "(%s) string to write=%s" ),
+                __PRETTY_FUNCTION__, str.c_str() );
     int lastChar = 0;
     char* writeBuff = 0;
 
@@ -852,12 +922,14 @@
     // on the 'm_noUtf8' flag
     wxCharBuffer utf8CB = str.ToUTF8();        // the UTF-8 buffer
 #if !defined( wxJSON_USE_UNICODE )
-    wxCharBuffer ansiCB( str.c_str());        // the ANSI buffer
+    wxCharBuffer ansiCB( str.c_str() );       // the ANSI buffer
 
-    if ( m_noUtf8 )    {
+    if ( m_noUtf8 )
+    {
         writeBuff = ansiCB.data();
     }
-    else    {
+    else
+    {
         writeBuff = utf8CB.data();
     }
 #else
@@ -866,20 +938,22 @@
 
     // NOTE: in ANSI builds UTF-8 conversion may fail (see samples/test5.cpp,
     // test 7.3) although I do not know why
-    if ( writeBuff == 0 )    {
+    if ( writeBuff == 0 )
+    {
         const char* err = "<wxJSONWriter::WriteComment(): error converting the string to UTF-8>";
-        os.Write( err, strlen( err ));
+        os.Write( err, strlen( err ) );
         return 0;
     }
     size_t len = strlen( writeBuff );
 
     os.Write( writeBuff, len );
-    if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+    if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+    {
         return -1;
     }
 
-    wxLogTrace( writerTraceMask, _T("(%s) result=%d"),
-                  __PRETTY_FUNCTION__, lastChar );
+    wxLogTrace( writerTraceMask, _T( "(%s) result=%d" ),
+                __PRETTY_FUNCTION__, lastChar );
     return lastChar;
 }
 
@@ -891,7 +965,8 @@
 wxJSONWriter::WriteNullValue( wxOutputStream& os )
 {
     os.Write( "null", 4 );
-    if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+    if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+    {
         return -1;
     }
     return 0;
@@ -916,30 +991,31 @@
     wxASSERT( data );
 
 #if defined( wxJSON_64BIT_INT )
-    #if wxCHECK_VERSION(2, 9, 0 ) || !defined( wxJSON_USE_UNICODE )
-        // this is fine for wxW 2.9 and for wxW 2.8 ANSI
-        snprintf( buffer, 32, "%" wxLongLongFmtSpec "d",
-        data->m_value.m_valInt64 );
-    #else
-        // this is for wxW 2.8 Unicode: in order to use the cross-platform
-        // format specifier, we use the wxString's sprintf() function and then
-        // convert to UTF-8 before writing to the stream
-        wxString s;
-        s.Printf( _T("%") wxLongLongFmtSpec _T("d"),
-                                                data->m_value.m_valInt64 );
-        wxCharBuffer cb = s.ToUTF8();
-        const char* cbData = cb.data();
-        len = strlen( cbData );
-        wxASSERT( len < 32 );
-        memcpy( buffer, cbData, len );
-        buffer[len] = 0;
-    #endif
+#if wxCHECK_VERSION(2, 9, 0 ) || !defined( wxJSON_USE_UNICODE )
+    // this is fine for wxW 2.9 and for wxW 2.8 ANSI
+    snprintf( buffer, 32, "%" wxLongLongFmtSpec "d",
+              data->m_value.m_valInt64 );
+#else
+    // this is for wxW 2.8 Unicode: in order to use the cross-platform
+    // format specifier, we use the wxString's sprintf() function and then
+    // convert to UTF-8 before writing to the stream
+    wxString s;
+    s.Printf( _T( "%" ) wxLongLongFmtSpec _T( "d" ),
+              data->m_value.m_valInt64 );
+    wxCharBuffer cb = s.ToUTF8();
+    const char* cbData = cb.data();
+    len = strlen( cbData );
+    wxASSERT( len < 32 );
+    memcpy( buffer, cbData, len );
+    buffer[len] = 0;
+#endif
 #else
     snprintf( buffer, 32, "%ld", data->m_value.m_valLong );
 #endif
     len = strlen( buffer );
     os.Write( buffer, len );
-    if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+    if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+    {
         r = -1;
     }
     return r;
@@ -957,11 +1033,13 @@
 int
 wxJSONWriter::WriteUIntValue( wxOutputStream& os, const wxJSONValue& value )
 {
-    int r = 0; size_t len;
+    int r = 0;
+    size_t len;
 
     // prepend a plus sign if the style specifies that unsigned integers
     // have to be recognized by the JSON reader
-    if ( m_style & wxJSONWRITER_RECOGNIZE_UNSIGNED )  {
+    if ( m_style & wxJSONWRITER_RECOGNIZE_UNSIGNED )
+    {
         os.PutC( '+' );
     }
 
@@ -970,30 +1048,31 @@
     wxASSERT( data );
 
 #if defined( wxJSON_64BIT_INT )
-    #if wxCHECK_VERSION(2, 9, 0 ) || !defined( wxJSON_USE_UNICODE )
-        // this is fine for wxW 2.9 and for wxW 2.8 ANSI
-        snprintf( buffer, 32, "%" wxLongLongFmtSpec "u",
-        data->m_value.m_valUInt64 );
-    #else
-        // this is for wxW 2.8 Unicode: in order to use the cross-platform
-        // format specifier, we use the wxString's sprintf() function and then
-        // convert to UTF-8 before writing to the stream
-        wxString s;
-        s.Printf( _T("%") wxLongLongFmtSpec _T("u"),
-                                                data->m_value.m_valInt64 );
-        wxCharBuffer cb = s.ToUTF8();
-        const char* cbData = cb.data();
-        len = strlen( cbData );
-        wxASSERT( len < 32 );
-        memcpy( buffer, cbData, len );
-        buffer[len] = 0;
-    #endif
+#if wxCHECK_VERSION(2, 9, 0 ) || !defined( wxJSON_USE_UNICODE )
+    // this is fine for wxW 2.9 and for wxW 2.8 ANSI
+    snprintf( buffer, 32, "%" wxLongLongFmtSpec "u",
+              data->m_value.m_valUInt64 );
+#else
+    // this is for wxW 2.8 Unicode: in order to use the cross-platform
+    // format specifier, we use the wxString's sprintf() function and then
+    // convert to UTF-8 before writing to the stream
+    wxString s;
+    s.Printf( _T( "%" ) wxLongLongFmtSpec _T( "u" ),
+              data->m_value.m_valInt64 );
+    wxCharBuffer cb = s.ToUTF8();
+    const char* cbData = cb.data();
+    len = strlen( cbData );
+    wxASSERT( len < 32 );
+    memcpy( buffer, cbData, len );
+    buffer[len] = 0;
+#endif
 #else
     snprintf( buffer, 32, "%lu", data->m_value.m_valULong );
 #endif
     len = strlen( buffer );
     os.Write( buffer, len );
-    if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+    if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+    {
         r = -1;
     }
     return r;
@@ -1022,7 +1101,8 @@
     snprintf( buffer, 32, m_fmt, data->m_value.m_valDouble );
     size_t len = strlen( buffer );
     os.Write( buffer, len );
-    if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+    if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+    {
         r = -1;
     }
     return r;
@@ -1039,19 +1119,22 @@
 wxJSONWriter::WriteBoolValue( wxOutputStream& os, const wxJSONValue& value )
 {
     int r = 0;
-    const char* f = "false"; const char* t = "true";
+    const char* f = "false";
+    const char* t = "true";
     wxJSONRefData* data = value.GetRefData();
     wxASSERT( data );
 
     const char* c = f;    // defaults to FALSE
 
-    if ( data->m_value.m_valBool )    {
+    if ( data->m_value.m_valBool )
+    {
         c = t;
     }
 
     size_t len = strlen( c );
     os.Write( c, len );
-    if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+    if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+    {
         r = -1;
     }
     return r;
@@ -1064,8 +1147,8 @@
 int
 wxJSONWriter::WriteKey( wxOutputStream& os, const wxString& key )
 {
-    wxLogTrace( writerTraceMask, _T("(%s) key write=%s"),
-                  __PRETTY_FUNCTION__, key.c_str() );
+    wxLogTrace( writerTraceMask, _T( "(%s) key write=%s" ),
+                __PRETTY_FUNCTION__, key.c_str() );
 
     int lastChar = WriteStringValue( os, key );
     os.Write( " : ", 3 );
@@ -1091,7 +1174,7 @@
 int
 wxJSONWriter::WriteInvalid( wxOutputStream& os )
 {
-    wxFAIL_MSG( _T("wxJSONWriter::WriteInvalid() cannot be called (not a valid JSON text"));
+    wxFAIL_MSG( _T( "wxJSONWriter::WriteInvalid() cannot be called (not a valid JSON text" ) );
     int lastChar = 0;
     os.Write( "<invalid JSON value>", 9 );
     return lastChar;
@@ -1124,19 +1207,21 @@
     // the string is splitted only for the special meory buffer type, not for array of INTs
     int bytesWritten = 0;
     bool splitString = false;
-    if ( (m_style & wxJSONWRITER_STYLED) && 
-               (m_style & wxJSONWRITER_SPLIT_STRING))   {
+    if ( ( m_style & wxJSONWRITER_STYLED ) &&
+            ( m_style & wxJSONWRITER_SPLIT_STRING ) )
+    {
         splitString = true;
     }
 
     size_t buffLen = buff.GetDataLen();
-    unsigned char* ptr = (unsigned char*) buff.GetData();
+    unsigned char* ptr = ( unsigned char* ) buff.GetData();
     wxASSERT( ptr );
     char openChar = '\'';
     char closeChar = '\'';
     bool asArray = false;
 
-    if ( (m_style & wxJSONWRITER_MEMORYBUFF ) == 0 )  {
+    if ( ( m_style & wxJSONWRITER_MEMORYBUFF ) == 0 )
+    {
         // if the special flag is not specified, write as an array of INTs
         openChar = '[';
         closeChar = ']';
@@ -1145,53 +1230,64 @@
     // write the open character
     os.PutC( openChar );
 
-    for ( size_t i = 0; i < buffLen; i++ )  {
+    for ( size_t i = 0; i < buffLen; i++ )
+    {
         unsigned char c = *ptr;
         ++ptr;
 
-        if ( asArray )  {
+        if ( asArray )
+        {
             snprintf( str, 14, "%d", c );
             size_t len = strlen( str );
             wxASSERT( len <= 3 );
             wxASSERT( len >= 1 );
             str[len] = ',';
             // do not write the comma char for the last element
-            if ( i < buffLen - 1 )    {
+            if ( i < buffLen - 1 )
+            {
                 ++len;
             }
             os.Write( str, len );
-            if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+            if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+            {
                 return -1;
             }
         }
-        else {
+        else
+        {
             // now convert the byte in two hex digits
             char c1 = c / 16;
             char c2 = c % 16;
             c1 += '0';
             c2 += '0';
-            if ( c1 > '9' )  {
+            if ( c1 > '9' )
+            {
                 c1 += 7;
             }
-            if ( c2 > '9' )  {
+            if ( c2 > '9' )
+            {
                 c2 += 7;
             }
             os.PutC( c1 );
             os.PutC( c2 );
-            if ( os.GetLastError() != wxSTREAM_NO_ERROR )    {
+            if ( os.GetLastError() != wxSTREAM_NO_ERROR )
+            {
                 return -1;
             }
-            if ( splitString )  {
+            if ( splitString )
+            {
                 ++bytesWritten;
             }
 
-            if (( bytesWritten >= MAX_BYTES_PER_ROW ) && ((buffLen - i ) >= 5 ))   {
+            if ( ( bytesWritten >= MAX_BYTES_PER_ROW ) && ( ( buffLen - i ) >= 5 ) )
+            {
                 // split the string if we wrote 20 bytes, but only is we have to
                 // write at least 5 bytes
                 os.Write( "\'\n", 2 );
                 int lastChar = WriteIndent( os, m_level + 2 );     // write indentation
                 os.PutC( '\'' );               // reopen quotes
-                if ( lastChar < 0 )  {
+                if ( lastChar < 0 )
+                {
                     return lastChar;
                 }
                 bytesWritten = 0;
@@ -1220,7 +1316,8 @@
 wxJSONWriter::WriteSeparator( wxOutputStream& os )
 {
     int lastChar = '\n';
-    if ( (m_style & wxJSONWRITER_STYLED) && !(m_style & wxJSONWRITER_NO_LINEFEEDS ))  {
+    if ( ( m_style & wxJSONWRITER_STYLED ) && !( m_style & wxJSONWRITER_NO_LINEFEEDS ) )
+    {
         os.PutC( '\n' );
     }
     return lastChar;
@@ -1231,16 +1328,17 @@
 wxJSONWriter::IsSpace( wxChar ch )
 {
     bool r = false;
-    switch ( ch ) {
-        case ' ' :
-        case '\t' :
-        case '\r' :
-        case '\f' :
-        case '\n' :
-            r = true;
-            break;
-        default :
-            break;
+    switch ( ch )
+    {
+    case ' ' :
+    case '\t' :
+    case '\r' :
+    case '\f' :
+    case '\n' :
+        r = true;
+        break;
+    default :
+        break;
     }
     return r;
 }
@@ -1250,17 +1348,18 @@
 wxJSONWriter::IsPunctuation( wxChar ch )
 {
     bool r = false;
-    switch ( ch ) {
-        case '.' :
-        case ',' :
-        case ';' :
-        case ':' :
-        case '!' :
-        case '?' :
-            r = true;
-            break;
-        default :
-            break;
+    switch ( ch )
+    {
+    case '.' :
+    case ',' :
+    case ';' :
+    case ':' :
+    case '!' :
+    case '?' :
+        r = true;
+        break;
+    default :
+        break;
     }
     return r;
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/jsonwriter.h opencpn-plugin-logbookkonni-1.2024/src/jsonwriter.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/jsonwriter.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/jsonwriter.h	2016-02-25 13:06:29.000000000 +0000
@@ -12,27 +12,28 @@
 #define _WX_JSONWRITER_H
 #ifndef __WXOSX__
 #ifdef __GNUG__
-    #pragma interface "jsonwriter.h"
+#pragma interface "jsonwriter.h"
 #endif
 #endif
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
+#pragma hdrstop
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
-    #include <wx/stream.h>
-    #include <wx/string.h>
+#include <wx/stream.h>
+#include <wx/string.h>
 #endif
 
 #include "json_defs.h"
 #include "jsonval.h"
 
-enum {
+enum
+{
     wxJSONWRITER_NONE            = 0,
     wxJSONWRITER_STYLED          = 1,
     wxJSONWRITER_WRITE_COMMENTS  = 2,
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Logbook.cpp opencpn-plugin-logbookkonni-1.2024/src/Logbook.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/Logbook.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Logbook.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -22,3331 +22,3509 @@
 #include <wx/msgdlg.h>
 #include <wx/textctrl.h>
 #include "wx/generic/gridctrl.h"
-#include <wx/dir.h> 
+#include <wx/dir.h>
 #include <wx/filefn.h>
-#include <wx/msgdlg.h> 
+#include <wx/msgdlg.h>
 #include <wx/textfile.h>
 #include <wx/tokenzr.h>
-#include <wx/wfstream.h> 
-#include <wx/txtstrm.h> 
+#include <wx/wfstream.h>
+#include <wx/txtstrm.h>
 
 #include <math.h>
 
-Logbook::Logbook(LogbookDialog* parent, wxString data, wxString layout, wxString layoutODT)
-	: LogbookHTML(this,parent,data,layout)
+Logbook::Logbook( LogbookDialog* parent, wxString data, wxString layout, wxString layoutODT )
+    : LogbookHTML( this,parent,data,layout )
 {
 #ifdef PBVE_DEBUG
-	pbvecount = 0;
+    pbvecount = 0;
 #endif
-	oldLogbook = false;
-	OCPN_Message = false;
-	noSentence = true;
-	modified = false;
-	wxString logLay;
-	lastWayPoint = _T("");
-	logbookDescription = wxEmptyString;
-	sLinesReminder = _("Your Logbook has %i lines\n\nYou should create a new logbook to minimize loadingtime.");
-
-	dialog = parent;
-	opt = dialog->logbookPlugIn->opt;
-
-	wxString logData = data; 
-	logData.Append(_T("logbook.txt"));
-	dialog->backupFile = _T("logbook");
-
-	wxFileName wxHomeFiledir = logData ;
-	if(!wxHomeFiledir.FileExists())
-	{
-		logbookFile = new wxTextFile(logData);	
-		logbookFile->Create();
-	}
-	else
-		logbookFile = new wxTextFile(logData);
-
-	data_locn = logData;
-	logbookData_actuell = logData;
-
-	if(dialog->m_radioBtnHTML->GetValue())
-		logLay = layout;
-	else
-		logLay = layoutODT;
-	setLayoutLocation(logLay);
-
-	//weatherCol = dialog->m_gridGlobal->GetNumberCols();
-	//sailsCol   = dialog->m_gridGlobal->GetNumberCols()+weatherCol-1;
-
-	noAppend = false;
-	gpsStatus = false;
-	waypointArrived = false;
-	WP_skipped = false;
-	bCOW = false;
-	dCOW = -1;
-	dCOG = -1;
-	courseChange = false;
-	everySM = false;
-	guardChange = false;
-	dLastMinute = -1;
-	oldPosition.latitude = 500;
-	activeRoute = wxEmptyString;
-	activeRouteGUID = wxEmptyString;
-	activeMOB = wxEmptyString;
-	MOBIsActive = false;
-	routeIsActive = false;
-	trackIsActive = false;
-	wimdaSentence = false;
-	bSOW = false;
-	bTemperatureWater = false;
-	bTemperatureAir = false;
-	bWindA = false;
-	bWindT = false;
-	bDepth = false;
-	dtEngine1Off = -1;
-	bRPM1 = false;
-	dtEngine2Off = -1;
-	bRPM2 = false;
-	dtGeneratorOff = -1;
-	bGEN = false;
-	sRPM1Shaft = wxEmptyString;
-	sRPM1Source = wxEmptyString;
-	sRPM2Shaft = wxEmptyString;
-	sRPM2Source = wxEmptyString;
-	rpmSentence = false;
-}
-
-Logbook::~Logbook(void)
-{
-	update();
-}
-
-void Logbook::setTrackToNewID(wxString target)
-{
-	if(mergeList.Count() == 0) return;
-
-	wxDir dir;
-	wxArrayString files;
-	dir.GetAllFiles(parent->data,&files,_T("until*.txt"),wxDIR_FILES);
-
-	for(unsigned int i = 0; i < files.Count(); i++)
-	{
-		wxFileInputStream file(files[i]);
-		wxTextInputStream txt(file);
-
-		wxString data = wxEmptyString;
-		while(!file.Eof())
-			data += txt.ReadLine() + _T("\n");
-
-		for(unsigned int n = 0; n < mergeList.GetCount(); n++)
-			data.Replace(mergeList.Item(n),target);
-
-		wxFileOutputStream fileo(files[i]);
-		wxTextOutputStream txto(fileo);
-		txto << data;
-		fileo.Close();
-	}
-}
-
-void Logbook::setLayoutLocation(wxString loc)
-{
-	bool radio = dialog->m_radioBtnHTML->GetValue();
-	loc.Append(_T("logbook"));
-	dialog->appendOSDirSlash(&loc);
-	layout_locn = loc;
-	setFileName(data_locn, layout_locn);
-	dialog->loadLayoutChoice(LogbookDialog::LOGBOOK,layout_locn,dialog->logbookChoice,opt->layoutPrefix[LogbookDialog::LOGBOOK]);
-	if(radio)
-		dialog->logbookChoice->SetSelection(dialog->logbookPlugIn->opt->navGridLayoutChoice);
-	else
-		dialog->logbookChoice->SetSelection(dialog->logbookPlugIn->opt->navGridLayoutChoiceODT);
-}
-
-void Logbook::SetPosition(PlugIn_Position_Fix &pfix)
-{
-	if(opt->traditional)
-		sLat = this->toSDMM(1,pfix.Lat, true);
-	else
-		sLat = this->toSDMMOpenCPN(1,pfix.Lat, true);
-
-	if(opt->traditional)
-		sLon = this->toSDMM(2, pfix.Lon, true);
-	else
-		sLon = this->toSDMMOpenCPN(2, pfix.Lon, true);
-
-	if(pfix.nSats != 0)
-	{
-		sSOG = wxString::Format(_T("%5.2f %s"), pfix.Sog, opt->speed.c_str());
-		sCOG = wxString::Format(_T("%5.2f %s"), pfix.Cog, opt->Deg.c_str());
-		SetGPSStatus(true);
-	}
-	else
-		SetGPSStatus(false);
+    oldLogbook = false;
+    OCPN_Message = false;
+    noSentence = true;
+    modified = false;
+    wxString logLay;
+    lastWayPoint = _T( "" );
+    logbookDescription = wxEmptyString;
+    sLinesReminder = _( "Your Logbook has %i lines\n\nYou should create a new logbook to minimize loadingtime." );
+
+    dialog = parent;
+    opt = dialog->logbookPlugIn->opt;
+
+    wxString logData = data;
+    logData.Append( _T( "logbook.txt" ) );
+    dialog->backupFile = _T( "logbook" );
+
+    wxFileName wxHomeFiledir = logData ;
+    if ( !wxHomeFiledir.FileExists() )
+    {
+        logbookFile = new wxTextFile( logData );
+        logbookFile->Create();
+    }
+    else
+        logbookFile = new wxTextFile( logData );
+
+    data_locn = logData;
+    logbookData_actual = logData;
+
+    if ( dialog->m_radioBtnHTML->GetValue() )
+        logLay = layout;
+    else
+        logLay = layoutODT;
+    setLayoutLocation( logLay );
+
+    //weatherCol = dialog->m_gridGlobal->GetNumberCols();
+    //sailsCol   = dialog->m_gridGlobal->GetNumberCols()+weatherCol-1;
+
+    noAppend = false;
+    gpsStatus = false;
+    waypointArrived = false;
+    WP_skipped = false;
+    bCOW = false;
+    dCOW = -1;
+    dCOG = -1;
+    courseChange = false;
+    everySM = false;
+    guardChange = false;
+    dLastMinute = -1;
+    oldPosition.latitude = 500;
+    activeRoute = wxEmptyString;
+    activeRouteGUID = wxEmptyString;
+    activeMOB = wxEmptyString;
+    MOBIsActive = false;
+    routeIsActive = false;
+    trackIsActive = false;
+    wimdaSentence = false;
+    bSOW = false;
+    bTemperatureWater = false;
+    bTemperatureAir = false;
+    bWindA = false;
+    bWindT = false;
+    bDepth = false;
+    dtEngine1Off = -1;
+    bRPM1 = false;
+    dtEngine2Off = -1;
+    bRPM2 = false;
+    dtGeneratorOff = -1;
+    bGEN = false;
+    sRPM1Shaft = wxEmptyString;
+    sRPM1Source = wxEmptyString;
+    sRPM2Shaft = wxEmptyString;
+    sRPM2Source = wxEmptyString;
+    rpmSentence = false;
+}
+
+Logbook::~Logbook( void )
+{
+    update();
+}
+
+void Logbook::setTrackToNewID( wxString target )
+{
+    if ( mergeList.Count() == 0 ) return;
+
+    wxDir dir;
+    wxArrayString files;
+    dir.GetAllFiles( parent->data,&files,_T( "until*.txt" ),wxDIR_FILES );
+
+    for ( unsigned int i = 0; i < files.Count(); i++ )
+    {
+        wxFileInputStream file( files[i] );
+        wxTextInputStream txt( file );
+
+        wxString data = wxEmptyString;
+        while ( !file.Eof() )
+            data += txt.ReadLine() + _T( "\n" );
+
+        for ( unsigned int n = 0; n < mergeList.GetCount(); n++ )
+            data.Replace( mergeList.Item( n ),target );
+
+        wxFileOutputStream fileo( files[i] );
+        wxTextOutputStream txto( fileo );
+        txto << data;
+        fileo.Close();
+    }
+}
+
+void Logbook::setLayoutLocation( wxString loc )
+{
+    bool radio = dialog->m_radioBtnHTML->GetValue();
+    loc.Append( _T( "logbook" ) );
+    dialog->appendOSDirSlash( &loc );
+    layout_locn = loc;
+    setFileName( data_locn, layout_locn );
+    dialog->loadLayoutChoice( LogbookDialog::LOGBOOK,layout_locn,dialog->logbookChoice,opt->layoutPrefix[LogbookDialog::LOGBOOK] );
+    if ( radio )
+        dialog->logbookChoice->SetSelection( dialog->logbookPlugIn->opt->navGridLayoutChoice );
+    else
+        dialog->logbookChoice->SetSelection( dialog->logbookPlugIn->opt->navGridLayoutChoiceODT );
+}
+
+void Logbook::SetPosition( PlugIn_Position_Fix &pfix )
+{
+    if ( opt->traditional )
+        sLat = this->toSDMM( 1,pfix.Lat, true );
+    else
+        sLat = this->toSDMMOpenCPN( 1,pfix.Lat, true );
+
+    if ( opt->traditional )
+        sLon = this->toSDMM( 2, pfix.Lon, true );
+    else
+        sLon = this->toSDMMOpenCPN( 2, pfix.Lon, true );
+
+    if ( pfix.nSats != 0 )
+    {
+        sSOG = wxString::Format( _T( "%5.2f %s" ), pfix.Sog, opt->speed.c_str() );
+        sCOG = wxString::Format( _T( "%5.2f %s" ), pfix.Cog, opt->Deg.c_str() );
+        SetGPSStatus( true );
+    }
+    else
+        SetGPSStatus( false );
 
-	mUTCDateTime.Set(pfix.FixTime);
-	//	dialog->GPSTimer->Start(5000);
+    mUTCDateTime.Set( pfix.FixTime );
+    //	dialog->GPSTimer->Start(5000);
 }
 void Logbook::clearNMEAData()
 {
-	noSentence = true;
+    noSentence = true;
 }
 
-void Logbook::SetSentence(wxString &sentence)
+void Logbook::SetSentence( wxString &sentence )
 {
-	wxDateTime dt;
+    wxDateTime dt;
     wxString    onOff[2];
-    onOff[0] = _(" off");
-    onOff[1] = _(" on");
+    onOff[0] = _( " off" );
+    onOff[1] = _( " on" );
 
     m_NMEA0183 << sentence;
 
 #ifdef PBVE_DEBUG
-	if(sentence.Contains(_T("$PBVE")))
-	{
-		if(pvbe != NULL && pbvecount < 15)
-		{
-			pvbe->m_textCtrlPVBE->AppendText(sentence);
-			pvbe->SetFocus();
-			pbvecount++;
-		}
-	}
+    if ( sentence.Contains( _T( "$PBVE" ) ) )
+    {
+        if ( pvbe != NULL && pbvecount < 15 )
+        {
+            pvbe->m_textCtrlPVBE->AppendText( sentence );
+            pvbe->SetFocus();
+            pbvecount++;
+        }
+    }
 #endif
 
-	if(m_NMEA0183.PreParse())
-	{
-		noSentence = false;
-		if(m_NMEA0183.LastSentenceIDReceived == _T("GGA"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				if(m_NMEA0183.Gga.GPSQuality > 0)
-				{
-					SetGPSStatus(true);
-					setPositionString(m_NMEA0183.Gga.Position.Latitude.Latitude,
-						m_NMEA0183.Gga.Position.Latitude.Northing,
-						m_NMEA0183.Gga.Position.Longitude.Longitude,
-						m_NMEA0183.Gga.Position.Longitude.Easting);
-
-				}
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("GLL"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				SetGPSStatus(true);
-				setPositionString(m_NMEA0183.Gll.Position.Latitude.Latitude,
-					m_NMEA0183.Gll.Position.Latitude.Northing,
-					m_NMEA0183.Gll.Position.Longitude.Longitude,
-					m_NMEA0183.Gll.Position.Longitude.Easting);
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("ZDA"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				dt = dt.Set(m_NMEA0183.Zda.Day,(wxDateTime::Month)(m_NMEA0183.Zda.Month-1),m_NMEA0183.Zda.Year);
-				// dt.ParseTime((const char)dt.ParseFormat(m_NMEA0183.Zda.UTCTime,_T("%H%M%S")));
-				dt.ParseFormat(m_NMEA0183.Zda.UTCTime,_T("%H%M%S"));
-				setDateTimeString(dt);
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("HDT"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				if(opt->showHeading == 0)
-					sCOW = wxString::Format(_T("%5.2f%s"), m_NMEA0183.Hdt.DegreesTrue,opt->Deg.c_str());
-				dCOW = m_NMEA0183.Hdt.DegreesTrue;
-				bCOW = true;
-				dtCOW = wxDateTime::Now();
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("HDM"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				if(opt->showHeading == 1)
-					sCOW = wxString::Format(_T("%5.2f%s"), m_NMEA0183.Hdm.DegreesMagnetic,opt->Deg.c_str());
-				dCOW = m_NMEA0183.Hdm.DegreesMagnetic;
-				bCOW = true;
-				dtCOW = wxDateTime::Now();
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("HDG"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				if(opt->showHeading == 0)
-				{
-					dCOW = m_NMEA0183.Hdg.MagneticVariationDirection == East ?  m_NMEA0183.Hdg.MagneticSensorHeadingDegrees + m_NMEA0183.Hdg.MagneticVariationDegrees : m_NMEA0183.Hdg.MagneticSensorHeadingDegrees - m_NMEA0183.Hdg.MagneticVariationDegrees;
-					sCOW = wxString::Format(_T("%5.2f%s"), dCOW, opt->Deg.c_str());
-				}
-				else
-				{
-					sCOW = wxString::Format(_T("%5.2f%s"), m_NMEA0183.Hdg.MagneticSensorHeadingDegrees, opt->Deg.c_str());
-					dCOW = m_NMEA0183.Hdg.MagneticSensorHeadingDegrees;
-				}
-				bCOW = true;
-				dtCOW = wxDateTime::Now();
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("RMB"))
-		{
-			if(opt->waypointArrived)
-			{
-				if(m_NMEA0183.Parse())
-				{
-					if(m_NMEA0183.Rmb.IsArrivalCircleEntered == NTrue)
-					{
-						if(m_NMEA0183.Rmb.From != lastWayPoint)
-						{
-							checkWayPoint(m_NMEA0183.Rmb);
-						}
-					}
-				}
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("RMC"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				SetGPSStatus(true);
-				setPositionString(m_NMEA0183.Rmc.Position.Latitude.Latitude,
-					m_NMEA0183.Rmc.Position.Latitude.Northing,
-					m_NMEA0183.Rmc.Position.Longitude.Longitude,
-					m_NMEA0183.Rmc.Position.Longitude.Easting);
-
-
-				if(m_NMEA0183.Rmc.SpeedOverGroundKnots != 999.0)
-					sSOG = wxString::Format(_T("%5.2f %s"), m_NMEA0183.Rmc.SpeedOverGroundKnots,opt->speed.c_str());
-				if(m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue != 999.0)
-					sCOG = wxString::Format(_T("%5.2f%s"), m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue, opt->Deg.c_str());
-				if(m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue != 999.0)
-					dCOG = m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue;
-
-				long day,month,year;
-				m_NMEA0183.Rmc.Date.SubString(0,1).ToLong(&day);
-				m_NMEA0183.Rmc.Date.SubString(2,3).ToLong(&month);
-				m_NMEA0183.Rmc.Date.SubString(4,5).ToLong(&year);
-				dt.Set(((int)day),(wxDateTime::Month)(month-1),((int)year+2000));
-				//dt.ParseTime((const char)dt.ParseFormat(m_NMEA0183.Rmc.UTCTime,_T("%H%M%S")));
-				dt.ParseFormat(m_NMEA0183.Rmc.UTCTime,_T("%H%M%S"));
-
-				setDateTimeString(dt);
-
-				if(!dialog->logbookPlugIn->eventsEnabled && opt->courseChange)
-					checkCourseChanged();
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("VHW"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				sSOW = wxString::Format(_T("%5.2f %s"), m_NMEA0183.Vhw.Knots,opt->speed.c_str());
-				dtSOW = wxDateTime::Now();
-				bSOW = true;
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("MWV"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				double dWind = 0;
-
-				wxString temp = _T("");
-				if(m_NMEA0183.Mwv.WindSpeedUnits == 'N')
-					temp = opt->windkts;
-				else if(m_NMEA0183.Mwv.WindSpeedUnits == 'M')
-					temp = opt->windmeter;
-				else if(m_NMEA0183.Mwv.WindSpeedUnits == 'K')
-					temp = opt->windkmh;
-
-				if(m_NMEA0183.Mwv.Reference == _T("T"))
-				{
-					if(opt->showWindHeading && bCOW)
-					{
-						dWind = m_NMEA0183.Mwv.WindAngle + dCOW;
-						if(dWind > 360) { dWind -= 360; }
-					}
-					else
-						dWind = m_NMEA0183.Mwv.WindAngle;
-
-					sWindT = wxString::Format(_T("%3.0f%s"), dWind,opt->Deg.c_str());
-					sWindSpeedT = wxString::Format(_T("%5.2f %s"), m_NMEA0183.Mwv.WindSpeed,temp.c_str());
-					dtWindT = wxDateTime::Now();
-					bWindT = true;
-				}
-				else
-				{
-					dWind = m_NMEA0183.Mwv.WindAngle;
-					sWindA = wxString::Format(_T("%3.0f%s"), dWind,opt->Deg.c_str());
-					sWindSpeedA = wxString::Format(_T("%5.2f %s"), m_NMEA0183.Mwv.WindSpeed,temp.c_str());
-					dtWindA = wxDateTime::Now();
-					bWindA = true;
-				}
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("VWT"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				double dWind = 0;
-				dWind = m_NMEA0183.Vwt.WindDirectionMagnitude;
-
-				if(m_NMEA0183.Vwt.DirectionOfWind == Left)
-				{
-					dWind = 360 - dWind;
-				}
-
-				if(opt->showWindHeading && bCOW)
-				{
-					dWind = dWind + dCOW;
-					if(dWind > 360) { dWind -= 360; }
-				}
-
-				sWindT = wxString::Format(_T("%3.0f%s"), dWind,opt->Deg.c_str());
-
-				wxString temp = _T("");
-				temp = opt->windkts;
-
-				sWindSpeedT = wxString::Format(_T("%5.2f %s"), m_NMEA0183.Vwt.WindSpeedKnots,temp.c_str());
-				dtWindT = wxDateTime::Now();
-				bWindT = true;
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("VWR"))
-		{
-			if(m_NMEA0183.Parse())
-			{
-				double dWind = 0;
-				dWind = m_NMEA0183.Vwr.WindDirectionMagnitude;
-
-				if(m_NMEA0183.Vwr.DirectionOfWind == Left)
-				{
-					dWind = 360 - dWind;
-				}
-
-				sWindA = wxString::Format(_T("%3.0f%s"), dWind,opt->Deg.c_str());
-
-				wxString temp = _T("");
-				temp = opt->windkts;
-
-
-				sWindSpeedA = wxString::Format(_T("%5.2f %s"), m_NMEA0183.Vwr.WindSpeedKnots,temp.c_str());
-				dtWindA = wxDateTime::Now();
-				bWindA = true;
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("MTW"))
-		{	
-			if(m_NMEA0183.Parse())
-			{
-				double t;
-				if(opt->temperature == _T("F"))
-					t = (( m_NMEA0183.Mtw.Temperature * 9 ) / 5 ) + 32;
-				else
-					t = m_NMEA0183.Mtw.Temperature;
-				sTemperatureWater = wxString::Format(_T("%4.1f %s %s"),t,opt->Deg.c_str(),opt->temperature.c_str());
-				dtTemperatureWater = wxDateTime::Now();
-				bTemperatureWater = true;
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("DBT"))
-		{			
-			m_NMEA0183.Parse();
-			dtDepth = wxDateTime::Now();
-			bDepth = true;
-			if(m_NMEA0183.Dbt.ErrorMessage.Contains(_T("Invalid")) ||
-				(m_NMEA0183.Dbt.DepthMeters == m_NMEA0183.Dbt.DepthFathoms))
-			{
-				sDepth = _T("-----");
-			}
-			else
-			{
-				switch(opt->showDepth)
-				{
-				case 0:
-					sDepth = wxString::Format(_T("%5.1f %s"), 
-						m_NMEA0183.Dbt.DepthMeters, opt->meter.c_str());
-					break;
-				case 1:
-					sDepth = wxString::Format(_T("%5.1f %s"), 
-						m_NMEA0183.Dbt.DepthFeet, opt->feet.c_str());
-					break;
-				case 2:
-					sDepth = wxString::Format(_T("%5.1f %s"), 
-						m_NMEA0183.Dbt.DepthFathoms, opt->fathom.c_str());
-					break;
-				}
-			}
-		}
-		else if(m_NMEA0183.LastSentenceIDReceived == _T("DPT"))
-		{			
-			m_NMEA0183.Parse();
-			dtDepth = wxDateTime::Now();
-			bDepth = true;
-			if(m_NMEA0183.Dpt.ErrorMessage.Contains(_T("Invalid")))
-			{
-				sDepth = _T("-----");
-			}
-			else
-			{
-				switch(opt->showDepth)
-				{
-				case 0:
-					sDepth = wxString::Format(_T("%5.1f %s"), 
-						m_NMEA0183.Dpt.DepthMeters, opt->meter.c_str());
-					break;
-				case 1:
-					sDepth = wxString::Format(_T("%5.1f %s"), 
-						m_NMEA0183.Dpt.DepthMeters / 0.3048, opt->feet.c_str());
-					break;
-				case 2:
-					sDepth = wxString::Format(_T("%5.1f %s"), 
-						m_NMEA0183.Dpt.DepthMeters / 1.8288, opt->fathom.c_str());
-					break;
-				}
-			}
-		}
-
-
-	}
-
-	/*  Propietary NMEA sentences								*/
-	/*											*/
-	/*  use function appendRow to add the values to the grid 				*/
-	/*  For motorhours and/or fuel recalculate the grid with				*/
-	/*	changeCellValue(lastRow, 0,0)							*/
-	/*	In function checkGPS(bool appendClick) set the strings to emtpy string when GPS */
-	/*  is off.										*/
-
-	wxStringTokenizer tkz(sentence,_T(","));
-	wxString sentenceInd = tkz.GetNextToken();
-
-	if(sentenceInd == _T("$WIMDA") && opt->NMEAUseWIMDA)
-	{
-		wimdaSentence = true;
-		dtWimda = wxDateTime::Now();
-
-		double t;
-		double p;
-
-		tkz.GetNextToken();
-		tkz.GetNextToken();
-		tkz.GetNextToken().ToDouble(&p);
+    if ( m_NMEA0183.PreParse() )
+    {
+        noSentence = false;
+        if ( m_NMEA0183.LastSentenceIDReceived == _T( "GGA" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                if ( m_NMEA0183.Gga.GPSQuality > 0 )
+                {
+                    SetGPSStatus( true );
+                    setPositionString( m_NMEA0183.Gga.Position.Latitude.Latitude,
+                                       m_NMEA0183.Gga.Position.Latitude.Northing,
+                                       m_NMEA0183.Gga.Position.Longitude.Longitude,
+                                       m_NMEA0183.Gga.Position.Longitude.Easting );
+
+                }
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "GLL" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                SetGPSStatus( true );
+                setPositionString( m_NMEA0183.Gll.Position.Latitude.Latitude,
+                                   m_NMEA0183.Gll.Position.Latitude.Northing,
+                                   m_NMEA0183.Gll.Position.Longitude.Longitude,
+                                   m_NMEA0183.Gll.Position.Longitude.Easting );
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "ZDA" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                dt = dt.Set( m_NMEA0183.Zda.Day,( wxDateTime::Month )( m_NMEA0183.Zda.Month-1 ),m_NMEA0183.Zda.Year );
+                // dt.ParseTime((const char)dt.ParseFormat(m_NMEA0183.Zda.UTCTime,_T("%H%M%S")));
+                dt.ParseFormat( m_NMEA0183.Zda.UTCTime,_T( "%H%M%S" ) );
+                setDateTimeString( dt );
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "HDT" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                if ( opt->showHeading == 0 )
+                    sCOW = wxString::Format( _T( "%5.2f%s" ), m_NMEA0183.Hdt.DegreesTrue,opt->Deg.c_str() );
+                dCOW = m_NMEA0183.Hdt.DegreesTrue;
+                bCOW = true;
+                dtCOW = wxDateTime::Now();
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "HDM" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                if ( opt->showHeading == 1 )
+                    sCOW = wxString::Format( _T( "%5.2f%s" ), m_NMEA0183.Hdm.DegreesMagnetic,opt->Deg.c_str() );
+                dCOW = m_NMEA0183.Hdm.DegreesMagnetic;
+                bCOW = true;
+                dtCOW = wxDateTime::Now();
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "HDG" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                if ( opt->showHeading == 0 )
+                {
+                    dCOW = m_NMEA0183.Hdg.MagneticVariationDirection == East ?  m_NMEA0183.Hdg.MagneticSensorHeadingDegrees + m_NMEA0183.Hdg.MagneticVariationDegrees : m_NMEA0183.Hdg.MagneticSensorHeadingDegrees - m_NMEA0183.Hdg.MagneticVariationDegrees;
+                    sCOW = wxString::Format( _T( "%5.2f%s" ), dCOW, opt->Deg.c_str() );
+                }
+                else
+                {
+                    sCOW = wxString::Format( _T( "%5.2f%s" ), m_NMEA0183.Hdg.MagneticSensorHeadingDegrees, opt->Deg.c_str() );
+                    dCOW = m_NMEA0183.Hdg.MagneticSensorHeadingDegrees;
+                }
+                bCOW = true;
+                dtCOW = wxDateTime::Now();
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "RMB" ) )
+        {
+            if ( opt->waypointArrived )
+            {
+                if ( m_NMEA0183.Parse() )
+                {
+                    if ( m_NMEA0183.Rmb.IsArrivalCircleEntered == NTrue )
+                    {
+                        if ( m_NMEA0183.Rmb.From != lastWayPoint )
+                        {
+                            checkWayPoint( m_NMEA0183.Rmb );
+                        }
+                    }
+                }
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "RMC" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                SetGPSStatus( true );
+                setPositionString( m_NMEA0183.Rmc.Position.Latitude.Latitude,
+                                   m_NMEA0183.Rmc.Position.Latitude.Northing,
+                                   m_NMEA0183.Rmc.Position.Longitude.Longitude,
+                                   m_NMEA0183.Rmc.Position.Longitude.Easting );
+
+
+                if ( m_NMEA0183.Rmc.SpeedOverGroundKnots != 999.0 )
+                    sSOG = wxString::Format( _T( "%5.2f %s" ), m_NMEA0183.Rmc.SpeedOverGroundKnots,opt->speed.c_str() );
+                if ( m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue != 999.0 )
+                    sCOG = wxString::Format( _T( "%5.2f%s" ), m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue, opt->Deg.c_str() );
+                if ( m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue != 999.0 )
+                    dCOG = m_NMEA0183.Rmc.TrackMadeGoodDegreesTrue;
+
+                long day,month,year;
+                m_NMEA0183.Rmc.Date.SubString( 0,1 ).ToLong( &day );
+                m_NMEA0183.Rmc.Date.SubString( 2,3 ).ToLong( &month );
+                m_NMEA0183.Rmc.Date.SubString( 4,5 ).ToLong( &year );
+                dt.Set( ( ( int )day ),( wxDateTime::Month )( month-1 ),( ( int )year+2000 ) );
+                //dt.ParseTime((const char)dt.ParseFormat(m_NMEA0183.Rmc.UTCTime,_T("%H%M%S")));
+                dt.ParseFormat( m_NMEA0183.Rmc.UTCTime,_T( "%H%M%S" ) );
+
+                setDateTimeString( dt );
+
+                if ( !dialog->logbookPlugIn->eventsEnabled && opt->courseChange )
+                    checkCourseChanged();
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "VHW" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                sSOW = wxString::Format( _T( "%5.2f %s" ), m_NMEA0183.Vhw.Knots,opt->speed.c_str() );
+                dtSOW = wxDateTime::Now();
+                bSOW = true;
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "MWV" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                double dWind = 0;
+
+                wxString temp = _T( "" );
+                if ( m_NMEA0183.Mwv.WindSpeedUnits == 'N' )
+                    temp = opt->windkts;
+                else if ( m_NMEA0183.Mwv.WindSpeedUnits == 'M' )
+                    temp = opt->windmeter;
+                else if ( m_NMEA0183.Mwv.WindSpeedUnits == 'K' )
+                    temp = opt->windkmh;
+
+                if ( m_NMEA0183.Mwv.Reference == _T( "T" ) )
+                {
+                    if ( opt->showWindHeading && bCOW )
+                    {
+                        dWind = m_NMEA0183.Mwv.WindAngle + dCOW;
+                        if ( dWind > 360 )
+                        {
+                            dWind -= 360;
+                        }
+                    }
+                    else
+                        dWind = m_NMEA0183.Mwv.WindAngle;
+
+                    sWindT = wxString::Format( _T( "%3.0f%s" ), dWind,opt->Deg.c_str() );
+                    sWindSpeedT = wxString::Format( _T( "%3.1f %s" ), m_NMEA0183.Mwv.WindSpeed,temp.c_str() );
+                    dtWindT = wxDateTime::Now();
+                    bWindT = true;
+                    if ( minwindT > m_NMEA0183.Mwv.WindSpeed )
+                        minwindT = m_NMEA0183.Mwv.WindSpeed;
+                    if ( maxwindT < m_NMEA0183.Mwv.WindSpeed )
+                        maxwindT = m_NMEA0183.Mwv.WindSpeed;
+                    avgwindT = ( avgwindT + m_NMEA0183.Mwv.WindSpeed )/2;
+                    swindspeedsT = wxString::Format( _T( "%03.1f|%03.1f|%03.1f" ), minwindT, avgwindT, maxwindT );
+                }
+                else
+                {
+                    dWind = m_NMEA0183.Mwv.WindAngle;
+                    sWindA = wxString::Format( _T( "%3.0f%s" ), dWind,opt->Deg.c_str() );
+                    sWindSpeedA = wxString::Format( _T( "%3.1f %s" ), m_NMEA0183.Mwv.WindSpeed,temp.c_str() );
+                    dtWindA = wxDateTime::Now();
+                    bWindA = true;
+                    if ( minwindA > m_NMEA0183.Mwv.WindSpeed )
+                        minwindA = m_NMEA0183.Mwv.WindSpeed;
+                    if ( maxwindA < m_NMEA0183.Mwv.WindSpeed )
+                        maxwindA = m_NMEA0183.Mwv.WindSpeed;
+                    avgwindA = ( avgwindA + m_NMEA0183.Mwv.WindSpeed )/2;
+                    swindspeedsA = wxString::Format( _T( "%03.1f|%03.1f|%03.1f" ), minwindA, avgwindA, maxwindA );
+                }
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "VWT" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                double dWind = 0;
+                dWind = m_NMEA0183.Vwt.WindDirectionMagnitude;
+
+                if ( m_NMEA0183.Vwt.DirectionOfWind == Left )
+                {
+                    dWind = 360 - dWind;
+                }
+
+                if ( opt->showWindHeading && bCOW )
+                {
+                    dWind = dWind + dCOW;
+                    if ( dWind > 360 )
+                    {
+                        dWind -= 360;
+                    }
+                }
+
+                sWindT = wxString::Format( _T( "%3.0f%s" ), dWind,opt->Deg.c_str() );
+
+                wxString temp = _T( "" );
+                temp = opt->windkts;
+
+                sWindSpeedT = wxString::Format( _T( "%3.1f %s" ), m_NMEA0183.Vwt.WindSpeedKnots,temp.c_str() );
+                dtWindT = wxDateTime::Now();
+                bWindT = true;
+                if ( minwindT > m_NMEA0183.Vwt.WindSpeedKnots )
+                    minwindT = m_NMEA0183.Vwt.WindSpeedKnots;
+                if ( maxwindT < m_NMEA0183.Vwt.WindSpeedKnots )
+                    maxwindT = m_NMEA0183.Vwt.WindSpeedKnots;
+                avgwindT = ( avgwindT + m_NMEA0183.Vwt.WindSpeedKnots )/2;
+                swindspeedsT = wxString::Format( _T( "%03.1f|%03.1f|%03.1f" ), minwindT, avgwindT, maxwindT );
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "VWR" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                double dWind = 0;
+                dWind = m_NMEA0183.Vwr.WindDirectionMagnitude;
+
+                if ( m_NMEA0183.Vwr.DirectionOfWind == Left )
+                {
+                    dWind = 360 - dWind;
+                }
+
+                sWindA = wxString::Format( _T( "%3.0f%s" ), dWind,opt->Deg.c_str() );
+
+                wxString temp = _T( "" );
+                temp = opt->windkts;
+
+
+                sWindSpeedA = wxString::Format( _T( "%3.1f %s" ), m_NMEA0183.Vwr.WindSpeedKnots,temp.c_str() );
+                dtWindA = wxDateTime::Now();
+                bWindA = true;
+                if ( minwindA > m_NMEA0183.Vwr.WindSpeedKnots )
+                    minwindA = m_NMEA0183.Vwr.WindSpeedKnots;
+                if ( maxwindA < m_NMEA0183.Vwr.WindSpeedKnots )
+                    maxwindA = m_NMEA0183.Vwr.WindSpeedKnots;
+                avgwindA = ( avgwindA + m_NMEA0183.Vwr.WindSpeedKnots )/2;
+                swindspeedsA = wxString::Format( _T( "%03.1f|%03.1f|%03.1f" ), minwindA, avgwindA, maxwindA );
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "MTW" ) )
+        {
+            if ( m_NMEA0183.Parse() )
+            {
+                double t;
+                if ( opt->temperature == _T( "F" ) )
+                    t = ( ( m_NMEA0183.Mtw.Temperature * 9 ) / 5 ) + 32;
+                else
+                    t = m_NMEA0183.Mtw.Temperature;
+                sTemperatureWater = wxString::Format( _T( "%4.1f %s %s" ),t,opt->Deg.c_str(),opt->temperature.c_str() );
+                dtTemperatureWater = wxDateTime::Now();
+                bTemperatureWater = true;
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "DBT" ) )
+        {
+            m_NMEA0183.Parse();
+            dtDepth = wxDateTime::Now();
+            bDepth = true;
+            if ( m_NMEA0183.Dbt.ErrorMessage.Contains( _T( "Invalid" ) ) ||
+                    ( m_NMEA0183.Dbt.DepthMeters == m_NMEA0183.Dbt.DepthFathoms ) )
+            {
+                sDepth = _T( "-----" );
+            }
+            else
+            {
+                switch ( opt->showDepth )
+                {
+                case 0:
+                    sDepth = wxString::Format( _T( "%5.1f %s" ),
+                                               m_NMEA0183.Dbt.DepthMeters, opt->meter.c_str() );
+                    break;
+                case 1:
+                    sDepth = wxString::Format( _T( "%5.1f %s" ),
+                                               m_NMEA0183.Dbt.DepthFeet, opt->feet.c_str() );
+                    break;
+                case 2:
+                    sDepth = wxString::Format( _T( "%5.1f %s" ),
+                                               m_NMEA0183.Dbt.DepthFathoms, opt->fathom.c_str() );
+                    break;
+                }
+            }
+        }
+        else if ( m_NMEA0183.LastSentenceIDReceived == _T( "DPT" ) )
+        {
+            m_NMEA0183.Parse();
+            dtDepth = wxDateTime::Now();
+            bDepth = true;
+            if ( m_NMEA0183.Dpt.ErrorMessage.Contains( _T( "Invalid" ) ) )
+            {
+                sDepth = _T( "-----" );
+            }
+            else
+            {
+                switch ( opt->showDepth )
+                {
+                case 0:
+                    sDepth = wxString::Format( _T( "%5.1f %s" ),
+                                               m_NMEA0183.Dpt.DepthMeters, opt->meter.c_str() );
+                    break;
+                case 1:
+                    sDepth = wxString::Format( _T( "%5.1f %s" ),
+                                               m_NMEA0183.Dpt.DepthMeters / 0.3048, opt->feet.c_str() );
+                    break;
+                case 2:
+                    sDepth = wxString::Format( _T( "%5.1f %s" ),
+                                               m_NMEA0183.Dpt.DepthMeters / 1.8288, opt->fathom.c_str() );
+                    break;
+                }
+            }
+        }
+
+
+    }
+
+    /*  Propietary NMEA sentences								*/
+    /*											*/
+    /*  use function appendRow to add the values to the grid 				*/
+    /*  For motorhours and/or fuel recalculate the grid with				*/
+    /*	changeCellValue(lastRow, 0,0)							*/
+    /*	In function checkGPS(bool appendClick) set the strings to emtpy string when GPS */
+    /*  is off.										*/
+
+    wxStringTokenizer tkz( sentence,_T( "," ) );
+    wxString sentenceInd = tkz.GetNextToken();
+
+    if ( sentenceInd == _T( "$WIMDA" ) && opt->NMEAUseWIMDA )
+    {
+        wimdaSentence = true;
+        dtWimda = wxDateTime::Now();
+
+        double t;
+        double p;
+        double h;
+
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken().ToDouble( &p );
         p = p * 1000;
-		sPressure = wxString::Format(_T("%4.1f %s"),p,opt->baro.c_str());
-		tkz.GetNextToken();
+        sPressure = wxString::Format( _T( "%4.1f %s" ),p,opt->baro.c_str() );
+        tkz.GetNextToken();
+
+        tkz.GetNextToken().ToDouble( &t );
+        if ( opt->temperature == _T( "F" ) )
+            t = ( ( t * 9 ) / 5 ) + 32;
+        sTemperatureAir = wxString::Format( _T( "%2.2f%s %s" ),t,opt->Deg.c_str(),opt->temperature.c_str() );
+
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken().ToDouble( &h );
+        if ( h > 0 )
+            sHumidity = wxString::Format( _T( "%3.1f %" ),h );
+        else
+            sHumidity = wxEmptyString;
+    }
+    else if ( opt->bRPMIsChecked && sentenceInd.Right( 3 ) == _T( "RPM" ) )
+    {
+        rpmSentence = true;
+        if ( opt->bRPMCheck )
+            parent->logbookPlugIn->optionsDialog->setRPMSentence( sentence );
+        long Umin1 = 0, Umin2 = 0;
+
+        dtRPM = wxDateTime::Now();
+
+        wxString source = tkz.GetNextToken();
+        wxString engineNr = tkz.GetNextToken();
+        wxString speed = tkz.GetNextToken();
+        wxString pitch = tkz.GetNextToken();
+
+        if ( engineNr == opt->engine1Id && opt->bEng1RPMIsChecked )
+        {
+            speed.ToLong( &Umin1 );
+            if ( source == _T( "E" ) )
+                sRPM1 = speed;
+            sRPM1Source = source;
 
-		tkz.GetNextToken().ToDouble(&t);
-		if(opt->temperature == _T("F"))
-			t = (( t * 9 ) / 5 ) + 32;
-		sTemperatureAir = wxString::Format(_T("%2.2f%s %s"),t,opt->Deg.c_str(),opt->temperature.c_str());
-
-		tkz.GetNextToken();
-		tkz.GetNextToken();
-		tkz.GetNextToken();
-		sHumidity = tkz.GetNextToken();
-	}
-	else if(opt->bRPMIsChecked && sentenceInd.Right(3) == _T("RPM"))
-	{
-		rpmSentence = true;
-		if(opt->bRPMCheck)
-			parent->logbookPlugIn->optionsDialog->setRPMSentence(sentence);
-		long Umin1 = 0, Umin2 = 0;
-
-		dtRPM = wxDateTime::Now();
-
-		wxString source = tkz.GetNextToken();
-		wxString engineNr = tkz.GetNextToken();
-		wxString speed = tkz.GetNextToken();
-		wxString pitch = tkz.GetNextToken();
-
-		if(engineNr == opt->engine1Id && opt->bEng1RPMIsChecked)
-		{
-			speed.ToLong(&Umin1);
-			if(source == _T("E"))
-				sRPM1 = speed;
-			sRPM1Source = source;
-
-			if(Umin1 != 0L)
-			{
-				if(source == _T("E"))
-				{
-					if(!opt->engine1Running)
-					{
-						if(opt->engineMessageSails && opt->engineAllwaysSailsDown)
-							dialog->resetSails();
-                        dialog->startEngine1(false, false, true);
-                        dialog->m_toggleBtnEngine1->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[1]);
+            if ( Umin1 != 0L )
+            {
+                if ( source == _T( "E" ) )
+                {
+                    if ( !opt->engine1Running )
+                    {
+                        if ( opt->engineMessageSails && opt->engineAllwaysSailsDown )
+                            dialog->resetSails();
+                        dialog->startEngine1( false, false, true );
+                        dialog->m_toggleBtnEngine1->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[1] );
                     }
-				}
-				if(source == _T("S"))
-				{
-				    bRPM1 = true;
-				    sRPM1Shaft = speed;
-				}
-			}
-			else
-			{
-				if(opt->engine1Running)
-				{
-				    if(opt->engineMessageSails)
-					dialog->stateSails();
-                    dialog->stopEngine1(false, true);
-                    dialog->m_toggleBtnEngine1->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[0]);
-                }
-			}
-		}
-        
-		if(engineNr == opt->engine2Id && opt->bEng2RPMIsChecked)
-		{
-			speed.ToLong(&Umin2);
-			if(source == _T("E"))
-				sRPM2 = speed;
-
-			if(Umin2 != 0L)
-			{
-				if(source == _T("E"))
-				{
-					if(!opt->engine2Running)
-					{
-						if(opt->engineMessageSails && opt->engineAllwaysSailsDown)
-							dialog->resetSails();
-                        dialog->startEngine2(false, false, true);
-                        dialog->m_toggleBtnEngine2->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[1]);
+                }
+                if ( source == _T( "S" ) )
+                {
+                    bRPM1 = true;
+                    sRPM1Shaft = speed;
+                }
+            }
+            else
+            {
+                if ( opt->engine1Running )
+                {
+                    if ( opt->engineMessageSails )
+                        dialog->stateSails();
+                    dialog->stopEngine1( false, true );
+                    dialog->m_toggleBtnEngine1->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[0] );
+                }
+            }
+        }
+
+        if ( engineNr == opt->engine2Id && opt->bEng2RPMIsChecked )
+        {
+            speed.ToLong( &Umin2 );
+            if ( source == _T( "E" ) )
+                sRPM2 = speed;
+
+            if ( Umin2 != 0L )
+            {
+                if ( source == _T( "E" ) )
+                {
+                    if ( !opt->engine2Running )
+                    {
+                        if ( opt->engineMessageSails && opt->engineAllwaysSailsDown )
+                            dialog->resetSails();
+                        dialog->startEngine2( false, false, true );
+                        dialog->m_toggleBtnEngine2->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[1] );
                     }
-				}
-				if(source == _T("S"))
-				{
-				    bRPM2 = true;
-				    sRPM2Shaft = speed;
-				}
-			}
-			else
-			{
-                if(opt->engine2Running)
+                }
+                if ( source == _T( "S" ) )
+                {
+                    bRPM2 = true;
+                    sRPM2Shaft = speed;
+                }
+            }
+            else
+            {
+                if ( opt->engine2Running )
                 {
-                    dialog->stopEngine2(false, true, true);
-                    dialog->m_toggleBtnEngine2->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[0]);
+                    dialog->stopEngine2( false, true, true );
+                    dialog->m_toggleBtnEngine2->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[0] );
                 }
             }
-		}
+        }
 
-        if(engineNr == opt->generatorId && opt->bGenRPMIsChecked)
+        if ( engineNr == opt->generatorId && opt->bGenRPMIsChecked )
         {
-            speed.ToLong(&Umin2);
-            
-            if(Umin2 != 0L)
+            speed.ToLong( &Umin2 );
+
+            if ( Umin2 != 0L )
             {
-                if(source == _T("E"))
+                if ( source == _T( "E" ) )
                 {
-                    if(!opt->generatorRunning)
+                    if ( !opt->generatorRunning )
                     {
-                        dialog->startGenerator(false, false, true);
-                        dialog->m_toggleBtnGenerator->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[1]);
+                        dialog->startGenerator( false, false, true );
+                        dialog->m_toggleBtnGenerator->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[1] );
                     }
                 }
             }
             else
             {
-                if(opt->generatorRunning)
+                if ( opt->generatorRunning )
                 {
-                    dialog->stopGenerator(false, true, true);
-                    dialog->m_toggleBtnGenerator->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[0]);
+                    dialog->stopGenerator( false, true, true );
+                    dialog->m_toggleBtnGenerator->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[0] );
                 }
             }
         }
 
-	}
+    }
+
+}
+
+void Logbook::setDateTimeString( wxDateTime dt )
+{
+    mUTCDateTime = dt;
+
+    if ( opt->gpsAuto )
+    {
+        if ( newPosition.NSflag == 'E' )
+            opt->tzIndicator = 0;
+        else
+            opt->tzIndicator = 1;
+
+        opt->tzHour = ( int ) newPosition.longitude / 15;
+    }
+
+    wxTimeSpan span( opt->tzHour, 0, 0, 0 );
+    if ( opt->tzIndicator == 0 )
+        mCorrectedDateTime = mUTCDateTime + span;
+    else
+        mCorrectedDateTime = mUTCDateTime - span;
+
+    if ( opt->UTC )
+        mCorrectedDateTime = mUTCDateTime;
+
+    sDate = mCorrectedDateTime.Format( opt->sdateformat );
+    sTime = mCorrectedDateTime.Format( opt->stimeformat );
+}
+
+void Logbook::setPositionString( double dLat, int iNorth, double dLon, int iEast )
+{
+    double lat, lon;
+    float llt = dLat;
+    int lat_deg_int = ( int )( llt / 100 );
+    float lat_deg = lat_deg_int;
+    float lat_min = llt - ( lat_deg * 100 );
+    lat = lat_deg + ( lat_min/60. );
+    if ( iNorth == South )
+        lat = -lat;
+    if ( opt->traditional )
+        sLat = this->toSDMM( 1,lat, true );
+    else
+        sLat = this->toSDMMOpenCPN( 1,lat, true );
+
+    float lln = dLon;
+    int lon_deg_int = ( int )( lln / 100 );
+    float lon_deg = lon_deg_int;
+    float lon_min = lln - ( lon_deg * 100 );
+    lon = lon_deg + ( lon_min/60. );
+    if ( iEast == West )
+        lon = -lon;
+    if ( opt->traditional )
+        sLon = this->toSDMM( 2,lon, false );
+    else
+        sLon = this->toSDMMOpenCPN( 2,lon, true );
+
+    SetGPSStatus( true );
+    //	dialog->GPSTimer->Start(5000);
+
+    if ( opt->everySM )
+        checkDistance();
+}
+
+void Logbook::newLogbook()
+{
+    bool zero = false;
+
+    if ( data_locn != this->logbookData_actual )
+        this->switchToActualLogbook();
+
+    int i = wxMessageBox( _( "Are you sure ?" ),_( "New Logbook" ),wxYES_NO );
+    if ( i == wxNO )
+    {
+        dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus();
+        return;
+    }
+
+    i = wxMessageBox( _( "Reset all Values to zero ?" ),_T( "" ),wxYES_NO );
+    if ( i == wxYES )
+        zero = true;
+
+    if ( dialog->m_gridGlobal->GetNumberRows() <= 0 )
+    {
+        wxMessageBox( _( "Your Logbook has no lines ?" ),_( "New Logbook" ),wxOK );
+        return;
+    }
+
+    update();
+
+    wxFileName fn = data_locn;
+    wxString temp = fn.GetPath();
+    dialog->appendOSDirSlash( &temp );
+    wxString sn;
+    wxString ss = wxDateTime::Now().FormatISOTime();
+    ss.Replace( _T( ":" ),_T( "_" ) );
+    ss = wxString::Format( _T( "until_%s_%s_logbook.txt" ),wxDateTime::Now().FormatISODate().c_str(),ss.c_str() );
+    sn = temp+ss;
+
+    wxCopyFile( data_locn,sn );
+
+    wxArrayString s;
+    for ( int i = 0; i < dialog->numPages; i++ )
+    {
+        for ( int n = 0; n < dialog->logGrids[i]->GetNumberCols(); n++ )
+        {
+            s.Add( dialog->logGrids[i]->GetCellValue( dialog->logGrids[i]->GetNumberRows()-1,n ) );
+        }
+    }
+
+    logbookFile->Open();
+    logbookFile->Clear();
+    logbookFile->Write();
+    logbookFile->Close();
+
+    clearAllGrids();
+
+    int offset = 0;
+    dialog->selGridRow = 0;
+    for ( int i = 0; i < dialog->numPages; i++ )
+    {
+        if ( zero ) break;
+        dialog->logGrids[i]->AppendRows();
+        if ( i > 0 ) offset += dialog->logGrids[i-1]->GetNumberCols();
+
+        for ( int n = 0; n < dialog->logGrids[i]->GetNumberCols(); n++ )
+        {
+            dialog->logGrids[i]->SetCellValue( 0,n,s[n+offset] );
+        }
+    }
+    if ( !zero )
+    {
+        dialog->logGrids[0]->SetCellValue( 0,13,_( "Last line from Logbook\n" )+ss );
+        dialog->logGrids[0]->SetCellValue( 0,6,dialog->logGrids[0]->GetCellValue( 0,6 ) );
+        wxString t = _T( "0.00 " )+opt->distance;
+        dialog->logGrids[0]->SetCellValue( 0,5,t );
+    }
+    else
+    {
+        appendRow( true, false );
+        dialog->logGrids[0]->SetCellValue( 0,13,_( "Last Logbook is\n" )+ss );
+    }
+
+    update();
 
+    dialog->setEqualRowHeight( 0 );
+    setCellAlign( 0 );
+    dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus();
 }
 
-void Logbook::setDateTimeString(wxDateTime dt)
+void Logbook::selectLogbook()
 {
-	mUTCDateTime = dt;
+    wxString path = dialog->Home_Locn;
+
+    update();
+    SelectLogbook selLogbook( dialog,path );
+
+    if ( selLogbook.ShowModal() == wxID_CANCEL )
+    {
+        dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus();
+        return;
+    }
+
+    if ( selLogbook.selRow == -1 )
+    {
+        dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus();
+        return;
+    }
 
-	if(opt->gpsAuto)
-	{
-		if(newPosition.NSflag == 'E')
-			opt->tzIndicator = 0;
-		else
-			opt->tzIndicator = 1;
+    wxString s = selLogbook.files[selLogbook.selRow];
 
-		opt->tzHour = (int) newPosition.longitude / 15;
-	}
+    for ( int i = 0; i < LOGGRIDS; i++ )
+        if ( dialog->logGrids[i]->GetNumberRows() != 0 )
+            dialog->logGrids[i]->DeleteRows( 0,dialog->logGrids[i]->GetNumberRows() );
 
-	wxTimeSpan span(opt->tzHour, 0, 0, 0);
-	if(opt->tzIndicator == 0)
-		mCorrectedDateTime = mUTCDateTime + span;
-	else
-		mCorrectedDateTime = mUTCDateTime - span;
+    loadSelectedData( s );
+}
 
-	if(opt->UTC)
-		mCorrectedDateTime = mUTCDateTime;
+void Logbook::loadSelectedData( wxString path )
+{
+    data_locn = path;
+    logbookFile = new wxTextFile( path );
+    setFileName( path,layout_locn );
+    wxFileName fn( path );
+    path = fn.GetName();
+    dialog->backupFile = path;
+    if ( path == _T( "logbook" ) )
+    {
+        path = _( "Active Logbook" );
+        oldLogbook = false;
+    }
+    else
+    {
+        wxDateTime dt = dialog->getDateTo( path );
+        path = wxString::Format( _( "Old Logbook until %s" ),dt.FormatDate().c_str() );
+        oldLogbook = true;
+    }
+    title = path;
+    dialog->SetTitle( title );
 
-	sDate = mCorrectedDateTime.Format(opt->sdateformat);
-	sTime = mCorrectedDateTime.Format(opt->stimeformat);
+    loadData();
+}
+void Logbook::clearAllGrids()
+{
+    if ( dialog->m_gridGlobal->GetNumberRows() > 0 )
+    {
+        dialog->m_gridGlobal->DeleteRows( 0,dialog->m_gridGlobal->GetNumberRows(),false );
+        dialog->m_gridWeather->DeleteRows( 0,dialog->m_gridWeather->GetNumberRows(),false );
+        dialog->m_gridMotorSails->DeleteRows( 0,dialog->m_gridMotorSails->GetNumberRows(),false );
+    }
 }
 
-void Logbook::setPositionString(double dLat, int iNorth, double dLon, int iEast)
+void Logbook::loadData()
 {
-	double lat, lon;
-	float llt = dLat;
-	int lat_deg_int = (int)(llt / 100);
-	float lat_deg = lat_deg_int;
-	float lat_min = llt - (lat_deg * 100);
-	lat = lat_deg + (lat_min/60.);
-	if(iNorth == South)
-		lat = -lat;
-	if(opt->traditional)
-		sLat = this->toSDMM(1,lat, true);
-	else
-		sLat = this->toSDMMOpenCPN(1,lat, true);
+    wxString s = _T( "" ),t;
+    wxString nullhstr = _T( "00:00" );
+    double nullval = 0.0;
+    wxString dateFormat;
+
+    dialog->selGridCol = dialog->selGridRow = 0;
+    if ( title.IsEmpty() )
+        title = _( "Active Logbook" );
+
+    clearAllGrids();
+
+    int row = 0;
+
+    /** make a backup of 0.910 */
+    wxString sep = wxFileName::GetPathSeparator();
+    wxString source = dialog->Home_Locn;
+    wxString dest   = dialog->Home_Locn + _T( "910_Backup" );
+
+    wxFileInputStream input1( data_locn );
+    wxTextInputStream* stream1 = new wxTextInputStream ( input1 );
+
+    t = stream1->ReadLine();
+    if ( t.IsEmpty() ) return; // first install only
+    if ( t.Contains( _T( "#1.2#" ) ) )
+    {
+        dateFormat = t;
+        t = stream1->ReadLine();
+    }
+    else
+    {
+        wxArrayString files;
+
+        wxDir dir;
+        wxString path = dialog->data;
+        wxString dest = path+_T( "Backup_1_1" );
+        wxDir destDir( dest );
+
+        if ( !wxDir::Exists( dest ) )
+            ::wxMkdir( dest );
+
+        wxMessageBox( wxString::Format( _( "Start converting to new Date/Time-Format\nand backup all datafiles from version 1.1 to\n\n%s" ),dest.c_str() ) );
+
+        dir.GetAllFiles( path,&files,_T( "*.txt" ),wxDIR_FILES );
+        dest += wxFileName::GetPathSeparator();
+
+        for ( unsigned int i = 0; i < files.Count(); i++ )
+        {
+            wxFileName fn( files[i] );
+            ::wxCopyFile( path+fn.GetFullName(),dest+fn.GetFullName() );
+        }
+
+        convertTo_1_2();
+    }
+    wxStringTokenizer tkz( t, _T( "\t" ),wxTOKEN_RET_EMPTY );
+
+    if ( tkz.CountTokens() == 33 && !wxDir::Exists( dest ) )
+    {
+        ::wxMkdir( dest );
+        wxArrayString files;
+        wxDir dir;
+        dir.GetAllFiles( source.RemoveLast(),&files,_T( "*.txt" ),wxDIR_FILES );
+        for ( unsigned int i = 0; i < files.Count(); i++ )
+        {
+            wxFileName fn( files[i] );
+            ::wxCopyFile( files[i],dest+sep+fn.GetFullName(),true );
+        }
+    }
+
+    /***************************/
+
+    wxFileInputStream input( data_locn );
+    wxTextInputStream* stream = new wxTextInputStream ( input, _T( "\n" ),wxConvUTF8 );
+
+    wxString firstrow = stream->ReadLine(); // for #1.2#
+    wxStringTokenizer first( firstrow, _T( "\t" ),wxTOKEN_RET_EMPTY );
+    first.GetNextToken();
+    logbookDescription = first.GetNextToken();
+
+    wxDateTime dt;
+    int month = 0,day = 0,year = 0,hour = 0,min = 0,sec = 0;
+    dialog->m_gridGlobal->BeginBatch();
+    dialog->m_gridWeather->BeginBatch();
+    dialog->m_gridMotorSails->BeginBatch();
+    int lines = 0;
+    while ( !( t = stream->ReadLine() ).IsEmpty() )
+    {
+        if ( input.Eof() ) break;
+        lines++;
+        dialog->m_gridGlobal->AppendRows();
+        dialog->m_gridWeather->AppendRows();
+        dialog->m_gridMotorSails->AppendRows();
+
+        setCellAlign( row );
+
+        wxStringTokenizer tkz( t, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        int c = 0;
+        int fields =  tkz.CountTokens();
+
+        while ( tkz.HasMoreTokens() )
+        {
+            s = dialog->restoreDangerChar( tkz.GetNextToken() );
+            s.RemoveLast();
+
+            switch ( c )
+            {
+            case 0:
+                dialog->m_gridGlobal->SetCellValue( row,ROUTE,s );
+                break;
+            case 1:
+                month = wxAtoi( s );
+                break;
+            case 2:
+                day = wxAtoi( s );
+                break;
+            case 3:
+                year = wxAtoi( s );
+                if ( month >= 0 && day != 0 && year != 0 )
+                {
+                    dt.Set( day,( wxDateTime::Month )month,year );
+                    dialog->m_gridGlobal->SetCellValue( row,RDATE,dt.Format( opt->sdateformat ) );
+                }
+                break;
+            case 4:
+                if ( s.IsEmpty() )
+                    hour = -1;
+                else
+                    hour = wxAtoi( s );
+                break;
+            case 5:
+                if ( s.IsEmpty() )
+                    min = -1;
+                else
+                    min = wxAtoi( s );
+                break;
+            case 6:
+                if ( hour == -1 || min == -1 ) continue;
+                sec = wxAtoi( s );
+                dt.Set( hour,min,sec );
+                dialog->m_gridGlobal->SetCellValue( row,RTIME,dt.Format( opt->stimeformat ) );
+                break;
+            case 7:
+                dialog->m_gridGlobal->SetCellValue( row,STATUS,s );
+                break;
+            case 8:
+                dialog->m_gridGlobal->SetCellValue( row,WAKE,s );
+                break;
+            case 9:
+                dialog->m_gridGlobal->SetCellValue( row,DISTANCE,s );
+                break;
+            case 10:
+                dialog->m_gridGlobal->SetCellValue( row,DTOTAL,s );
+                dialog->m_gridGlobal->SetReadOnly( row,DTOTAL );
+                break;
+            case 11:
+                dialog->m_gridGlobal->SetCellValue( row,POSITION,s );
+                break;
+            case 12:
+                dialog->m_gridGlobal->SetCellValue( row,COG,s );
+                break;
+            case 13:
+                dialog->m_gridGlobal->SetCellValue( row,COW,s );
+                break;
+            case 14:
+                dialog->m_gridGlobal->SetCellValue( row,SOG,s );
+                break;
+            case 15:
+                dialog->m_gridGlobal->SetCellValue( row,SOW,s );
+                break;
+            case 16:
+                dialog->m_gridGlobal->SetCellValue( row,DEPTH,s );
+                break;
+            case 17:
+                dialog->m_gridGlobal->SetCellValue( row,REMARKS,s );
+                break;
+            case 18:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::BARO,s );
+                break;
+            case 19:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::WIND,s );
+                break;
+            case 20:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::WSPD,s );
+                break;
+            case 21:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::CURRENT,s );
+                break;
+            case 22:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::CSPD,s );
+                break;
+            case 23:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::WAVE,s );
+                break;
+            case 24:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::SWELL,s );
+                break;
+            case 25:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::WEATHER,s );
+                break;
+            case 26:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::CLOUDS,s );
+                break;
+            case 27:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::VISIBILITY,s );
+                break;
+            case 28:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::MOTOR,s );
+                break;
+            case 29:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::MOTORT,s );
+                break;
+            case 30:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::FUEL,s );
+                break;
+            case 31:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::FUELT,s );
+                break;
+            case 32:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::SAILS,s );
+                break;
+            case 33:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::REEF,s );
+                break;
+            case 34:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATER,s );
+                break;
+            case 35:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERT,s );
+                break;
+
+            case 36:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::MREMARKS,s );
+                break;
+            case 37:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::HYDRO,s );
+                break;
+            case 38:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::AIRTE,s );
+                break;
+            case 39:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::WATERTE,s );
+                break;
+            case 40:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::MOTOR1,s );
+                break;
+            case 41:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::MOTOR1T,s );
+                break;
+            case 42:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::GENE,s );
+                break;
+            case 43:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::GENET,s );
+                break;
+            case 44:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK1,s );
+                break;
+            case 45:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK1T,s );
+                break;
+            case 46:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK2,s );
+                break;
+            case 47:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK2T,s );
+                break;
+            case 48:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERM,s );
+                break;
+            case 49:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERMT,s );
+                break;
+            case 50:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERMO,s );
+                break;
+            case 51:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::ROUTEID,s );
+                break;
+            case 52:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::TRACKID,s );
+                break;
+            case 53:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::RPM1,s );
+                break;
+            case 54:
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::RPM2,s );
+                break;
+            case 55:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::WINDR,s );
+                break;
+            case 56:
+                dialog->m_gridWeather->SetCellValue( row,LogbookHTML::WSPDR,s );
+                //    int in =  0;
+                break;
+            }
+            c++;
+        }
+        wxString temp = dialog->m_gridGlobal->GetCellValue( row,DISTANCE );
+        temp.Replace( _T( "," ),_T( "." ) );
+        double dist = wxAtof( temp );
+        if ( ( dialog->m_gridGlobal->GetCellValue( row,STATUS ) == wxEmptyString ||
+                dialog->m_gridGlobal->GetCellValue( row,STATUS ).GetChar( 0 ) == ' ' ) && dist > 0 )
+            dialog->m_gridGlobal->SetCellValue( row,STATUS,_T( "S" ) );
+
+        if ( fields < 50 ) // data from 0.910 ? need zero-values to calculate the columns
+        {
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::MOTOR1, wxString::Format( _T( "%s %s" ),nullhstr.c_str(),opt->motorh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::MOTOR1T,wxString::Format( _T( "%s %s" ),nullhstr.c_str(),opt->motorh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::GENE,   wxString::Format( _T( "%s %s" ),nullhstr.c_str(),opt->motorh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::GENET,  wxString::Format( _T( "%s %s" ),nullhstr.c_str(),opt->motorh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK1,  wxString::Format( _T( "%2.2f %s" ),nullval,opt->ampereh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK1T, wxString::Format( _T( "%2.2f %s" ),nullval,opt->ampereh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK2,  wxString::Format( _T( "%2.2f %s" ),nullval,opt->ampereh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::BANK2T, wxString::Format( _T( "%2.2f %s" ),nullval,opt->ampereh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERM, wxString::Format( _T( "%s %s" ),nullhstr.c_str(),opt->motorh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERMT,wxString::Format( _T( "%s %s" ),nullhstr.c_str(),opt->motorh.c_str() ) );
+            dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERMO,wxString::Format( _T( "%2.2f %s" ),nullval,opt->vol.c_str() ) );
+        }
+
+        dialog->setEqualRowHeight( row );
+        row++;
+    }
+
+    dialog->selGridRow = 0;
+    dialog->selGridCol = 0;
+
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        dialog->logGrids[i]->Refresh();
+        row = dialog->logGrids[i]->GetNumberRows()-1;
+        dialog->logGrids[i]->MakeCellVisible( row,0 );
+        dialog->logGrids[i]->SetGridCursor( 0,0 );
+    }
+
+    dialog->m_gridGlobal->EndBatch();
+    dialog->m_gridWeather->EndBatch();
+    dialog->m_gridMotorSails->EndBatch();
+
+    if ( !oldLogbook && lines >= 500 )
+    {
+        wxString str = wxString::Format( sLinesReminder,lines );
+        LinesReminderDlg *dlg = new LinesReminderDlg( str,dialog );
+        dlg->Show();
+    }
+}
+
+wxString Logbook::makeDateFromFile( wxString date, wxString dateformat )
+{
+    wxStringTokenizer tkzd( date,_T( "/" ) );
+    wxDateTime dt;
+    wxDateTime::wxDateTime_t month = ( wxDateTime::wxDateTime_t ) wxAtoi( tkzd.GetNextToken() );
+    wxDateTime::wxDateTime_t day    = ( wxDateTime::wxDateTime_t ) wxAtoi( tkzd.GetNextToken() );
+    wxDateTime::wxDateTime_t year   = ( wxDateTime::wxDateTime_t ) wxAtoi( tkzd.GetNextToken() );
+    dt.Set( day, month, year );
+
+    return dt.Format( dateformat );
+}
+
+wxString Logbook::makeWatchtimeFromFile( wxString time, wxString timeformat )
+{
+    wxStringTokenizer tkzt( time,_T( "," ) );
+    wxDateTime dts,dte;
+    wxDateTime::wxDateTime_t hours = ( wxDateTime::wxDateTime_t ) wxAtoi( tkzt.GetNextToken() );
+    wxDateTime::wxDateTime_t mins  = ( wxDateTime::wxDateTime_t ) wxAtoi( tkzt.GetNextToken() );
+    wxDateTime::wxDateTime_t houre = ( wxDateTime::wxDateTime_t ) wxAtoi( tkzt.GetNextToken() );
+    wxDateTime::wxDateTime_t mine  = ( wxDateTime::wxDateTime_t ) wxAtoi( tkzt.GetNextToken() );
+    dts.Set( hours,mins );
+    dte.Set( houre,mine );
+
+    return dts.Format( timeformat )+_T( "-" )+dte.Format( timeformat );
+}
+
+void Logbook::convertTo_1_2()
+{
+    wxString path = dialog->data;
+    wxArrayString files;
+    wxDir dir;
+    int dtformat = opt->dateformat;
+    int timeFormat = opt->timeformat;
+    wxDateTime dt = wxDateTime::Now();
+    bool b = true;
+
+    wxString datePattern = LogbookDialog::datePattern;
+    opt->dateformat = 0;
+    opt->timeformat = 1;
+
+    opt->setDateFormat();
+    opt->setTimeFormat( 1 );
+
+    update();
+
+    dir.GetAllFiles( path,&files,_T( "*logbook*.txt" ),wxDIR_FILES );
+
+    for ( unsigned int i = 0; i < files.Count(); i++ )
+    {
+        wxFileName fn( files[i] );
+        wxFileInputStream stream( path + fn.GetFullName() );
+        wxTextInputStream* in = new wxTextInputStream ( stream,_T( "\n" ),wxConvUTF8 );
+        wxFileOutputStream stream1( path + fn.GetFullName() + _T( "_" ) );
+        wxTextOutputStream* out = new wxTextOutputStream ( stream1,wxEOL_NATIVE,wxConvUTF8 );
+
+        int l = 0;
+
+        while ( true )
+        {
+            wxString s = in->ReadLine();
+            if ( stream.Eof() || s.IsEmpty() ) break;
+
+            wxStringTokenizer tkz( s,_T( "\t" ) );
+            tkz.GetNextToken();
+            wxString d = tkz.GetNextToken();
+            b  = LogbookDialog::myParseDate( d,dt );
+            s.Replace( d,wxString::Format( _T( "%i \t%i \t%i " ),dt.GetMonth(),dt.GetDay(),dt.GetYear() ) );
+            wxString t = tkz.GetNextToken();
+            LogbookDialog::myParseTime( t,dt );
+            s.Replace( t,wxString::Format( _T( "%i \t%i \t%i " ),dt.GetHour(),dt.GetMinute(),dt.GetSecond() ) );
+
+            if ( l == 0 ) *out << _T( "#1.2#\n" );
+            l++;
+            *out << s+_T( "\n" );
+        }
+        stream1.Close();
+        if ( b )
+        {
+            ::wxCopyFile( path + fn.GetFullName() + _T( "_" ), path + fn.GetFullName() );
+            ::wxRemoveFile( path + fn.GetFullName() + _T( "_" ) );
+        }
+    }
+
+    wxString m = _T( "service.txt" );
+    wxFileInputStream streams( path + m );
+    wxTextInputStream* in = new wxTextInputStream ( streams,_T( "\n" ),wxConvUTF8 );
+    wxFileOutputStream stream2( path + m + _T( "_" ) );
+    wxTextOutputStream* out = new wxTextOutputStream ( stream2,wxEOL_NATIVE,wxConvUTF8 );
+
+    int l = 0;
+    while ( true )
+    {
+        int i = 0;
+        wxString tmp;
+        wxString s = in->ReadLine();
+        if ( streams.Eof() || s.IsEmpty() ) break;
+
+        wxStringTokenizer tkz( s,_T( "\t" ) );
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        wxString d = tkz.GetNextToken();
+        d.RemoveLast();
+        for ( i = 0; i < dialog->maintenance->m_choicesCount; i++ )
+        {
+            if ( d == dialog->maintenance->m_choices[i] )
+                break;
+        }
+
+        if ( i == 8 )
+        {
+            tmp = tkz.GetNextToken();
+            tmp.RemoveLast();
+            LogbookDialog::myParseDate( tmp,dt );
+            s.Replace( tmp,wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(),dt.GetDay(),dt.GetYear() ) );
+            tmp = tkz.GetNextToken();
+            LogbookDialog::myParseDate( tmp,dt );
+            s.Replace( tmp,wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(),dt.GetDay(),dt.GetYear() ) );
+        }
+        else if ( i > 8 )
+        {
+            tmp = tkz.GetNextToken();
+            tmp = tkz.GetNextToken();
+            tmp = tkz.GetNextToken();
+            tmp.RemoveLast();
+            if ( !tmp.IsEmpty() )
+            {
+                LogbookDialog::myParseDate( tmp,dt );
+                s.Replace( tmp,wxString::Format( _T( "%i\t%i\t%i" ),dt.GetMonth(),dt.GetDay(),dt.GetYear() ) );
+            }
+        }
+        if ( l == 0 ) *out << _T( "#1.2#\n" );
+        l++;
+        *out << s+_T( "\n" );
+    }
+    stream2.Close();
+    if ( b )
+    {
+        ::wxCopyFile( path + m + _T( "_" ), path + m );
+        ::wxRemoveFile( path + m + _T( "_" ) );
+    }
+
+    m = _T( "crewlist.txt" );
+    wxFileInputStream streamc( path + m );
+    in = new wxTextInputStream ( streamc,_T( "\n" ),wxConvUTF8 );
+    wxFileOutputStream stream3( path + m + _T( "_" ) );
+    out = new wxTextOutputStream ( stream3,wxEOL_NATIVE,wxConvUTF8 );
+
+    l = 0;
+    while ( true )
+    {
+        wxString tmp;
+        wxString s = in->ReadLine();
+        if ( streamc.Eof() || s.IsEmpty() ) break;
+
+        wxStringTokenizer tkz( s,_T( "\t" ) );
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        wxString d = tkz.GetNextToken();
+        if ( !d.IsEmpty() && d.GetChar( 0 ) != ' ' )
+        {
+            d.RemoveLast();
+            tmp = d;
+            LogbookDialog::myParseDate( d,dt );
+            s.Replace( tmp,wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(),dt.GetDay(),dt.GetYear() ) );
+        }
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        tkz.GetNextToken();
+        d = tkz.GetNextToken();
+        if ( !d.IsEmpty() && d.GetChar( 0 ) != ' ' )
+        {
+            d.RemoveLast();
+            tmp = d;
+            LogbookDialog::myParseDate( d,dt );
+            s.Replace( tmp,wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(),dt.GetDay(),dt.GetYear() ) );
+        }
+        if ( l == 0 ) *out << _T( "#1.2#\n" );
+        l++;
+        *out << s+_T( "\n" );
+    }
+    stream3.Close();
+
+    ::wxCopyFile( path + m + _T( "_" ), path + m );
+    ::wxRemoveFile( path + m + _T( "_" ) );
+
+    m = _T( "boat.txt" );
+    wxFileInputStream streamb( path + m );
+    in = new wxTextInputStream ( streamb,_T( "\n" ),wxConvUTF8 );
+    wxFileOutputStream stream4( path + m + _T( "_" ) );
+    out = new wxTextOutputStream ( stream4,wxEOL_NATIVE,wxConvUTF8 );
+
+    l = 0;
+    while ( true )
+    {
+        wxString tmp;
+        wxString s = in->ReadLine();
+        if ( streamb.Eof() || s.IsEmpty() ) break;
+
+        wxStringTokenizer tkz( s,_T( "\t" ) );
+        for ( int x = 0; x < 18; x++ )
+            tkz.GetNextToken();
+        wxString d = tkz.GetNextToken();
+        if ( !d.IsEmpty() && d.GetChar( 0 ) != ' ' )
+        {
+            d.RemoveLast();
+            tmp = d;
+            LogbookDialog::myParseDate( d,dt );
+            s.Replace( tmp,wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(),dt.GetDay(),dt.GetYear() ) );
+        }
+
+        if ( l == 0 ) *out << _T( "#1.2#\n" );
+        l++;
+        *out << s+_T( "\n" );
+    }
+    stream4.Close();
+
+    ::wxCopyFile( path + m + _T( "_" ), path + m );
+    ::wxRemoveFile( path + m + _T( "_" ) );
+
+    opt->dateformat = dtformat;
+    opt->timeformat = timeFormat;
+    opt->setDateFormat();
+    opt->setTimeFormat( opt->timeformat );
+}
+
+void Logbook::setCellAlign( int i )
+{
+    dialog->m_gridGlobal->SetCellAlignment    ( i,ROUTE, wxALIGN_LEFT, wxALIGN_TOP );
+    dialog->m_gridGlobal->SetCellAlignment    ( i,RDATE, wxALIGN_CENTRE, wxALIGN_TOP );
+    dialog->m_gridGlobal->SetCellAlignment    ( i,RTIME, wxALIGN_CENTRE, wxALIGN_TOP );
+    dialog->m_gridGlobal->SetCellAlignment    ( i,STATUS, wxALIGN_CENTRE, wxALIGN_TOP );
+    dialog->m_gridGlobal->SetCellAlignment    ( i,WAKE, wxALIGN_LEFT, wxALIGN_TOP );
+    dialog->m_gridGlobal->SetCellAlignment    ( i,REMARKS, wxALIGN_LEFT, wxALIGN_TOP );
+    if ( opt->windspeeds )
+    {
+        dialog->m_gridWeather->SetCellAlignment   ( i,LogbookHTML::WSPD, wxALIGN_CENTRE, wxALIGN_TOP );
+        dialog->m_gridWeather->SetCellAlignment   ( i,LogbookHTML::WSPDR, wxALIGN_CENTRE, wxALIGN_TOP );
+    }
+    dialog->m_gridWeather->SetCellAlignment   ( i,LogbookHTML::WEATHER, wxALIGN_LEFT, wxALIGN_TOP );
+    dialog->m_gridWeather->SetCellAlignment   ( i,LogbookHTML::CLOUDS, wxALIGN_LEFT, wxALIGN_TOP );
+    dialog->m_gridWeather->SetCellAlignment   ( i,LogbookHTML::VISIBILITY, wxALIGN_LEFT, wxALIGN_TOP );
+    dialog->m_gridMotorSails->SetCellAlignment( i,LogbookHTML::SAILS, wxALIGN_LEFT, wxALIGN_TOP );
+    dialog->m_gridMotorSails->SetCellAlignment( i,LogbookHTML::REEF, wxALIGN_LEFT, wxALIGN_TOP );
+    dialog->m_gridMotorSails->SetCellAlignment( i,LogbookHTML::MREMARKS, wxALIGN_LEFT, wxALIGN_TOP );
+
+    dialog->m_gridGlobal->SetReadOnly( i,POSITION,true );
+}
+
+void Logbook::switchToActualLogbook()
+{
+    dialog->selGridRow = 0;
+    dialog->selGridCol = 0;
+    logbookFile = new wxTextFile( logbookData_actual );
+    data_locn = logbookData_actual;
+    setFileName( logbookData_actual,layout_locn );
+    dialog->SetTitle( _( "Active Logbook" ) );
+    loadData();
+}
+
+
+void Logbook::appendRow( bool showlastline, bool autoline )
+{
+    wxString s;
+
+    if ( dialog->m_gridGlobal->IsSelection() )
+        dialog->deselectAllLogbookGrids();
+
+    checkGPS( autoline );
+
+    if ( noAppend ) return;
+    modified = true;
+
+    wxFileName fn( logbookFile->GetName() );
+    if ( fn.GetName() != ( _T( "logbook" ) ) )
+    {
+
+        switchToActualLogbook();
+        noAppend = true;
+        NoAppendDialog *x = new NoAppendDialog( dialog );
+        x->Show();
+
+        noAppend = false;
+        oldLogbook = false;
+    }
+
+    int lastRow = dialog->logGrids[0]->GetNumberRows();
+    if ( lastRow >= 499 )
+    {
+        static int repeat=lastRow;
+        //dialog->timer->Stop();
+        if ( lastRow == repeat )
+        {
+            repeat += 50;
+            wxString str = wxString::Format( sLinesReminder,lastRow+1 );
+            LinesReminderDlg* dlg = new LinesReminderDlg( str,dialog );
+            dlg->Show();
+
+            wxMessageBox( wxString::Format( _( "Your Logbook has %i lines\n\n\
+			You should create a new logbook to minimize loadingtime." ),lastRow ),_( "Information" ) );
+        }
+        //	dialog->logbookPlugIn->opt->timer = false;
+
+        /*	wxFileConfig *pConf = (wxFileConfig *)dialog->logbookPlugIn->m_pconfig;
+
+        if(pConf)
+        {
+        pConf->SetPath ( _T ( "/PlugIns/Logbook" ) );
+        pConf->Write ( _T( "Timer" ), dialog->logbookPlugIn->opt->timer );
+        }
+        */
+    }
+
+    for ( int i = 0; i < dialog->numPages; i++ )
+        dialog->logGrids[i]->AppendRows();
+
+    if ( lastRow > 0 )
+    {
+        dialog->logGrids[0]->SetCellValue( lastRow,ROUTE,dialog->logGrids[0]->GetCellValue( lastRow-1,ROUTE ) );
+        //if(gpsStatus)
+        dialog->logGrids[0]->SetCellValue( lastRow,POSITION,sLat+sLon );
+        //else
+        //	dialog->logGrids[0]->SetCellValue(lastRow,POSITION,dialog->logGrids[0]->GetCellValue(lastRow-1,POSITION));
+        changeCellValue( lastRow, 0,0 );
+        dialog->logGrids[0]->SetCellValue( lastRow,DTOTAL,dialog->logGrids[0]->GetCellValue( lastRow-1,DTOTAL ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTORT,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::MOTORT ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTOR1T,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::MOTOR1T ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::GENET,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::GENET ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::FUELT,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::FUELT ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::WATERT,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::WATERT ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::WATERMT,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::WATERMT ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::BANK1T,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::BANK1T ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::BANK2T,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::BANK2T ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::TRACKID,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::TRACKID ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::ROUTEID,dialog->logGrids[2]->GetCellValue( lastRow-1,LogbookHTML::ROUTEID ) );
+    }
+    else
+    {
+        dialog->logGrids[0]->SetCellValue( lastRow,ROUTE,_( "unnamed Route" ) );
+        if ( gpsStatus )
+            dialog->logGrids[0]->SetCellValue( lastRow,POSITION,sLat+sLon );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::FUELT,opt->fuelTank.c_str() );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::WATERT,opt->waterTank.c_str() );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::BANK1T,opt->bank1.c_str() );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::BANK2T,opt->bank2.c_str() );
+    }
+
+    if ( sDate != _T( "" ) )
+    {
+        dialog->logGrids[0]->SetCellValue( lastRow,RDATE,sDate );
+        dialog->logGrids[0]->SetCellValue( lastRow,RTIME,sTime );
+    }
+    else
+    {
+        if ( !opt->UTC )
+            mCorrectedDateTime = wxDateTime::Now();
+        else
+            mCorrectedDateTime = wxDateTime::Now().ToUTC();
+        dialog->logGrids[0]->SetCellValue( lastRow,RDATE,mCorrectedDateTime.Format( opt->sdateformat ) );
+        dialog->logGrids[0]->SetCellValue( lastRow,RTIME,mCorrectedDateTime.Format( opt->stimeformat ) );
+    }
+
+    if ( MOBIsActive )
+        dialog->logGrids[0]->SetCellValue( lastRow,REMARKS,_( "*** MAN OVERBOARD ***\n" ) );
+    else
+        dialog->logGrids[0]->SetCellValue( lastRow,REMARKS,sLogText );
+
+    if ( routeIsActive )
+    {
+        if ( activeRoute != wxEmptyString )
+            dialog->logGrids[0]->SetCellValue( lastRow,ROUTE,activeRoute );
+
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::ROUTEID,activeRouteGUID );
+    }
+    else
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::ROUTEID,wxEmptyString );
+
+    if ( trackIsActive )
+    {
+        if ( !routeIsActive )
+            dialog->logGrids[0]->SetCellValue( lastRow,ROUTE,_( "Track " )+activeTrack );
+
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::TRACKID,activeTrackGUID );
+    }
+    else
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::TRACKID,wxEmptyString );
+
+    dialog->logGrids[0]->SetCellValue( lastRow,COG,sCOG );
+    dialog->logGrids[0]->SetCellValue( lastRow,COW,sCOW );
+    dialog->logGrids[0]->SetCellValue( lastRow,SOG,sSOG );
+    dialog->logGrids[0]->SetCellValue( lastRow,SOW,sSOW );
+    dialog->logGrids[0]->SetCellValue( lastRow,DEPTH,sDepth );
+    dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WATERTE,sTemperatureWater );
+    dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WIND,sWindT );
+    if ( opt->windspeeds )
+    {
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WSPD,swindspeedsT );
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WINDR,sWindA );
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WSPDR,swindspeedsA );
+        minwindA = minwindT = 99;
+        maxwindA = maxwindT = 0;
+    }
+    else
+    {
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WSPD,sWindSpeedT );
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WINDR,sWindA );
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::WSPDR,sWindSpeedA );
+    }
+    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTOR,_T( "00.00" ) );
+    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTOR1,_T( "00.00" ) );
+    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::GENE,_T( "00.00" ) );
+    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::WATERM,_T( "00.00" ) );
+    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::WATERMO,_T( "0" ) );
+    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_T( " " ) );
+
+    if ( wimdaSentence )
+    {
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::AIRTE,sTemperatureAir );
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::BARO,sPressure );
+        dialog->logGrids[1]->SetCellValue( lastRow,LogbookHTML::HYDRO,sHumidity );
+    }
+
+    if ( bRPM1 )
+    {
+        if (	!opt->engine1Running )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Engine #1 started" ) );
+        else
+        {
+            if ( opt->engineMessageRunning )
+                dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Engine #1 running" ) );
+            if ( opt->NMEAUseERRPM || opt->toggleEngine1 )
+            {
+                dtEngine1Off = wxDateTime::Now().Subtract( opt->dtEngine1On );
+                //wxMessageBox(dtEngine1Off.Format(_T("%H:%M:%S")));
+                opt->dtEngine1On = wxDateTime::Now();
+                dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTOR,dtEngine1Off.Format( _T( "%H:%M" ) ) );
+                //			wxMessageBox(dtEngine1Off.Format(_T("%H:%M:%S")));
+            }
+        }
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::RPM1,sRPM1 );
+    }
+    if ( !bRPM1 && opt->engine1Running )
+    {
+        if ( opt->NMEAUseERRPM || !opt->toggleEngine1 )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTOR,dtEngine1Off.Format( _T( "%H:%M" ) ) );
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Engine #1 stopped" ) );
+    }
+    if ( bRPM2 )
+    {
+        if (	!opt->engine2Running )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Engine #2 started" ) );
+        else
+        {
+            if ( opt->engineMessageRunning )
+            {
+                if ( dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).IsEmpty() || dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).GetChar( 0 ) == ' ' )
+                    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Engine #2 running" ) );
+                else
+                    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS )+_( "\nEngine #2 running" ) );
+            }
+            if ( opt->NMEAUseERRPM || engine2Manual )
+            {
+                dtEngine2Off = wxDateTime::Now().Subtract( opt->dtEngine2On );
+                opt->dtEngine2On = wxDateTime::Now();
+                dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTOR1,dtEngine2Off.Format( _T( "%H:%M" ) ) );
+                //	wxMessageBox(dtEngine2Off.Format(_T("%H:%M:%S")));
+            }
+        }
+    }
+    if ( !bRPM2 && opt->engine2Running )
+    {
+        if ( opt->NMEAUseERRPM || !opt->toggleEngine2 )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MOTOR1,dtEngine2Off.Format( _T( "%H:%M" ) ) );
+        if ( dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).IsEmpty() || dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).GetChar( 0 ) == ' ' )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Engine #2 stopped" ) );
+        else
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS )+_( "\nEngine #2 stopped" ) );
+    }
+
+    if ( bGEN )
+    {
+        if (	!opt->generatorRunning )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Generator started" ) );
+        else
+        {
+            if ( opt->engineMessageRunning )
+            {
+                if ( dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).IsEmpty() || dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).GetChar( 0 ) == ' ' )
+                    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Generator running" ) );
+                else
+                    dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS )+_( "\nGenerator running" ) );
+            }
+            if ( opt->NMEAUseERRPM || generatorManual )
+            {
+                dtGeneratorOff = wxDateTime::Now().Subtract( opt->dtGeneratorOn );
+                opt->dtGeneratorOn = wxDateTime::Now();
+                dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::GENE,dtGeneratorOff.Format( _T( "%H:%M" ) ) );
+                //	wxMessageBox(dtEngine2Off.Format(_T("%H:%M:%S")));
+            }
+        }
+    }
+
+    if ( !bGEN && opt->generatorRunning )
+    {
+        if ( opt->NMEAUseERRPM || !opt->toggleGenerator )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::GENE,dtGeneratorOff.Format( _T( "%H:%M" ) ) );
+        if ( dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).IsEmpty() || dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS ).GetChar( 0 ) == ' ' )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,_( "Generator stopped" ) );
+        else
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS )+_( "\nGenerator stopped" ) );
+    }
+
+//	wxString sEngine = _T(" ")+opt->rpm+_T(" (")+opt->engine+_T(")");
+//	wxString sShaft =  _T(" ")+opt->rpm+_T(" (")+opt->shaft+_T(")");
+    wxString sEngine = _T( " (" )+opt->engine+_T( ")" );
+    wxString sShaft =  _T( " (" )+opt->shaft+_T( ")" );
+
+    if ( !sRPM1.IsEmpty() )
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::RPM1,sRPM1+sEngine+
+                                           ( ( sRPM1Shaft.IsEmpty() )? _T( "" ) : _T( "\n" )+sRPM1Shaft+sShaft ) );
+    if ( !sRPM2.IsEmpty() )
+        dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::RPM2,sRPM2+sEngine+
+                                           ( ( sRPM2Shaft.IsEmpty() )? _T( "" ) : _T( "\n" )+sRPM2Shaft+sShaft ) );
+
+    if ( sailsMessage && opt->engineMessageSails )
+    {
+        wxString temp = dialog->logGrids[2]->GetCellValue( lastRow,LogbookHTML::MREMARKS );
+        if ( temp.Len() == 1 && temp.GetChar( 0 ) == ' ' ) temp.Remove( 0,1 );
+
+        if ( ( oldSailsState == 0 || oldSailsState == -1 ) && sailsState == 1 )
+        {
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,temp + ( ( temp.IsEmpty() )?_T( "" ):_T( "\n" ) )+_( "Sails hoisted" ) );
+            oldSailsState = 1;
+        }
+        else if ( ( oldSailsState == 1 || oldSailsState == -1 ) && sailsState == 1 )
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,temp + ( ( temp.IsEmpty() )?_T( "" ):_T( "\n" ) )+_( "Sails changed" ) );
+        else if ( ( oldSailsState == 1 || oldSailsState == -1 ) && sailsState == 0 )
+        {
+            dialog->logGrids[2]->SetCellValue( lastRow,LogbookHTML::MREMARKS,temp + ( ( temp.IsEmpty() )?_T( "" ):_T( "\n" ) )+_( "Sails down" ) );
+            oldSailsState = 0;
+        }
+
+        sailsMessage = false;
+    }
+
+    if ( ActualWatch::active == true )
+        dialog->logGrids[0]->SetCellValue( lastRow,WAKE,ActualWatch::member );
+
+    wxString sails = wxEmptyString;
+    unsigned int n = 0;
+    for ( unsigned i = 0; i < 14; i++ )
+    {
+        if ( dialog->checkboxSails[i]->IsChecked() )
+        {
+            sails += opt->sailsName.Item( i );
+            if ( n == 1 )
+            {
+                sails += _T( "\n" );
+                n = 0;
+            }
+            else
+            {
+                sails += _T( ", " );
+                n++;
+            }
+        }
+    }
+
+    if ( !sails.IsEmpty() && n == 1 )
+        sails.RemoveLast( 2 );
+    else if ( !sails.IsEmpty() )
+        sails.RemoveLast( 1 );
+
+    dialog->m_gridMotorSails->SetCellValue( lastRow,LogbookHTML::SAILS,sails );
+
+    changeCellValue( lastRow, 0,1 );
+    setCellAlign( lastRow );
+    dialog->setEqualRowHeight( lastRow );
+
+    dialog->m_gridGlobal->SetReadOnly( lastRow,6 );
+
+    if ( showlastline )
+    {
+        dialog->m_gridGlobal->MakeCellVisible( lastRow,0 );
+        dialog->m_gridWeather->MakeCellVisible( lastRow,0 );
+        dialog->m_gridMotorSails->MakeCellVisible( lastRow,0 );
+    }
+}
+
+void Logbook::resetEngineManualMode( int enginenumber )
+{
+    /* engine number 0=all, 1=engine#1, 2=engine#2, 3=generator */
+    bool t = opt->bRPMCheck;
+    wxString    onOff[2];
+    onOff[0] = _( " off" );
+    onOff[1] = _( " on" );
+
+    if ( enginenumber == 1 || enginenumber == 0 )
+    {
+        parent->m_toggleBtnEngine1->SetValue( false );
+        opt->toggleEngine1 = false;
+        bRPM1 = false;
+        dtEngine1Off = wxDateTime::Now().Subtract( opt->dtEngine1On );
+        parent->m_toggleBtnEngine1->SetLabel( parent->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[0] );
+    }
+    if ( enginenumber == 2 || enginenumber == 0 )
+    {
+        parent->m_toggleBtnEngine2->SetValue( false );
+        opt->toggleEngine2 = false;
+        bRPM2 = false;
+        dtEngine2Off = wxDateTime::Now().Subtract( opt->dtEngine2On );
+        parent->m_toggleBtnEngine2->SetLabel( parent->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[0] );
+    }
+    if ( enginenumber == 3 || enginenumber == 0 )
+    {
+        parent->m_toggleBtnGenerator->SetValue( false );
+        opt->toggleGenerator = false;
+        bGEN = false;
+        dtGeneratorOff = wxDateTime::Now().Subtract( opt->dtGeneratorOn );
+        parent->m_toggleBtnGenerator->SetLabel( parent->m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[0] );
+    }
+
+    appendRow( true, false );
+
+    if ( enginenumber == 1 || enginenumber == 0 )
+    {
+        opt->dtEngine1On = -1;
+        engine1Manual = false;
+        opt->engine1Running = false;
+    }
+    if ( enginenumber == 2 || enginenumber == 0 )
+    {
+        opt->dtEngine2On = -1;
+        engine2Manual = false;
+        opt->engine2Running = false;
+    }
+    if ( enginenumber == 3 || enginenumber == 0 )
+    {
+        opt->dtGeneratorOn = -1;
+        generatorManual = false;
+        opt->generatorRunning = false;
+    }
+
+    opt->bRPMCheck = t;
+
+}
+
+void Logbook::checkNMEADeviceIsOn()
+{
+    wxDateTime dtn = wxDateTime::Now();
+    wxString    onOff[2];
+    onOff[0] = _( " off" );
+    onOff[1] = _( " on" );
+
+    if ( bDepth && dtn.Subtract( dtDepth ).GetSeconds() > DEVICE_TIMEOUT )						// Sounder
+    {
+        sDepth = wxEmptyString;
+        bDepth = false;
+    }
+    if ( bSOW && dtn.Subtract( dtSOW ).GetSeconds() > DEVICE_TIMEOUT )							// Speedo
+    {
+        sSOW = wxEmptyString;
+        bSOW = false;
+    }
+    if ( bWindA && dtn.Subtract( dtWindA ).GetSeconds() > DEVICE_TIMEOUT )						// Wind Rel
+    {
+        sWindA = wxEmptyString;
+        sWindSpeedA = wxEmptyString;
+        swindspeedsA = wxEmptyString;
+        bWindA = false;
+    }
+    if ( bWindT && dtn.Subtract( dtWindT ).GetSeconds() > DEVICE_TIMEOUT )						// Wind True
+    {
+        sWindT = wxEmptyString;
+        sWindSpeedT = wxEmptyString;
+        swindspeedsT = wxEmptyString;
+        bWindT = false;
+    }
+    if ( bCOW && dtn.Subtract( dtCOW ).GetSeconds() > DEVICE_TIMEOUT )							// Heading
+    {
+        sCOW = wxEmptyString;
+        bCOW = false;
+    }
+    if ( bTemperatureWater && dtn.Subtract( dtTemperatureWater ).GetSeconds() > DEVICE_TIMEOUT ) // Watertemperature
+    {
+        sTemperatureWater = wxEmptyString;
+        bTemperatureWater = false;
+    }
+
+    if ( wimdaSentence && dtn.Subtract( dtWimda ).GetSeconds() > DEVICE_TIMEOUT )				// WeatherStation
+    {
+        sPressure		= wxEmptyString;
+        sTemperatureAir = wxEmptyString;
+        sHumidity		= wxEmptyString;
+        wimdaSentence	= false;
+    }
+    if ( rpmSentence && dtn.Subtract( dtRPM ).GetSeconds() > DEVICE_TIMEOUT )					// Engine RPM and Engine elapsed time
+    {
+        rpmSentence = false;
+        wxDateTime now = wxDateTime::Now();
+
+        if ( opt->bEng1RPMIsChecked )
+        {
+            bRPM1 = false;
+            dtEngine1Off = now.Subtract( opt->dtEngine1On );
+            opt->dtEngine1On = -1;
+            sRPM1 = wxEmptyString;
+            sRPM1Shaft = wxEmptyString;
+            dialog->m_toggleBtnEngine1->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[0] );
+        }
+
+        if ( opt->bEng2RPMIsChecked )
+        {
+            bRPM2 = false;
+            dtEngine2Off = now.Subtract( opt->dtEngine2On );
+            opt->dtEngine2On = -1;
+            sRPM2 = wxEmptyString;
+            sRPM2Shaft = wxEmptyString;
+            dialog->m_toggleBtnEngine2->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[0] );
+        }
+
+        if ( opt->bGenRPMIsChecked )
+        {
+            bGEN = false;
+            dtGeneratorOff = now.Subtract( opt->dtGeneratorOn );
+            opt->dtGeneratorOn = -1;
+            dialog->m_toggleBtnGenerator->SetLabel( dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[0] );
+        }
+
+        appendRow( true, true );
+
+        if ( opt->bEng1RPMIsChecked )
+        {
+            opt->engine1Running = false;
+        }
+        if ( opt->bEng1RPMIsChecked )
+        {
+            opt->engine2Running = false;
+        }
+        if ( opt->bGenRPMIsChecked )
+        {
+            opt->generatorRunning = false;
+        }
+    }
+}
+
+void Logbook::recalculateLogbook( int row )
+{
+    int cells[] = { LogbookHTML::POSITION,LogbookHTML::MOTOR,LogbookHTML::MOTOR1,LogbookHTML::FUEL,
+                    LogbookHTML::GENE,LogbookHTML::BANK1,LogbookHTML::BANK2,LogbookHTML::WATERM,LogbookHTML::WATER
+                  };
+    int grid;
+
+    if ( row < 0 ) return;
+    if ( row == 0  && dialog->m_gridGlobal->GetNumberRows() > 1 ) row = 1;
+
+    int len = sizeof( cells )/sizeof( cells[0] );
+    for ( int i = 0; i < len ; i++ )
+    {
+        if ( i == 0 )
+            grid = 0;
+        else
+            grid = 2;
+
+        if ( dialog->m_gridGlobal->GetNumberRows() >= 2 )
+            getModifiedCellValue( grid,row,0,cells[i] );
+    }
+
+}
+
+void Logbook::checkCourseChanged()
+{
+    static wxDateTime dt;
+    static bool timer = true;
+
+    wxDouble cog;
+    wxGrid* grid = dialog->m_gridGlobal;
+
+    wxString temp = grid->GetCellValue( grid->GetNumberRows()-1,8 );
+    temp.Replace( _T( "," ),_T( "." ) );
+    temp.ToDouble( &cog );
+
+    if ( ( cog == dCOG ) || ( oldLogbook || temp.IsEmpty() ) ) return;
+
+
+#ifdef __WXOSX__
+    wxDouble result = labs( cog-dCOG );
+#else
+    wxDouble result = abs( cog-dCOG );
+#endif
+    if ( result > 180 ) result -= 360;
+
+#ifdef __WXOSX__
+    if ( labs( result ) >= opt->dCourseChangeDegrees && !dialog->logbookPlugIn->eventsEnabled )
+#else
+    if ( abs( result ) >= opt->dCourseChangeDegrees && !dialog->logbookPlugIn->eventsEnabled )
+#endif
+    {
+        if ( timer )
+        {
+            timer = false;
+            dt = mCorrectedDateTime;
+            long min;
+            opt->courseTextAfterMinutes.ToLong( &min );
+            wxTimeSpan t( 0,( int )min );
+            dt.Add( t );
+        }
+
+
+        if ( mCorrectedDateTime >= dt )
+        {
+            dialog->logbookTimerWindow->popUp();
+            timer = true;
+            courseChange = true;
+            appendRow( true, true );
+            courseChange = false;
+        }
+    }
+}
+
+void Logbook::checkWayPoint( RMB rmb )
+{
+    if ( lastWayPoint == rmb.From ) return;
+
+    dialog->logbookTimerWindow->popUp();
+    tempRMB = rmb;
+    waypointArrived = true;
+    appendRow( true, true );
+    waypointArrived = false;
+    lastWayPoint = rmb.From;
+}
+
+void Logbook::checkGuardChanged()
+{
+    if ( dLastMinute == -1 )
+    {
+        dLastMinute = ( long ) mCorrectedDateTime.GetMinute()+1;
+        return;
+    }
+
+    long hour,minute;
+    long m_minute = ( long ) mCorrectedDateTime.GetMinute();
+    long m_hour = ( long ) mCorrectedDateTime.GetHour();
+    bool append = false;
+
+    if ( m_minute >= dLastMinute )
+    {
+        for ( int row = 0; row < dialog->m_gridCrewWake->GetNumberRows(); row++ )
+        {
+            for ( int col = 2; col < dialog->m_gridCrewWake->GetNumberCols(); col += 2 )
+            {
+                wxString s = dialog->m_gridCrewWake->GetCellValue( row,col );
+                if ( s.IsEmpty() ) continue;
+                wxStringTokenizer tkz( s,_T( ":" ) );
+                tkz.GetNextToken().ToLong( &hour );
+                tkz.GetNextToken().ToLong( &minute );
+                if ( hour != m_hour ) continue;
+                if ( minute == m_minute )
+                    append = true;
+            }
+        }
+        if ( append )
+        {
+            guardChange = true;
+            appendRow( true, true );
+            guardChange = false;
+        }
+        dLastMinute = m_minute + 1;
+    }
+}
+
+void Logbook::checkDistance()
+{
+    if ( oldPosition.latitude == 500 )
+        oldPosition = newPosition;
+
+    double fromlat = oldPosition.posLat * PI/180;
+    double fromlon = oldPosition.posLon * PI/180;
+    double tolat = newPosition.posLat * PI/180;
+    double tolon = newPosition.posLon * PI/180;
+    if ( oldPosition.NSflag == 'S' ) fromlat = -fromlat;
+    if ( oldPosition.WEflag == 'W' ) fromlon = -fromlon;
+    if ( newPosition.NSflag == 'S' ) tolat = -fromlat;
+    if ( newPosition.WEflag == 'W' ) tolon = -fromlon;
+
+    double sm =
+        acos( cos( fromlat )*cos( fromlon )*cos( tolat )*cos( tolon ) +
+              cos( fromlat )*sin( fromlon )*cos( tolat )*sin( tolon ) + sin( fromlat )*sin( tolat ) ) * 3443.9;
+
+    if ( sm >= opt->dEverySM && !dialog->logbookPlugIn->eventsEnabled )
+    {
+        dialog->logbookTimerWindow->popUp();
+        everySM = true;
+        appendRow( true, true );
+        everySM = false;
+        oldPosition = newPosition;
+    }
+}
+
+wxString Logbook::calculateDistance( wxString fromstr, wxString tostr )
+{
+    if ( ( fromstr.IsEmpty() || tostr.IsEmpty() ) || fromstr == tostr )
+        return wxString( _T( "0.00 " )+opt->distance );
+
+    wxString sLat, sLon, sLatto, sLonto;
+    wxDouble fromlat,fromlon,tolat,tolon, sm;
+
+    wxStringTokenizer tkz( fromstr, _T( "\n" ) );
+    sLat = tkz.GetNextToken();
+    sLon = tkz.GetNextToken();
+    wxStringTokenizer tkzto( tostr, _T( "\n" ) );
+    sLatto = tkzto.GetNextToken();
+    sLonto = tkzto.GetNextToken();
+
+    if ( opt->traditional )
+    {
+        fromlat = positionStringToDezimal( sLat )* ( PI/180 );
+        fromlon = positionStringToDezimal( sLon )* ( PI/180 );
+        tolat = positionStringToDezimal( sLatto )* ( PI/180 );
+        tolon = positionStringToDezimal( sLonto )* ( PI/180 );
+    }
+    else
+    {
+        fromlat = positionStringToDezimalModern( sLat )* ( PI/180 );
+        fromlon = positionStringToDezimalModern( sLon )* ( PI/180 );
+        tolat = positionStringToDezimalModern( sLatto )* ( PI/180 );
+        tolon = positionStringToDezimalModern( sLonto )* ( PI/180 );
+    }
+    if ( oldPosition.NSflag == 'S' ) fromlat = -fromlat;
+    if ( oldPosition.WEflag == 'W' ) fromlon = -fromlon;
+    if ( newPosition.NSflag == 'S' ) tolat = -fromlat;
+    if ( newPosition.WEflag == 'W' ) tolon = -fromlon;
+
+    ///////
+    sm = acos( cos( fromlat )*cos( fromlon )*cos( tolat )*cos( tolon ) +
+               cos( fromlat )*sin( fromlon )*cos( tolat )*sin( tolon ) + sin( fromlat )*sin( tolat ) ) * 3443.9;
+    ////// code snippet from http://www2.nau.edu/~cvm/latlongdist.html#formats
+
+    wxString ret = wxString::Format( _T( "%.2f %s" ),sm,opt->distance.c_str() );
+    ret.Replace( _T( "." ),dialog->decimalPoint );
+    return ret;
+}
+
+wxDouble Logbook::positionStringToDezimal( wxString pos )
+{
+    wxDouble resdeg, resmin, ressec = 0;
+    wxString temp = pos;
+
+    wxStringTokenizer tkz( pos, _T( " " ) );
+    temp = tkz.GetNextToken();
+    temp.Replace( _T( "," ),_T( "." ) );
+    temp.ToDouble( &resdeg );
+    if ( pos.Contains( _T( "S" ) ) ) resdeg = -resdeg;
+    if ( pos.Contains( _T( "W" ) ) ) resdeg = -resdeg;
+    temp = tkz.GetNextToken();
+    temp.Replace( _T( "," ),_T( "." ) );
+    temp.ToDouble( &resmin );
+    if ( pos.Contains( _T( "S" ) ) ) resmin = -resmin;
+    if ( pos.Contains( _T( "W" ) ) ) resmin = -resmin;
+    temp = tkz.GetNextToken();
+    temp.Replace( _T( "," ),_T( "." ) );
+    temp.ToDouble( &ressec );
+    if ( pos.Contains( _T( "S" ) ) ) ressec = -ressec;
+    if ( pos.Contains( _T( "W" ) ) ) ressec = -ressec;
+    resmin = ( resmin/60 + ressec/3600 );
+
+    return resdeg + resmin;
+}
+
+wxDouble Logbook::positionStringToDezimalModern( wxString pos )
+{
+    wxDouble resdeg, resmin;
+    wxString temp = pos;
+
+    wxStringTokenizer tkz( pos, _T( " " ) );
+    temp = tkz.GetNextToken();
+    temp.Replace( _T( "," ),_T( "." ) );
+    temp.ToDouble( &resdeg );
+    if ( pos.Contains( _T( "S" ) ) ) resdeg = -resdeg;
+    if ( pos.Contains( _T( "W" ) ) ) resdeg = -resdeg;
+    temp = tkz.GetNextToken();
+    temp.Replace( _T( "," ),_T( "." ) );
+    temp.ToDouble( &resmin );
+    if ( pos.Contains( _T( "S" ) ) ) resmin = -resmin;
+    if ( pos.Contains( _T( "W" ) ) ) resmin = -resmin;
+
+    return resdeg + ( resmin/60 );
+}
+
+void Logbook::deleteRow( int row )
+{
+    dialog->logGrids[dialog->m_notebook8->GetSelection()]->SelectRow( row,true );
+    int answer = wxMessageBox( wxString::Format( _( "Delete Row Nr. %i ?" ),row+1 ), _( "Confirm" ),
+                               wxYES_NO | wxCANCEL, dialog );
+    if ( answer == wxYES )
+    {
+        deleteRows();
+        modified = true;
+    }
+}
+
+void Logbook::changeCellValue( int row, int col, int mode )
+{
+    if ( mode )
+        for ( int g =0; g < LOGGRIDS; g++ )
+            for ( int i = 0; i < dialog->logGrids[g]->GetNumberCols(); i++ )
+                getModifiedCellValue( g,row,i,i );
+    else
+        getModifiedCellValue( dialog->m_notebook8->GetSelection(),row,col,col );
+}
+
+void Logbook::update()
+{
+    if ( !modified ) return;
+    modified = false;
+
+    dialog->logGrids[0]->Refresh();
+    dialog->logGrids[1]->Refresh();
+    dialog->logGrids[2]->Refresh();
+
+    int count;
+    if ( ( count  = dialog->logGrids[0]->GetNumberRows() )== 0 )
+    {
+        wxFile f;
+        f.Create( data_locn,true );
+        return;
+    }
+
+    wxString s = _T( "" ), temp;
+
+    wxString newLocn = data_locn;
+    newLocn.Replace( _T( "txt" ),_T( "Bak" ) );
+    wxRename( data_locn,newLocn );
+
+    wxFileOutputStream output( data_locn );
+    wxTextOutputStream* stream = new wxTextOutputStream ( output,wxEOL_NATIVE,wxConvUTF8 );
+
+    stream->WriteString( _T( "#1.2#\t" )+logbookDescription+_T( "\n" ) );
+    for ( int r = 0; r < count; r++ )
+    {
+        for ( int g = 0; g < LOGGRIDS; g++ )
+        {
+            for ( int c = 0; c < dialog->logGrids[g]->GetNumberCols(); c++ )
+            {
+                if ( g == 1 && ( c == LogbookHTML::HYDRO || c == LogbookHTML::WATERTE || c == LogbookHTML::AIRTE ||
+                                 c == LogbookHTML::WINDR || c == LogbookHTML::WSPDR ) )
+                    continue;
+                if ( g == 2 && ( c == LogbookHTML::MOTOR1  || c == LogbookHTML::MOTOR1T ||
+                                 c == LogbookHTML::RPM1	|| c == LogbookHTML::RPM2	 ||
+                                 c == LogbookHTML::GENE    || c == LogbookHTML::GENET   ||
+                                 c == LogbookHTML::WATERM  || c == LogbookHTML::WATERMT ||
+                                 c == LogbookHTML::WATERMO || c == LogbookHTML::BANK1   ||
+                                 c == LogbookHTML::BANK1T  || c == LogbookHTML::BANK2   ||
+                                 c == LogbookHTML::BANK2T  ||
+                                 c == LogbookHTML::TRACKID || c == LogbookHTML::ROUTEID ) )
+                    continue;
+                if ( g == 0 && c == RDATE )
+                {
+                    wxString t = dialog->logGrids[g]->GetCellValue( r,c );
+                    if ( !t.IsEmpty() )
+                    {
+                        wxDateTime dt;
+                        dialog->myParseDate( t,dt );
+                        temp = wxString::Format( _T( "%i \t%i \t%i" ),dt.GetMonth(),dt.GetDay(),dt.GetYear() );
+                    }
+                    else
+                        temp = wxString::Format( _T( " \t \t" ) );
+                }
+                else if ( g == 0 && c == RTIME )
+                {
+                    wxString t = dialog->logGrids[g]->GetCellValue( r,c );
+                    if ( !t.IsEmpty() )
+                    {
+                        wxDateTime dt;
+                        dialog->myParseTime( t,dt );
+                        temp = wxString::Format( _T( "%i \t%i \t%i" ),dt.GetHour(),dt.GetMinute(),dt.GetSecond() );
+                    }
+                    else
+                        temp = wxString::Format( _T( " \t \t" ) );
+                }
+                else
+                    temp = dialog->logGrids[g]->GetCellValue( r,c );
+
+                s += dialog->replaceDangerChar( temp );
+                s += _T( " \t" );
+            }
+        }
+
+        for ( int ext = LogbookHTML::HYDRO; ext != LogbookHTML::WIND; ext ++ ) // extended 3 columns in weathergrid
+        {
+            temp = dialog->logGrids[1]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        for ( int ext = LogbookHTML::MOTOR1; ext <= LogbookHTML::MOTOR1T; ext ++ ) // extend MOTOR #1
+        {
+            temp = dialog->logGrids[2]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        for ( int ext = LogbookHTML::GENE; ext <= LogbookHTML::BANK2T; ext ++ ) // extend for GENERATOR and Battery-Banks
+        {
+            temp = dialog->logGrids[2]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        for ( int ext = LogbookHTML::WATERM; ext <= LogbookHTML::WATERMO; ext ++ ) // extend WATERMAKER
+        {
+            temp = dialog->logGrids[2]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        for ( int ext = LogbookHTML::ROUTEID; ext < parent->m_gridMotorSails->GetNumberCols(); ext ++ ) // extend GUID's
+        {
+            temp = dialog->logGrids[2]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        for ( int ext = LogbookHTML::RPM1; ext < LogbookHTML::MOTOR1; ext ++ ) // extend RPM #1
+        {
+            temp = dialog->logGrids[2]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        for ( int ext = LogbookHTML::RPM2; ext < LogbookHTML::FUEL; ext ++ ) // extend RPM #2
+        {
+            temp = dialog->logGrids[2]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        for ( int ext = LogbookHTML::WINDR; ext < LogbookHTML::CURRENT; ext ++ ) // extend WINDR
+        {
+            temp = dialog->logGrids[1]->GetCellValue( r,ext );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+
+        s.RemoveLast();
+        s += _T( "\n" );
+        stream->WriteString( s );
+        s = _T( "" );
+    }
+    output.Close();
+}
+
+void  Logbook::getModifiedCellValue( int grid, int row, int selCol, int col )
+{
+    wxString s, wind, depth;
+
+    modified = true;
+
+    s = dialog->logGrids[grid]->GetCellValue( row,col );
+
+    if ( ( grid == 0 && ( col == WAKE || col == REMARKS ) ) ||
+            ( grid == 1 && ( col == LogbookHTML::WEATHER || col == LogbookHTML::CLOUDS || col == LogbookHTML::VISIBILITY ) ) ||
+            ( grid == 2 && ( col == LogbookHTML::SAILS || col == LogbookHTML::REEF || col == LogbookHTML::MREMARKS ) ) )
+    {
+        return;
+    }
+
+    if ( grid == 0 && col == ROUTE )
+    {
+        if ( s.IsEmpty() ) return;
+        if ( s.Last() == '\n' )
+        {
+            s.RemoveLast();
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 0 && col == RDATE )
+    {
+        wxDateTime dt;
+
+        if ( !dialog->myParseDate( s,dt ) )
+        {
+            dt = dt.Now();
+            wxMessageBox( wxString::Format( _( "Please enter the Date in the format:\n      %s" ),dt.Format( opt->sdateformat ).c_str() ),_( "Information" ) );
+            dialog->logGrids[grid]->SetCellValue( row,col,_T( "" ) );
+        }
+        else
+        {
+            dialog->logGrids[grid]->SetCellValue( row,col,dt.Format( opt->sdateformat ) );
+
+            if ( row == dialog->m_gridGlobal->GetNumberRows()-1 )
+                dialog->maintenance->checkService( row );
+        }
+    }
+    else if ( grid == 0 && col == RTIME )
+    {
+        if ( s.IsEmpty() ) return;
+        wxDateTime dt;
+        bool c;
+        s.Replace( _T( "," ),_T( ":" ) );
+        s.Replace( _T( "." ),_T( ":" ) );
+        c = dialog->myParseTime( s,dt );
+
+        if ( !c )
+        {
+            wxMessageBox( wxString::Format( _( "Please enter the Time in the format:\n   %s" ),dt.Format( opt->stimeformat ).c_str() ) );
+            dialog->logGrids[grid]->SetCellValue( row,col,_T( "" ) );
+        }
+        else
+        {
+            dialog->logGrids[grid]->SetCellValue( row,col,dt.Format( opt->stimeformat ) );
+            if ( row == dialog->m_gridGlobal->GetNumberRows()-1 )
+                dialog->maintenance->checkService( row );
+        }
+    }
+    else if ( grid == 0 && col == DISTANCE )
+    {
+        s.Replace( _T( "," ),_T( "." ) );
+
+        s = wxString::Format( _T( "%.2f %s" ),wxAtof( s ),opt->distance.c_str() );
+
+        s.Replace( _T( "." ),dialog->decimalPoint );
+        dialog->logGrids[grid]->SetCellValue( row,col,s );
+
+        computeCell( grid, row, col, s, true );
+        if ( row == dialog->m_gridGlobal->GetNumberRows()-1 )
+            dialog->maintenance->checkService( row );
+
+        s.Replace( _T( "," ),_T( "." ) );
+        if ( wxAtof( s ) >= 0.1 )
+            dialog->m_gridGlobal->SetCellValue( row,STATUS,_T( "S" ) );
+        else
+            dialog->m_gridGlobal->SetCellValue( row,STATUS,_T( "" ) );
+    }
+
+    else if ( grid == 0 && col== STATUS )
+    {
+        dialog->logGrids[grid]->SetCellValue( row,col,s.Upper() );
+        if ( row == dialog->m_gridGlobal->GetNumberRows()-1 )
+            dialog->maintenance->checkService( row );
+    }
+    else if ( grid == 0 && col== POSITION )
+    {
+        if ( s != _T( "" ) && !s.Contains( opt->Deg )
+                && !s.Contains( opt->Min )
+                && !s.Contains( opt->Sec ) )
+        {
+            if ( opt->traditional && s.length() != 22 )
+            {
+                wxMessageBox( _( "Please enter 0544512.15n0301205.15e for\n054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E" ),_( "Information" ),wxOK );
+                s = _T( "" );
+            }
+            else if ( !opt->traditional && s.length() != 22 )
+            {
+                wxMessageBox( _( "Please enter 05445.1234n03012.0504e for\n054Deg 45.1234Min N 030Deg 12.0504Min E" ),_( "Information" ),wxOK );
+                s = _T( "" );
+            }
+            if ( s == _T( "" ) ) return;
+            s.Replace( _T( "," ),_T( "." ) );
+
+            if ( opt->traditional )
+            {
+                wxString temp = s.SubString( 0,2 )+opt->Deg+_T( " " );
+                temp += s.SubString( 3,4 ) + opt->Min+_T( " " );
+                temp += s.SubString( 5,9 ) + opt->Sec+_T( " " );
+                temp += s.SubString( 10,10 ).Upper() + _T( "\n" );
+                temp += s.SubString( 11,13 ) + opt->Deg+_T( " " );
+                temp += s.SubString( 14,15 ) + opt->Min+_T( " " );
+                temp += s.SubString( 16,20 ) + opt->Sec+_T( " " );
+                temp += s.SubString( 21,21 ).Upper();
+                s = temp;
+            }
+            else
+            {
+                wxString temp = s.SubString( 0,2 )+opt->Deg+_T( " " );
+                temp += s.SubString( 3,9 ) + opt->Min+_T( " " );
+                temp += s.SubString( 10,10 ).Upper() + _T( "\n" );
+                temp += s.SubString( 11,13 ) + opt->Deg+_T( " " );
+                temp += s.SubString( 14,20 ) + opt->Min+_T( " " );
+                temp += s.SubString( 21,22 ).Upper();
+                s = temp;
+            }
+        }
+        s.Replace( _T( "." ),dialog->decimalPoint );
+        dialog->logGrids[grid]->SetCellValue( row,col,s );
+        if ( row != 0 )
+        {
+            for ( int i = row; i < dialog->logGrids[grid]->GetNumberRows(); i++ )
+            {
+                double distTotal,dist;
+                dialog->logGrids[grid]->SetCellValue( i,5,
+                                                      calculateDistance( dialog->logGrids[grid]->GetCellValue( i-1,col ),s ) );
+                wxString temp = dialog->logGrids[grid]->GetCellValue( i-1,6 );
+                temp.Replace( _T( "," ),_T( "." ) );
+                temp.ToDouble( &distTotal );
+                temp = dialog->logGrids[grid]->GetCellValue( i,5 );
+                temp.Replace( _T( "," ),_T( "." ) );
+                temp.ToDouble( &dist );
+                s= wxString::Format( _T( "%9.2f %s" ),distTotal+dist,opt->distance.c_str() );
+                s.Replace( _T( "." ),dialog->decimalPoint );
+                dialog->logGrids[grid]->SetCellValue( i,6,s );
+
+                if ( dist >= 0.1 )
+                    dialog->m_gridGlobal->SetCellValue( i,3,_T( "S" ) );
+                else
+                    dialog->m_gridGlobal->SetCellValue( i,3,_T( "" ) );
+
+                if ( i < dialog->m_gridGlobal->GetNumberRows()-1 )
+                {
+                    s = dialog->logGrids[grid]->GetCellValue( i+1,col );
+                    if ( s.IsEmpty() || s == _T( " " ) )
+                        break;
+                }
+            }
+        }
+    }
+    else if ( grid == 0 && col == COG )
+    {
+        if ( s != _T( "" ) )
+        {
+            s.Replace( _T( "," ),_T( "." ) );
+            s = wxString::Format( _T( "%3.2f%s" ),wxAtof( s ),opt->Deg.c_str() );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 0 && col == COW )
+    {
+        if ( s != _T( "" ) )
+        {
+            s.Replace( _T( "," ),_T( "." ) );
+            s = wxString::Format( _T( "%3.2f%s %s" ),wxAtof( s ),opt->Deg.c_str(),( opt->showHeading )?_T( "M" ):_T( "T" ) );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 0 && ( col == SOG || col == SOW ) )
+    {
+        if ( s != _T( "" ) )
+        {
+            s.Replace( _T( "," ),_T( "." ) );
+#ifdef __WXOSX__
+            s = wxString::Format( _T( "%2.2f %s" ),wxAtof( s ),( const wchar_t* )opt->speed.c_str() );
+#else
+            s = wxString::Format( _T( "%2.2f %s" ),wxAtof( s ),opt->speed.c_str() );
+#endif
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 0 && col == DEPTH )
+    {
+        if ( s != _T( "" ) )
+        {
+            switch ( opt->showDepth )
+            {
+            case 0:
+                depth = opt->meter;
+                break;
+            case 1:
+                depth = opt->feet;
+                break;
+            case 2:
+                depth = opt->fathom;
+                break;
+            }
+            if ( s.Contains( opt->meter ) ||
+                    s.Contains( opt->feet ) ||
+                    s.Contains( opt->fathom.c_str() ) ||
+                    s.Contains( _T( "--" ) ) )
+            {
+                s.Replace( _T( "." ),dialog->decimalPoint );
+                dialog->logGrids[grid]->SetCellValue( row,col,s );
+            }
+            else
+            {
+                s.Replace( _T( "," ),_T( "." ) );
+                s = wxString::Format( _T( "%3.1f %s" ),wxAtof( s ),depth.c_str() );
+                s.Replace( _T( "." ),dialog->decimalPoint );
+                dialog->logGrids[grid]->SetCellValue( row,col,s );
+            }
+
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::BARO )
+    {
+        if ( s != _T( "" ) )
+        {
+            s = wxString::Format( _T( "%4.1f %s" ),wxAtof( s ),opt->baro.c_str() );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::HYDRO )
+    {
+        if ( s != _T( "" ) )
+        {
+            s.Replace( _T( "," ),_T( "." ) );
+            s = wxString::Format( _T( "%4.1f%%" ),wxAtof( s ) );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::AIRTE )
+    {
+        if ( s != _T( "" ) && !s.Contains( opt->Deg ) )
+        {
+            s = wxString::Format( _T( "%3.0f %s %s" ),wxAtof( s ), opt->Deg.c_str(),opt->temperature.c_str() );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::WATERTE )
+    {
+        if ( s != _T( "" ) && !s.Contains( opt->Deg ) )
+        {
+            s = wxString::Format( _T( "%3.0f %s %s" ),wxAtof( s ), opt->Deg.c_str(),opt->temperature.c_str() );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::WIND )
+    {
+        if ( s != _T( "" ) && !s.Contains( opt->Deg ) )
+        {
+            s = wxString::Format( _T( "%3.0f%s %s" ),wxAtof( s ), opt->Deg.c_str(),opt->showWindDir?_T( "R" ):_T( "T" ) );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::WSPD )
+    {
+        if ( s != _T( "" ) )
+        {
+            if ( !opt->windspeeds )
+            {
+                if ( !s.Contains( opt->windkts ) && !s.Contains( opt->windmeter ) && !s.Contains( opt->windkmh ) )
+                {
+                    switch ( opt->showWindSpeed )
+                    {
+                    case 0:
+                        wind = opt->windkts;
+                        break;
+                    case 1:
+                        wind = opt->windmeter;
+                        break;
+                    case 2:
+                        wind = opt->windkmh;
+                        break;
+                    }
+                    s.Replace( _T( "," ),_T( "." ) );
+                    s = wxString::Format( _T( "%3.2f %s" ),wxAtof( s ),wind.c_str() );
+                    s.Replace( _T( "." ),dialog->decimalPoint );
+                }
+                dialog->logGrids[grid]->SetCellValue( row,col,s );
+            }
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::CURRENT )
+    {
+        if ( s != _T( "" ) && !s.Contains( opt->Deg ) )
+        {
+            s.Replace( _T( "," ),_T( "." ) );
+            s = wxString::Format( _T( "%3.0f%s" ),wxAtof( s ), opt->Deg.c_str() );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 1 && col == LogbookHTML::CSPD )
+    {
+        if ( s != _T( "" ) )
+        {
+            s.Replace( _T( "," ),_T( "." ) );
+            s = wxString::Format( _T( "%3.2f %s" ),wxAtof( s ),opt->speed.c_str() );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 1 && ( col == LogbookHTML::WAVE || col == LogbookHTML::SWELL ) )
+    {
+        wxString d;
+        switch ( opt->showWaveSwell )
+        {
+        case 0:
+            d = opt->meter;
+            break;
+        case 1:
+            d = opt->feet;
+            break;
+        case 2:
+            d = opt->fathom;
+            break;
+        }
+        if ( s != _T( "" ) )
+        {
+            s.Replace( _T( "," ),_T( "." ) );
+            s = wxString::Format( _T( "%3.2f %s" ),wxAtof( s ),d.c_str() );
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+    }
+    else if ( grid == 2 && ( ( col == LogbookHTML::MOTORT || col == LogbookHTML::MOTOR1T ||
+                               col == LogbookHTML::GENET  || col == LogbookHTML::WATERMT )  && !s.IsEmpty() ) )
+    {
+        wxString pre, cur;
+        double hp,hc,mp,mc;
+        double res,hp_,hc_;
+
+        if ( !s.Contains( _T( ":" ) ) && !s.Contains( _T( "," ) ) && !s.Contains( _T( "." ) ) )
+            s += _T( ":" );
+
+        if ( s.Contains( _T( "," ) ) || s.Contains( _T( "." ) ) )
+        {
+            double d;
+            s.Replace( _T( "," ),_T( "." ) );
+            s.ToDouble( &d );
+            int h = ( int ) d;
+            int m = ( 60*( d - h ) );
+            s = wxString::Format( _T( "%i:%i" ),h,m );
+
+        }
+
+        if ( row > 0 )
+        {
+            pre = dialog->m_gridMotorSails->GetCellValue( row-1,col );
+            wxStringTokenizer tkz( pre,_T( ":" ) );
+            tkz.GetNextToken().ToDouble( &hp );
+            tkz.GetNextToken().ToDouble( &mp );
+
+        }
+        else
+        {
+            hp = 0;
+            mp = 0;
+        }
+
+        cur = s;
+        wxStringTokenizer tkz1( cur,_T( ":" ) );
+        tkz1.GetNextToken().ToDouble( &hc );
+        tkz1.GetNextToken().ToDouble( &mc );
+
+        hc_ = hc + ( ( mc*( 100.0/60.0 ) )/100 );
+        hp_ = hp + ( ( mp*( 100.0/60.0 ) )/100 );
+
+        res = hc_ - hp_;
+
+        if ( row == 0 || res <= 0.0 )
+            dialog->m_gridMotorSails->SetCellValue( row,col-1,wxString::Format( _T( "00:00 %s" ),opt->motorh.c_str() ) );
+        else
+            dialog->m_gridMotorSails->SetCellValue( row,col-1,decimalToHours( res,false ) );
+
+        dialog->m_gridMotorSails->SetCellValue( row,col,  decimalToHours( hc_,true ) );
+
+        if ( row < dialog->m_gridMotorSails->GetNumberRows()-1 )
+            computeCell( grid,row+1,col-1,dialog->m_gridMotorSails->GetCellValue( row+1,col-1 ),true );
+        if ( row == dialog->m_gridGlobal->GetNumberRows()-1 )
+            dialog->maintenance->checkService( row );
+    }
+    else if ( grid == 2 && ( ( col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
+                               col == LogbookHTML::GENE  || col == LogbookHTML::WATERM )  && !s.IsEmpty() ) )
+    {
+        double watermaker;
+        opt->watermaker.ToDouble( &watermaker );
+
+        bool t = false;
+        wxString sep;
+
+        if ( s.Contains( _T( "." ) ) )
+        {
+            t = true;
+            sep = _T( "." );
+        }
+        if ( s.Contains( _T( "," ) ) )
+        {
+            t = true;
+            sep = _T( "," );
+        }
+        if ( s.Contains( _T( ":" ) ) )
+        {
+            t = true;
+            sep = _T( ":" );
+        }
+
+        if ( true != t )
+            s.Append( _T( ":0" ) );
+
+        wxStringTokenizer tkz( s,sep );
+        wxString h = tkz.GetNextToken();
+        wxString m = wxEmptyString;
+        if ( tkz.HasMoreTokens() )
+            m = tkz.GetNextToken();
+
+        if ( wxAtoi( m ) > 59 )
+        {
+            wxMessageBox( _( "Minutes greater than 59" ),_T( "" ) );
+            dialog->logGrids[grid]->SetCellValue( row,col,_T( "00:00" ) );
+            return;
+        }
+        else
+        {
+            s = wxString::Format( _T( "%s:%s" ),h.c_str(),m.c_str() );
+            s = wxString::Format( _T( "%s %s" ),s.c_str(),opt->motorh.c_str() );
+            dialog->logGrids[grid]->SetCellValue( row,col,s );
+            computeCell( grid, row, col,s, true );
+            if ( row == dialog->m_gridGlobal->GetNumberRows()-1 )
+                dialog->maintenance->checkService( row );
+            if ( col == LogbookHTML::WATERM )
+            {
+                wxString t = dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::WATERM );
+                wxStringTokenizer tkz( t,_T( ":" ) );
+                double h,m;
+                tkz.GetNextToken().ToDouble( &h );
+                tkz.GetNextToken().ToDouble( &m );
+                h = h + ( m*( 100/60 )/100 );
+                double output = watermaker * h;
+                dialog->m_gridMotorSails->SetCellValue( row,LogbookHTML::WATERMO,wxString::Format( _T( "+%2.2f %s" ),output,opt->vol.c_str() ) );
+                computeCell( grid,row,LogbookHTML::WATERMO, dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::WATERMO ),false );
+            }
+        }
+    }
+
+    else if ( grid == 2 && ( col == LogbookHTML::FUELT || col == LogbookHTML::WATERT ||
+                             col == LogbookHTML::BANK1T || col == LogbookHTML::BANK2T ) && !s.IsEmpty() )
+    {
+        double div = 1.0;
+        long capacity;
+        wxString ap;
+        double t,c;
+        wxString ind;
+
+        if ( col == LogbookHTML::BANK1T || col == LogbookHTML::BANK2T )
+            ap = opt->ampereh;
+        else
+            ap = opt->vol;
+
+        if ( row > 0 )
+            dialog->m_gridMotorSails->GetCellValue( row-1,col ).ToDouble( &t );
+        else
+        {
+            t = 0;
+            c = 0;
+        }
+        dialog->m_gridMotorSails->GetCellValue( row,col ).ToDouble( &c );
+
+        if ( s.Contains( _T( "/" ) ) )
+        {
+            double a,b;
+            wxStringTokenizer tkz( s,_T( "/" ) );
+            tkz.GetNextToken().ToDouble( &a );
+            tkz.GetNextToken().ToDouble( &b );
+            div = a/b;
+            if ( col == LogbookHTML::FUELT )
+                opt->fuelTank.ToLong( &capacity );
+            else if ( col == LogbookHTML::BANK1T )
+                opt->bank1.ToLong( &capacity );
+            else if ( col == LogbookHTML::BANK2T )
+                opt->bank2.ToLong( &capacity );
+            else
+                opt->waterTank.ToLong( &capacity );
+
+            c = capacity*div;
+        }
+
+        s.Replace( _T( "," ),_T( "." ) );
+        ind = ( c < t )?_T( "-" ):_T( "+" );
+
+        if ( row != 0 )
+            dialog->m_gridMotorSails->SetCellValue( row,col-1,wxString::Format( _T( "%s%.2f %s" ),ind.c_str(),fabs( t-c ),ap.c_str() ) );
+        else
+            dialog->m_gridMotorSails->SetCellValue( row,col-1,wxString::Format( _T( "%s0.00 %s" ),ind.c_str(),ap.c_str() ) );
+
+        dialog->m_gridMotorSails->SetCellValue( row,col,wxString::Format( _T( "%.2f %s" ),c,ap.c_str() ) );
+
+        int x;
+        if ( col == LogbookHTML::WATERT )
+            x = 2;
+        else
+            x =1;
+        if ( row < dialog->m_gridMotorSails->GetNumberRows()-1 )
+            computeCell( grid,row+1,col-x,dialog->m_gridMotorSails->GetCellValue( row+1,col-x ),false );
+
+        dialog->maintenance->checkService( row );
+    }
+    else if ( grid == 2 && ( col == LogbookHTML::FUEL    || col == LogbookHTML::WATER ||
+                             col == LogbookHTML::WATERMO || col == LogbookHTML::BANK1 || col == LogbookHTML::BANK2 ) && !s.IsEmpty() )
+    {
+        wxChar ch;
+        wxString ap;
+
+        if ( col == LogbookHTML::BANK1 || col == LogbookHTML::BANK2 )
+            ap = opt->ampereh;
+        else
+            ap = opt->vol;
+
+        s.Replace( _T( "," ),_T( "." ) );
+        if ( col != LogbookHTML::WATERMO )
+            ch = s.GetChar( 0 );
+        else
+            ch = '+';
+
+        s = wxString::Format( _T( "%.2f %s" ),wxAtof( s ),ap.c_str() );
+        s.Replace( _T( "." ),dialog->decimalPoint );
+
+        if ( ch != '-' && ch != '+' )
+            dialog->logGrids[grid]->SetCellValue( row,col,_T( "-" )+s );
+        else
+        {
+            if ( ch == '+' )
+                dialog->logGrids[grid]->SetCellValue( row,col,wxString( ch )+s );
+            else
+                dialog->logGrids[grid]->SetCellValue( row,col,s );
+        }
+
+        computeCell( grid, row, col,s, false );
+        dialog->maintenance->checkService( row );
+    }
+    return;
+}
+
+void Logbook::deleteRows()
+{
+    wxArrayInt rows;
+    unsigned int rowsCount;
+    int tab = dialog->m_notebook8->GetSelection();
+
+    rows = dialog->logGrids[tab]->GetSelectedRows();
+    rowsCount = rows.GetCount();
+
+    if ( rowsCount == 0 ) // complete grid
+    {
+        wxGridCellCoordsArray art = dialog->logGrids[tab]->GetSelectionBlockTopLeft();
+        wxGridCellCoordsArray arb = dialog->logGrids[tab]->GetSelectionBlockBottomRight();
+        int start = art[0].GetRow();
+        int end = arb[0].GetRow();
+        for ( int grid = 0; grid < LOGGRIDS; grid++ )
+        {
+            dialog->logGrids[grid]->DeleteRows( start,( end-start )+1 );
+            dialog->logGrids[grid]->ForceRefresh();
+        }
+
+        if ( start == dialog->m_gridGlobal->GetNumberRows()-1 )
+            start--;
+
+        if ( dialog->logGrids[tab]->GetNumberRows() != 0 )
+        {
+            dialog->selGridRow = start;
+            dialog->logGrids[tab]->SetGridCursor( start,0 );
+            recalculateLogbook( start );
+        }
+        else
+        {
+            dialog->selGridRow = 0;
+        }
+        modified = true;
+        return;
+    }
+
+    bool sort = true;
+    if ( rowsCount > 1 )
+    {
+        while ( sort )
+        {
+            sort = false;
+            for ( unsigned int i = 0; i < rowsCount-1; i++ )
+            {
+                if ( rows[i+1] > rows[i] )
+                {
+                    sort = true;
+                    int temp = rows[i];
+                    rows[i] = rows[i+1];
+                    rows[i+1] = temp;
+                }
+            }
+        }
+    }
 
-	float lln = dLon;
-	int lon_deg_int = (int)(lln / 100);
-	float lon_deg = lon_deg_int;
-	float lon_min = lln - (lon_deg * 100);
-	lon = lon_deg + (lon_min/60.);
-	if(iEast == West)
-		lon = -lon;
-	if(opt->traditional)
-		sLon = this->toSDMM(2,lon, false);
-	else
-		sLon = this->toSDMMOpenCPN(2,lon, true);
 
-	SetGPSStatus(true);
-	//	dialog->GPSTimer->Start(5000);
+    for ( int grid = 0; grid < LOGGRIDS; grid++ )
+    {
+        for ( unsigned int i = 0; i < rowsCount; i++ )
+            dialog->logGrids[grid]->DeleteRows( rows[i] );
+    }
+    dialog->selGridRow = rows[rowsCount-1]-1;
+    if ( dialog->logGrids[tab]->GetNumberRows() > 0 )
+        dialog->logGrids[tab]->SetGridCursor( rows[rowsCount-1]-1,0 );
 
-	if(opt->everySM)
-		checkDistance();
+    modified = true;
+    if ( dialog->logGrids[0]->GetNumberRows() > 0 )
+        recalculateLogbook( rows[rows.GetCount()-1]-1 );
 }
 
-void Logbook::newLogbook()
+wxString  Logbook::decimalToHours( double res,bool b )
 {
-	bool zero = false;
+    int h = ( int ) res;
+    double m = res - h;
+    m = m * ( 60.0/100.0 )*100;
 
-	if(data_locn != this->logbookData_actuell)
-		this->switchToActuellLogbook();
-
-	int i = wxMessageBox(_("Are you sure ?"),_("New Logbook"),wxYES_NO );
-	if(i == wxNO)
-	{ 	dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus(); return;}
-
-	i = wxMessageBox(_("Reset all Values to zero ?"),_T(""),wxYES_NO );
-	if(i == wxYES)
-		zero = true;
-
-	if(dialog->m_gridGlobal->GetNumberRows() <= 0)
-	{
-		wxMessageBox(_("Your Logbook has no lines ?"),_("New Logbook"),wxOK );
-		return;
-	}
-
-	update();
-
-	wxFileName fn = data_locn;
-	wxString temp = fn.GetPath();
-	dialog->appendOSDirSlash(&temp);
-	wxString sn;
-	wxString ss = wxDateTime::Now().FormatISOTime();
-	ss.Replace(_T(":"),_T("_"));
-	ss = wxString::Format(_T("until_%s_%s_logbook.txt"),wxDateTime::Now().FormatISODate().c_str(),ss.c_str());
-	sn = temp+ss;
-
-	wxCopyFile(data_locn,sn);
-
-	wxArrayString s;
-	for(int i = 0; i < dialog->numPages; i++)
-	{
-		for(int n = 0; n < dialog->logGrids[i]->GetNumberCols(); n++)
-		{
-			s.Add(dialog->logGrids[i]->GetCellValue(dialog->logGrids[i]->GetNumberRows()-1,n));
-		}
-	}
-
-	logbookFile->Open();
-	logbookFile->Clear();
-	logbookFile->Write();
-	logbookFile->Close();
-
-	clearAllGrids();
-
-	int offset = 0;
-	dialog->selGridRow = 0;
-	for(int i = 0; i < dialog->numPages; i++)
-	{
-		if(zero) break;
-		dialog->logGrids[i]->AppendRows();
-		if(i > 0) offset += dialog->logGrids[i-1]->GetNumberCols();
-
-		for(int n = 0; n < dialog->logGrids[i]->GetNumberCols(); n++)
-		{
-			dialog->logGrids[i]->SetCellValue(0,n,s[n+offset]);
-		}
-	}
-	if(!zero)
-	{
-		dialog->logGrids[0]->SetCellValue(0,13,_("Last line from Logbook\n")+ss);
-		dialog->logGrids[0]->SetCellValue(0,6,dialog->logGrids[0]->GetCellValue(0,6));
-		wxString t = _T("0.00 ")+opt->distance;
-		dialog->logGrids[0]->SetCellValue(0,5,t);
-	}
-	else
-	{
-		appendRow(true, false);
-		dialog->logGrids[0]->SetCellValue(0,13,_("Last Logbook is\n")+ss);
-	}
-
-	update();
-
-	dialog->setEqualRowHeight(0);
-	setCellAlign(0);
-	dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus();
+    wxString fmt = ( b )?_T( "%05i:%02.0f %s" ):_T( "%02i:%02.0f %s" );
+    wxString str =  wxString::Format( fmt,h,m,opt->motorh.c_str() );
+    return str;
 }
 
-void Logbook::selectLogbook()
+wxString Logbook::computeCell( int grid, int row, int col, wxString s, bool mode )
 {
-	wxString path(*dialog->pHome_Locn);
-	path = path + _T("data");
+    double current = 0, last = 0.0;
+    long hourCur=0, minCur=0 ,hourLast=0, minLast = 0;
+    int count;
+    wxString cur;
+    wxString abrev;
 
-	update();
-	SelectLogbook selLogbook(dialog,path);
+    s.Replace( _T( "," ),_T( "." ) );
 
-	if(selLogbook.ShowModal() == wxID_CANCEL)
-	{
-		dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus();
-		return;
-	}
-
-	if(selLogbook.selRow == -1) { 	dialog->logGrids[dialog->m_logbook->GetSelection()]->SetFocus(); return; }
-
-	wxString s = selLogbook.files[selLogbook.selRow];
-
-	for(int i = 0; i < LOGGRIDS; i++)
-		if(dialog->logGrids[i]->GetNumberRows() != 0)
-			dialog->logGrids[i]->DeleteRows(0,dialog->logGrids[i]->GetNumberRows());
-
-	loadSelectedData(s);
-}
-
-void Logbook::loadSelectedData(wxString path)
-{
-	data_locn = path;
-	logbookFile = new wxTextFile(path);
-	setFileName(path,layout_locn);
-	wxFileName fn(path);
-	path = fn.GetName();
-	dialog->backupFile = path;
-	if(path == _T("logbook"))
-	{
-		path = _("Active Logbook");
-		oldLogbook = false;
-	}
-	else
-	{
-		wxDateTime dt = dialog->getDateTo(path);
-		path = wxString::Format(_("Old Logbook until %s"),dt.FormatDate().c_str()); 
-		oldLogbook = true;
-	}
-	title = path;
-	dialog->SetTitle(title);
-
-	loadData();
-}
-void Logbook::clearAllGrids()
-{
-	if(dialog->m_gridGlobal->GetNumberRows() > 0)
-	{
-		dialog->m_gridGlobal->DeleteRows(0,dialog->m_gridGlobal->GetNumberRows(),false);
-		dialog->m_gridWeather->DeleteRows(0,dialog->m_gridWeather->GetNumberRows(),false);
-		dialog->m_gridMotorSails->DeleteRows(0,dialog->m_gridMotorSails->GetNumberRows(),false);
-	}
-}
+    if ( col == DISTANCE )
+        abrev = opt->distance;
+    else if ( col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
+              col == LogbookHTML::GENE || col == LogbookHTML::WATERM )
+        abrev = opt->motorh;
+    else if ( col == LogbookHTML::FUEL || col == LogbookHTML::WATER ||
+              col == LogbookHTML::WATERMO )
+        abrev = opt->vol;
+    else if ( col == LogbookHTML::BANK1 || col == LogbookHTML::BANK2 )
+        abrev = opt->ampereh;
 
-void Logbook::loadData()
-{
-	wxString s = _T(""),t;
-	wxString nullhstr = _T("00:00");
-	double nullval = 0.0;
-	wxString dateFormat;
-
-	dialog->selGridCol = dialog->selGridRow = 0;
-	if(title.IsEmpty())
-		title = _("Active Logbook");
-
-	clearAllGrids();
-
-	int row = 0;
-
-	/** make a backup of 0.910 */
-	wxString sep = wxFileName::GetPathSeparator();
-	wxString source = *dialog->pHome_Locn +_T("data") + sep;
-	wxString dest   = *dialog->pHome_Locn +_T("data") + sep + _T("910_Backup");
-
-	wxFileInputStream input1( data_locn );
-	wxTextInputStream* stream1 = new wxTextInputStream (input1);
-
-	t = stream1->ReadLine();
-	if(t.IsEmpty()) return; // first install only
-	if(t.Contains(_T("#1.2#")))
-	{
-		dateFormat = t;
-		t = stream1->ReadLine();
-	}
-	else
-	{
-		wxArrayString files;
-
-		wxDir dir;
-		wxString path = dialog->data;
-		wxString dest = path+_T("Backup_1_1");
-		wxDir destDir(dest);
-
-		if(!wxDir::Exists(dest))
-			::wxMkdir(dest);
-
-		wxMessageBox(wxString::Format(_("Start converting to new Date/Time-Format\nand backup all datafiles from version 1.1 to\n\n%s"),dest.c_str()));
-
-		dir.GetAllFiles(path,&files,_T("*.txt"),wxDIR_FILES);
-		dest += wxFileName::GetPathSeparator();
-
-		for(unsigned int i = 0; i < files.Count(); i++)
-		{   
-			wxFileName fn(files[i]);
-			::wxCopyFile(path+fn.GetFullName(),dest+fn.GetFullName());
-		}
-
-		convertTo_1_2();
-	}
-	wxStringTokenizer tkz(t, _T("\t"),wxTOKEN_RET_EMPTY );
-
-	if(tkz.CountTokens() == 33 && !wxDir::Exists(dest))
-	{
-		::wxMkdir(dest);
-		wxArrayString files;
-		wxDir dir;
-		dir.GetAllFiles(source.RemoveLast(),&files,_T("*.txt"),wxDIR_FILES);
-		for(unsigned int i = 0; i < files.Count(); i++)
-		{
-			wxFileName fn(files[i]);
-			::wxCopyFile(files[i],dest+sep+fn.GetFullName(),true);
-		}
-	}
-
-	/***************************/
-
-	wxFileInputStream input( data_locn );
-	wxTextInputStream* stream = new wxTextInputStream (input, _T("\n"),wxConvUTF8);
-
-	wxString firstrow = stream->ReadLine(); // for #1.2#
-	wxStringTokenizer first(firstrow, _T("\t"),wxTOKEN_RET_EMPTY );
-	first.GetNextToken();
-	logbookDescription = first.GetNextToken();
-
-	wxDateTime dt;
-	int month = 0,day = 0,year = 0,hour = 0,min = 0,sec = 0;
-	dialog->m_gridGlobal->BeginBatch();
-	dialog->m_gridWeather->BeginBatch();
-	dialog->m_gridMotorSails->BeginBatch();
-	int lines = 0;
-	while( !(t = stream->ReadLine()).IsEmpty())
-	{
-		if(input.Eof()) break;
-		lines++;
-		dialog->m_gridGlobal->AppendRows();
-		dialog->m_gridWeather->AppendRows();
-		dialog->m_gridMotorSails->AppendRows();
-
-		setCellAlign(row);
-
-		wxStringTokenizer tkz(t, _T("\t"),wxTOKEN_RET_EMPTY );
-		int c = 0;
-		int fields =  tkz.CountTokens();
-
-		while ( tkz.HasMoreTokens() )
-		{
-			s = dialog->restoreDangerChar(tkz.GetNextToken());
-			s.RemoveLast();
-
-			switch(c)
-			{
-			case 0:		dialog->m_gridGlobal->SetCellValue(row,ROUTE,s);
-				break;
-			case 1:		month = wxAtoi(s);
-				break;
-			case 2:     day = wxAtoi(s);
-				break;
-			case 3:		year = wxAtoi(s);
-				if(month >= 0 && day != 0 && year != 0)
-				{
-					dt.Set(day,(wxDateTime::Month)month,year);
-					dialog->m_gridGlobal->SetCellValue(row,RDATE,dt.Format(opt->sdateformat));
-				}
-				break;
-			case 4:		if(s.IsEmpty())
-							hour = -1;
-						else
-							hour = wxAtoi(s);
-				break;
-			case 5:		if(s.IsEmpty())
-							min = -1;
-						else
-							min = wxAtoi(s);
-				break;
-			case 6:		if(hour == -1 || min == -1) continue;
-						sec = wxAtoi(s);
-						dt.Set(hour,min,sec);
-						dialog->m_gridGlobal->SetCellValue(row,RTIME,dt.Format(opt->stimeformat));
-				break;
-			case 7:		dialog->m_gridGlobal->SetCellValue(row,STATUS,s);
-				break;
-			case 8:		dialog->m_gridGlobal->SetCellValue(row,WAKE,s);
-				break;
-			case 9:		dialog->m_gridGlobal->SetCellValue(row,DISTANCE,s);
-				break;
-			case 10:	dialog->m_gridGlobal->SetCellValue(row,DTOTAL,s);
-				dialog->m_gridGlobal->SetReadOnly(row,DTOTAL);
-				break;
-			case 11:
-				dialog->m_gridGlobal->SetCellValue(row,POSITION,s);
-				break;
-			case 12:
-				dialog->m_gridGlobal->SetCellValue(row,COG,s);
-				break;
-			case 13:	dialog->m_gridGlobal->SetCellValue(row,COW,s);
-				break;
-			case 14:	dialog->m_gridGlobal->SetCellValue(row,SOG,s);
-				break;
-			case 15:	dialog->m_gridGlobal->SetCellValue(row,SOW,s);
-				break;
-			case 16:	dialog->m_gridGlobal->SetCellValue(row,DEPTH,s);
-				break;
-			case 17:
-				dialog->m_gridGlobal->SetCellValue(row,REMARKS,s);
-				break;
-			case 18:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::BARO,s);
-				break;
-			case 19:
-				dialog->m_gridWeather->SetCellValue(row,LogbookHTML::WIND,s);
-				break;
-			case 20:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::WSPD,s);
-				break;
-			case 21:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::CURRENT,s);
-				break;
-			case 22:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::CSPD,s);
-				break;
-			case 23:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::WAVE,s);
-				break;
-			case 24:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::SWELL,s);
-				break;
-			case 25:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::WEATHER,s);
-				break;
-			case 26:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::CLOUDS,s);
-				break;
-			case 27:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::VISIBILITY,s);
-				break;
-			case 28:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::MOTOR,s);
-				break;
-			case 29:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::MOTORT,s);
-				break;
-			case 30:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::FUEL,s);
-				break;
-			case 31:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::FUELT,s);
-				break;
-			case 32:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::SAILS,s);
-				break;
-			case 33:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::REEF,s);
-				break;
-			case 34:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATER,s);
-				break;
-			case 35:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERT,s);
-				break;
-
-			case 36:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::MREMARKS,s);
-				break;
-			case 37:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::HYDRO,s);
-				break;
-			case 38:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::AIRTE,s);
-				break;
-			case 39:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::WATERTE,s);
-				break;
-			case 40:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::MOTOR1,s);
-				break;
-			case 41:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::MOTOR1T,s);
-				break;
-			case 42:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::GENE,s);
-				break;
-			case 43:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::GENET,s);
-				break;
-			case 44:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK1,s);
-				break;
-			case 45:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK1T,s);
-				break;
-			case 46:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK2,s);
-				break;
-			case 47:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK2T,s);
-				break;
-			case 48:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERM,s);
-				break;
-			case 49:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERMT,s);
-				break;
-			case 50:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERMO,s);
-				break;
-			case 51:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::ROUTEID,s);
-				break;
-			case 52:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::TRACKID,s);
-				break;
-			case 53:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::RPM1,s);
-				break;
-			case 54:	dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::RPM2,s);
-				break;
-			case 55:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::WINDR,s);
-				break;
-			case 56:	dialog->m_gridWeather->SetCellValue(row,LogbookHTML::WSPDR,s);
-				//    int in =  0;
-				break;
-			}			
-			c++;
-		}
-		wxString temp = dialog->m_gridGlobal->GetCellValue(row,DISTANCE);
-		temp.Replace(_T(","),_T("."));
-		double dist = wxAtof(temp);
-		if((dialog->m_gridGlobal->GetCellValue(row,STATUS) == wxEmptyString || 
-			dialog->m_gridGlobal->GetCellValue(row,STATUS).GetChar(0) == ' ') && dist > 0)
-			dialog->m_gridGlobal->SetCellValue(row,STATUS,_T("S"));
-
-		if(fields < 50) // data from 0.910 ? need zero-values to calculate the columns 
-		{
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::MOTOR1, wxString::Format(_T("%s %s"),nullhstr.c_str(),opt->motorh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::MOTOR1T,wxString::Format(_T("%s %s"),nullhstr.c_str(),opt->motorh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::GENE,   wxString::Format(_T("%s %s"),nullhstr.c_str(),opt->motorh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::GENET,  wxString::Format(_T("%s %s"),nullhstr.c_str(),opt->motorh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK1,  wxString::Format(_T("%2.2f %s"),nullval,opt->ampereh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK1T, wxString::Format(_T("%2.2f %s"),nullval,opt->ampereh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK2,  wxString::Format(_T("%2.2f %s"),nullval,opt->ampereh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::BANK2T, wxString::Format(_T("%2.2f %s"),nullval,opt->ampereh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERM, wxString::Format(_T("%s %s"),nullhstr.c_str(),opt->motorh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERMT,wxString::Format(_T("%s %s"),nullhstr.c_str(),opt->motorh.c_str()));
-			dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERMO,wxString::Format(_T("%2.2f %s"),nullval,opt->vol.c_str()));
-		}
-
-		dialog->setEqualRowHeight(row);
-		row++;
-	}
-
-	dialog->selGridRow = 0; dialog->selGridCol = 0;
-
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		dialog->logGrids[i]->Refresh();
-		row = dialog->logGrids[i]->GetNumberRows()-1;
-		dialog->logGrids[i]->MakeCellVisible(row,0);
-		dialog->logGrids[i]->SetGridCursor(0,0);
-	}
-
-	dialog->m_gridGlobal->EndBatch();
-	dialog->m_gridWeather->EndBatch();
-	dialog->m_gridMotorSails->EndBatch();
-
-	if(!oldLogbook && lines >= 500)
-	{
-		wxString str = wxString::Format(sLinesReminder,lines);
-		LinesReminderDlg *dlg = new LinesReminderDlg(str,dialog);
-		dlg->Show();
-	}
-}
-
-wxString Logbook::makeDateFromFile(wxString date, wxString dateformat)
-{
-	wxStringTokenizer tkzd(date,_T("/"));
-	wxDateTime dt;
-	wxDateTime::wxDateTime_t month = (wxDateTime::wxDateTime_t) wxAtoi(tkzd.GetNextToken());
-	wxDateTime::wxDateTime_t day    = (wxDateTime::wxDateTime_t) wxAtoi(tkzd.GetNextToken());
-	wxDateTime::wxDateTime_t year   = (wxDateTime::wxDateTime_t) wxAtoi(tkzd.GetNextToken());
-	dt.Set(day, month, year);
-
-	return dt.Format(dateformat);
-}
-
-wxString Logbook::makeWatchtimeFromFile(wxString time, wxString timeformat)
-{
-	wxStringTokenizer tkzt(time,_T(","));
-	wxDateTime dts,dte;
-	wxDateTime::wxDateTime_t hours = (wxDateTime::wxDateTime_t) wxAtoi(tkzt.GetNextToken());
-	wxDateTime::wxDateTime_t mins  = (wxDateTime::wxDateTime_t) wxAtoi(tkzt.GetNextToken());
-	wxDateTime::wxDateTime_t houre = (wxDateTime::wxDateTime_t) wxAtoi(tkzt.GetNextToken());
-	wxDateTime::wxDateTime_t mine  = (wxDateTime::wxDateTime_t) wxAtoi(tkzt.GetNextToken());
-	dts.Set(hours,mins);
-	dte.Set(houre,mine);
 
-	return dts.Format(timeformat)+_T("-")+dte.Format(timeformat);
-}
+    count = dialog->m_gridGlobal->GetNumberRows();
 
-void Logbook::convertTo_1_2()
-{
-	wxString path = dialog->data;
-	wxArrayString files;
-	wxDir dir;
-	int dtformat = opt->dateformat;
-	int timeFormat = opt->timeformat;
-	wxDateTime dt = wxDateTime::Now();
-	bool b = true;
-
-	wxString datePattern = LogbookDialog::datePattern;
-	opt->dateformat = 0;
-	opt->timeformat = 1;
-
-	opt->setDateFormat();
-	opt->setTimeFormat(1);
-
-	update();
-
-	dir.GetAllFiles(path,&files,_T("*logbook*.txt"),wxDIR_FILES);
-
-	for(unsigned int i = 0; i < files.Count(); i++)
-	{
-		wxFileName fn(files[i]);
-		wxFileInputStream stream( path + fn.GetFullName() );
-		wxTextInputStream* in = new wxTextInputStream (stream,_T("\n"),wxConvUTF8);
-		wxFileOutputStream stream1( path + fn.GetFullName() + _T("_") );
-		wxTextOutputStream* out = new wxTextOutputStream (stream1,wxEOL_NATIVE,wxConvUTF8);
-
-		int l = 0;
-
-		while(true)
-		{
-			wxString s = in->ReadLine();
-			if(stream.Eof() || s.IsEmpty()) break;
-
-			wxStringTokenizer tkz(s,_T("\t"));
-			tkz.GetNextToken();
-			wxString d = tkz.GetNextToken();
-			b  = LogbookDialog::myParseDate(d,dt);
-			s.Replace(d,wxString::Format(_T("%i \t%i \t%i "),dt.GetMonth(),dt.GetDay(),dt.GetYear()));
-			wxString t = tkz.GetNextToken();
-			LogbookDialog::myParseTime(t,dt);
-			s.Replace(t,wxString::Format(_T("%i \t%i \t%i "),dt.GetHour(),dt.GetMinute(),dt.GetSecond()));
-
-			if(l == 0) *out << _T("#1.2#\n");
-			l++;
-			*out << s+_T("\n");
-		}
-		stream1.Close();
-		if(b)
-		{
-			::wxCopyFile(path + fn.GetFullName() + _T("_"), path + fn.GetFullName() );
-			::wxRemoveFile(path + fn.GetFullName() + _T("_"));
-		}
-	}
-
-	wxString m = _T("service.txt");
-	wxFileInputStream streams( path + m );
-	wxTextInputStream* in = new wxTextInputStream (streams,_T("\n"),wxConvUTF8);
-	wxFileOutputStream stream2( path + m + _T("_") );
-	wxTextOutputStream* out = new wxTextOutputStream (stream2,wxEOL_NATIVE,wxConvUTF8);
-
-	int l = 0;
-	while(true)
-	{
-		int i = 0;
-		wxString tmp;
-		wxString s = in->ReadLine();
-		if(streams.Eof() || s.IsEmpty()) break;
-
-		wxStringTokenizer tkz(s,_T("\t"));
-		tkz.GetNextToken(); tkz.GetNextToken();
-		wxString d = tkz.GetNextToken();
-		d.RemoveLast();
-		for(i = 0; i < dialog->maintenance->m_choicesCount; i++)
-		{
-			if(d == dialog->maintenance->m_choices[i])
-				break;
-		}
-
-		if(i == 8)
-		{
-			tmp = tkz.GetNextToken();
-			tmp.RemoveLast();
-			LogbookDialog::myParseDate(tmp,dt);
-			s.Replace(tmp,wxString::Format(_T("%i/%i/%i"),dt.GetMonth(),dt.GetDay(),dt.GetYear()));
-			tmp = tkz.GetNextToken();
-			LogbookDialog::myParseDate(tmp,dt);
-			s.Replace(tmp,wxString::Format(_T("%i/%i/%i"),dt.GetMonth(),dt.GetDay(),dt.GetYear()));
-		}
-		else if( i > 8)
-		{
-			tmp = tkz.GetNextToken();
-			tmp = tkz.GetNextToken();
-			tmp = tkz.GetNextToken();
-			tmp.RemoveLast();
-			if(!tmp.IsEmpty())
-			{
-				LogbookDialog::myParseDate(tmp,dt);
-				s.Replace(tmp,wxString::Format(_T("%i\t%i\t%i"),dt.GetMonth(),dt.GetDay(),dt.GetYear()));
-			}
-		}
-		if(l == 0) *out << _T("#1.2#\n");
-		l++;
-		*out << s+_T("\n");
-	}
-	stream2.Close();
-	if(b)
-	{
-		::wxCopyFile(path + m + _T("_"), path + m );
-		::wxRemoveFile(path + m + _T("_"));
-	}
-
-	m = _T("crewlist.txt");
-	wxFileInputStream streamc(path + m );
-	in = new wxTextInputStream (streamc,_T("\n"),wxConvUTF8);
-	wxFileOutputStream stream3( path + m + _T("_") );
-	out = new wxTextOutputStream (stream3,wxEOL_NATIVE,wxConvUTF8);
-
-	l = 0;
-	while(true)
-	{
-		wxString tmp;
-		wxString s = in->ReadLine();
-		if(streamc.Eof() || s.IsEmpty()) break;
-
-		wxStringTokenizer tkz(s,_T("\t"));
-		tkz.GetNextToken(); tkz.GetNextToken(); tkz.GetNextToken(); tkz.GetNextToken(); tkz.GetNextToken();
-		wxString d = tkz.GetNextToken();
-		if(!d.IsEmpty() && d.GetChar(0) != ' ')
-		{
-			d.RemoveLast();
-			tmp = d;
-			LogbookDialog::myParseDate(d,dt);
-			s.Replace(tmp,wxString::Format(_T("%i/%i/%i"),dt.GetMonth(),dt.GetDay(),dt.GetYear()));
-		}
-		tkz.GetNextToken();tkz.GetNextToken();tkz.GetNextToken();tkz.GetNextToken();
-		d = tkz.GetNextToken();
-		if(!d.IsEmpty() && d.GetChar(0) != ' ')
-		{
-			d.RemoveLast();
-			tmp = d;
-			LogbookDialog::myParseDate(d,dt);
-			s.Replace(tmp,wxString::Format(_T("%i/%i/%i"),dt.GetMonth(),dt.GetDay(),dt.GetYear()));
-		}
-		if(l == 0) *out << _T("#1.2#\n");
-		l++;
-		*out << s+_T("\n");
-	}
-	stream3.Close();
-
-	::wxCopyFile(path + m + _T("_"), path + m );
-	::wxRemoveFile(path + m + _T("_"));
-
-	m = _T("boat.txt");
-	wxFileInputStream streamb( path + m );
-	in = new wxTextInputStream (streamb,_T("\n"),wxConvUTF8);
-	wxFileOutputStream stream4( path + m + _T("_") );
-	out = new wxTextOutputStream (stream4,wxEOL_NATIVE,wxConvUTF8);
-
-	l = 0;
-	while(true)
-	{
-		wxString tmp;
-		wxString s = in->ReadLine();
-		if(streamb.Eof() || s.IsEmpty()) break;
-
-		wxStringTokenizer tkz(s,_T("\t"));
-		for(int x = 0; x < 18; x++)
-			tkz.GetNextToken();
-		wxString d = tkz.GetNextToken();
-		if(!d.IsEmpty() && d.GetChar(0) != ' ')
-		{
-			d.RemoveLast();
-			tmp = d;
-			LogbookDialog::myParseDate(d,dt);
-			s.Replace(tmp,wxString::Format(_T("%i/%i/%i"),dt.GetMonth(),dt.GetDay(),dt.GetYear()));
-		}
-
-		if(l == 0) *out << _T("#1.2#\n");
-		l++;
-		*out << s+_T("\n");
-	}
-	stream4.Close();
-
-	::wxCopyFile(path + m + _T("_"), path + m );
-	::wxRemoveFile(path + m + _T("_"));
-
-	opt->dateformat = dtformat;
-	opt->timeformat = timeFormat;
-	opt->setDateFormat();
-	opt->setTimeFormat(opt->timeformat);
-}
-
-void Logbook::setCellAlign(int i)
-{
-	dialog->m_gridGlobal->SetCellAlignment    (i,ROUTE, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridGlobal->SetCellAlignment    (i,RDATE, wxALIGN_CENTRE, wxALIGN_TOP);
-	dialog->m_gridGlobal->SetCellAlignment    (i,RTIME, wxALIGN_CENTRE, wxALIGN_TOP);
-	dialog->m_gridGlobal->SetCellAlignment    (i,STATUS, wxALIGN_CENTRE, wxALIGN_TOP);
-	dialog->m_gridGlobal->SetCellAlignment    (i,WAKE, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridGlobal->SetCellAlignment    (i,REMARKS, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridWeather->SetCellAlignment   (i,WEATHER, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridWeather->SetCellAlignment   (i,CLOUDS, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridWeather->SetCellAlignment   (i,VISIBILITY, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridMotorSails->SetCellAlignment(i,LogbookHTML::SAILS, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridMotorSails->SetCellAlignment(i,LogbookHTML::REEF, wxALIGN_LEFT, wxALIGN_TOP);
-	dialog->m_gridMotorSails->SetCellAlignment(i,LogbookHTML::MREMARKS, wxALIGN_LEFT, wxALIGN_TOP);
-
-	dialog->m_gridGlobal->SetReadOnly(i,POSITION,true);
-}
-
-void Logbook::switchToActuellLogbook()
-{
-	dialog->selGridRow = 0; dialog->selGridCol = 0; 
-	logbookFile = new wxTextFile(logbookData_actuell);
-	data_locn = logbookData_actuell;
-	setFileName(logbookData_actuell,layout_locn);
-	dialog->SetTitle(_("Active Logbook"));	
-	loadData();
-}
-
-
-void Logbook::appendRow(bool showlastline, bool autoline)
-{
-	wxString s;
-
-	if(dialog->m_gridGlobal->IsSelection())
-		dialog->deselectAllLogbookGrids();
-
-	checkGPS(autoline);
-
-	if(noAppend) return;
-	modified = true;
-
-	wxFileName fn(logbookFile->GetName());
-	if(fn.GetName() != (_T("logbook")))
-	{
-
-		switchToActuellLogbook();
-		noAppend = true;
-		NoAppendDialog *x = new NoAppendDialog(dialog);
-		x->Show();
-
-		noAppend = false;
-		oldLogbook = false;
-	}
-
-	int lastRow = dialog->logGrids[0]->GetNumberRows();
-	if(lastRow >= 499)
-	{
-		static int repeat=lastRow;
-		//dialog->timer->Stop();
-		if(lastRow == repeat)
-		{
-			repeat += 50;
-			wxString str = wxString::Format(sLinesReminder,lastRow+1);
-			LinesReminderDlg* dlg = new LinesReminderDlg(str,dialog);
-			dlg->Show();
-
-			wxMessageBox(wxString::Format(_("Your Logbook has %i lines\n\n\
-			You should create a new logbook to minimize loadingtime."),lastRow),_("Information"));
-		}
-		//	dialog->logbookPlugIn->opt->timer = false;
-
-		/*	wxFileConfig *pConf = (wxFileConfig *)dialog->logbookPlugIn->m_pconfig;
-
-		if(pConf)
-		{
-		pConf->SetPath ( _T ( "/PlugIns/Logbook" ) );
-		pConf->Write ( _T( "Timer" ), dialog->logbookPlugIn->opt->timer );
-		}		
-		*/
-	}
-
-	for(int i = 0; i < dialog->numPages; i++ )
-		dialog->logGrids[i]->AppendRows();
-
-	if(lastRow > 0)
-	{
-		dialog->logGrids[0]->SetCellValue(lastRow,ROUTE,dialog->logGrids[0]->GetCellValue(lastRow-1,ROUTE));
-		//if(gpsStatus)
-		dialog->logGrids[0]->SetCellValue(lastRow,POSITION,sLat+sLon);
-		//else
-		//	dialog->logGrids[0]->SetCellValue(lastRow,POSITION,dialog->logGrids[0]->GetCellValue(lastRow-1,POSITION));
-		changeCellValue(lastRow, 0,0);
-		dialog->logGrids[0]->SetCellValue(lastRow,DTOTAL,dialog->logGrids[0]->GetCellValue(lastRow-1,DTOTAL));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTORT,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::MOTORT));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTOR1T,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::MOTOR1T));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::GENET,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::GENET));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::FUELT,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::FUELT));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::WATERT,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::WATERT));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::WATERMT,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::WATERMT));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::BANK1T,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::BANK1T));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::BANK2T,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::BANK2T));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::TRACKID,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::TRACKID));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::ROUTEID,dialog->logGrids[2]->GetCellValue(lastRow-1,LogbookHTML::ROUTEID));
-	}
-	else
-	{
-		dialog->logGrids[0]->SetCellValue(lastRow,ROUTE,_("unnamed Route"));
-		if(gpsStatus)
-			dialog->logGrids[0]->SetCellValue(lastRow,POSITION,sLat+sLon);
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::FUELT,opt->fuelTank.c_str());
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::WATERT,opt->waterTank.c_str());
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::BANK1T,opt->bank1.c_str());
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::BANK2T,opt->bank2.c_str());
-	}
-
-	if(sDate != _T(""))
-	{
-		dialog->logGrids[0]->SetCellValue(lastRow,RDATE,sDate);
-		dialog->logGrids[0]->SetCellValue(lastRow,RTIME,sTime);
-	}
-	else
-	{
-		if(!opt->UTC)
-			mCorrectedDateTime = wxDateTime::Now();
-		else
-			mCorrectedDateTime = wxDateTime::Now().ToUTC();
-		dialog->logGrids[0]->SetCellValue(lastRow,RDATE,mCorrectedDateTime.Format(opt->sdateformat));
-		dialog->logGrids[0]->SetCellValue(lastRow,RTIME,mCorrectedDateTime.Format(opt->stimeformat));
-	}
-
-	if(MOBIsActive)
-		dialog->logGrids[0]->SetCellValue(lastRow,REMARKS,_("*** MAN OVERBOARD ***\n"));
-	else
-		dialog->logGrids[0]->SetCellValue(lastRow,REMARKS,sLogText);
-
-	if(routeIsActive)
-	{
-		if(activeRoute != wxEmptyString)
-			dialog->logGrids[0]->SetCellValue(lastRow,ROUTE,activeRoute);
-
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::ROUTEID,activeRouteGUID);
-	}
-	else
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::ROUTEID,wxEmptyString);
-
-	if(trackIsActive)
-	{
-		if(!routeIsActive)
-			dialog->logGrids[0]->SetCellValue(lastRow,ROUTE,_("Track ")+activeTrack);
-
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::TRACKID,activeTrackGUID);
-	}
-	else
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::TRACKID,wxEmptyString);
-
-	dialog->logGrids[0]->SetCellValue(lastRow,COG,sCOG);
-	dialog->logGrids[0]->SetCellValue(lastRow,COW,sCOW);
-	dialog->logGrids[0]->SetCellValue(lastRow,SOG,sSOG);
-	dialog->logGrids[0]->SetCellValue(lastRow,SOW,sSOW);
-	dialog->logGrids[0]->SetCellValue(lastRow,DEPTH,sDepth);
-	dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::WATERTE,sTemperatureWater);
-	dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::WIND,sWindT);
-	dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::WSPD,sWindSpeedT);
-	dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::WINDR,sWindA);
-	dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::WSPDR,sWindSpeedA);
-	dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTOR,_T("00.00"));
-	dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTOR1,_T("00.00"));
-	dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::GENE,_T("00.00"));
-	dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::WATERM,_T("00.00"));
-	dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::WATERMO,_T("0"));
-	dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_T(" "));
-
-	if(wimdaSentence)
-	{
-		dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::AIRTE,sTemperatureAir);
-		dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::BARO,sPressure);
-		dialog->logGrids[1]->SetCellValue(lastRow,LogbookHTML::HYDRO,sHumidity);
-	}
-
-	if(bRPM1)
-	{
-		if(	!opt->engine1Running)
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Engine #1 started"));
-		else
-		{
-			if(opt->engineMessageRunning)
-				dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Engine #1 running"));
-			if(opt->NMEAUseERRPM || opt->toggleEngine1)
-			{
-				dtEngine1Off = wxDateTime::Now().Subtract(opt->dtEngine1On);
-				//wxMessageBox(dtEngine1Off.Format(_T("%H:%M:%S")));
-				opt->dtEngine1On = wxDateTime::Now();
-				dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTOR,dtEngine1Off.Format(_T("%H:%M")));
-				//			wxMessageBox(dtEngine1Off.Format(_T("%H:%M:%S")));
-			}
-		}
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::RPM1,sRPM1);
-	}
-	if(!bRPM1 && opt->engine1Running)
-	{
-		if(opt->NMEAUseERRPM || !opt->toggleEngine1)
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTOR,dtEngine1Off.Format(_T("%H:%M")));
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Engine #1 stopped"));
-	}
-	if(bRPM2)
-	{
-		if(	!opt->engine2Running)
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Engine #2 started"));
-		else
-		{
-			if(opt->engineMessageRunning)
-			{
-				if(dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).IsEmpty() || dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).GetChar(0) == ' ')
-					dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Engine #2 running"));
-				else
-					dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS)+_("\nEngine #2 running"));
-			}
-			if(opt->NMEAUseERRPM || engine2Manual)
-			{
-				dtEngine2Off = wxDateTime::Now().Subtract(opt->dtEngine2On);
-				opt->dtEngine2On = wxDateTime::Now();
-				dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTOR1,dtEngine2Off.Format(_T("%H:%M")));
-				//	wxMessageBox(dtEngine2Off.Format(_T("%H:%M:%S")));
-			}
-		}
-	}
-	if(!bRPM2 && opt->engine2Running)
-	{
-		if(opt->NMEAUseERRPM || !opt->toggleEngine2)
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MOTOR1,dtEngine2Off.Format(_T("%H:%M")));
-		if(dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).IsEmpty() || dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).GetChar(0) == ' ')
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Engine #2 stopped"));
-		else
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS)+_("\nEngine #2 stopped"));
-	}
-
-    if(bGEN)
+    for ( int i = row; i < count; i++ )
     {
-        if(	!opt->generatorRunning)
-            dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Generator started"));
-        else
+        if ( col != LogbookHTML::WATERMO && col != LogbookHTML::WATER && col != LogbookHTML::FUEL &&
+                col != LogbookHTML::BANK1   && col != LogbookHTML::BANK2 )
         {
-            if(opt->engineMessageRunning)
+            s = dialog->logGrids[grid]->GetCellValue( i,col );
+            s.Replace( _T( "," ),_T( "." ) );
+            if ( s == _T( "0000" ) ) s = _T( "00:00" );
+            if ( grid == 2 && ( col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
+                                col == LogbookHTML::GENE  || col == LogbookHTML::WATERM ) )
             {
-                if(dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).IsEmpty() || dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).GetChar(0) == ' ')
-                    dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Generator running"));
-                else
-                    dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS)+_("\nGenerator running"));
+                wxArrayString time = wxStringTokenize( s,_T( ":" ) );
+                time[0].ToLong( &hourCur );
+                time[1].ToLong( &minCur );
             }
-            if(opt->NMEAUseERRPM || generatorManual)
+            else
             {
-                dtGeneratorOff = wxDateTime::Now().Subtract(opt->dtGeneratorOn);
-                opt->dtGeneratorOn = wxDateTime::Now();
-                dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::GENE,dtGeneratorOff.Format(_T("%H:%M")));
-                //	wxMessageBox(dtEngine2Off.Format(_T("%H:%M:%S")));
+                s.ToDouble( &current );
             }
         }
-    }
-                                            
-    if(!bGEN && opt->generatorRunning)
-    {
-        if(opt->NMEAUseERRPM || !opt->toggleGenerator)
-            dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::GENE,dtGeneratorOff.Format(_T("%H:%M")));
-        if(dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).IsEmpty() || dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS).GetChar(0) == ' ')
-            dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,_("Generator stopped"));
         else
-            dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS)+_("\nGenerator stopped"));
-    }
-
-//	wxString sEngine = _T(" ")+opt->rpm+_T(" (")+opt->engine+_T(")");
-//	wxString sShaft =  _T(" ")+opt->rpm+_T(" (")+opt->shaft+_T(")");
-    wxString sEngine = _T(" (")+opt->engine+_T(")");
-    wxString sShaft =  _T(" (")+opt->shaft+_T(")");
-
-	if(!sRPM1.IsEmpty())
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::RPM1,sRPM1+sEngine+
-		((sRPM1Shaft.IsEmpty())? _T("") : _T("\n")+sRPM1Shaft+sShaft));
-	if(!sRPM2.IsEmpty())
-		dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::RPM2,sRPM2+sEngine+
-		((sRPM2Shaft.IsEmpty())? _T("") : _T("\n")+sRPM2Shaft+sShaft));
-
-	if(sailsMessage && opt->engineMessageSails)
-	{
-		wxString temp = dialog->logGrids[2]->GetCellValue(lastRow,LogbookHTML::MREMARKS);
-		if(temp.Len() == 1 && temp.GetChar(0) == ' ') temp.Remove(0,1);
-
-		if((oldSailsState == 0 || oldSailsState == -1) && sailsState == 1)
-		{
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,temp + ((temp.IsEmpty())?_T(""):_T("\n"))+_("Sails hoisted"));
-			oldSailsState = 1;
-		}
-		else if((oldSailsState == 1 || oldSailsState == -1) && sailsState == 1)
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,temp + ((temp.IsEmpty())?_T(""):_T("\n"))+_("Sails changed"));
-		else if((oldSailsState == 1 || oldSailsState == -1) && sailsState == 0)
-		{
-			dialog->logGrids[2]->SetCellValue(lastRow,LogbookHTML::MREMARKS,temp + ((temp.IsEmpty())?_T(""):_T("\n"))+_("Sails down"));
-			oldSailsState = 0;
-		}
-
-		sailsMessage = false;
-	}
-
-	if(ActuellWatch::active == true)
-		dialog->logGrids[0]->SetCellValue(lastRow,WAKE,ActuellWatch::member);
-
-	wxString sails = wxEmptyString;  unsigned int n = 0;
-	for(unsigned i = 0; i < 14; i++)
-	{
-		if(dialog->checkboxSails[i]->IsChecked())
-		{
-			sails += opt->sailsName.Item(i);
-			if(n == 1)
-			{
-				sails += _T("\n");
-				n = 0;
-			}
-			else
-			{
-				sails += _T(", ");
-				n++;
-			}
-		}
-	}
-
-	if(!sails.IsEmpty() && n == 1)
-		sails.RemoveLast(2);
-	else if(!sails.IsEmpty())
-		sails.RemoveLast(1);
-
-	dialog->m_gridMotorSails->SetCellValue(lastRow,LogbookHTML::SAILS,sails);
-
-	changeCellValue(lastRow, 0,1);
-	setCellAlign(lastRow);
-	dialog->setEqualRowHeight(lastRow);
-
-	dialog->m_gridGlobal->SetReadOnly(lastRow,6);
-
-	if(showlastline)
-	{
-		dialog->m_gridGlobal->MakeCellVisible(lastRow,0);
-		dialog->m_gridWeather->MakeCellVisible(lastRow,0);
-		dialog->m_gridMotorSails->MakeCellVisible(lastRow,0);
-	}
-}
-
-void Logbook::resetEngineManualMode(int enginenumber)
-{
-    /* engine number 0=all, 1=engine#1, 2=engine#2, 3=generator */
-    bool t = opt->bRPMCheck;
-    wxString    onOff[2];
-    onOff[0] = _(" off");
-    onOff[1] = _(" on");
-
-    if(enginenumber == 1 || enginenumber == 0)
-    {
-        parent->m_toggleBtnEngine1->SetValue(false);
-        opt->toggleEngine1 = false;
-        bRPM1 = false;
-        dtEngine1Off = wxDateTime::Now().Subtract(opt->dtEngine1On);
-        parent->m_toggleBtnEngine1->SetLabel(parent->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[0]);
-    }
-    if(enginenumber == 2 || enginenumber == 0)
-    {
-        parent->m_toggleBtnEngine2->SetValue(false);
-        opt->toggleEngine2 = false;
-        bRPM2 = false;
-        dtEngine2Off = wxDateTime::Now().Subtract(opt->dtEngine2On);
-        parent->m_toggleBtnEngine2->SetLabel(parent->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[0]);
-    }
-    if(enginenumber == 3 || enginenumber == 0)
-    {
-        parent->m_toggleBtnGenerator->SetValue(false);
-        opt->toggleGenerator = false;
-        bGEN = false;
-        dtGeneratorOff = wxDateTime::Now().Subtract(opt->dtGeneratorOn);
-        parent->m_toggleBtnGenerator->SetLabel(parent->m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[0]);
-    }
+        {
+            double t,t1 = 0.0 ,t2 = 0.0;
 
-    appendRow(true, false);
+            s = dialog->logGrids[grid]->GetCellValue( i,col );
+            s.Replace( _T( "," ),_T( "." ) );
+            s.ToDouble( &t );
 
-    if(enginenumber == 1 || enginenumber == 0)
-    {
-	opt->dtEngine1On = -1;
-	engine1Manual = false;
-	opt->engine1Running = false;
-    }
-    if(enginenumber == 2 || enginenumber == 0)
-    {
-	opt->dtEngine2On = -1;
-	engine2Manual = false;
-	opt->engine2Running = false;
-    }
-    if(enginenumber == 3 || enginenumber == 0)
-    {
-        opt->dtGeneratorOn = -1;
-        generatorManual = false;
-        opt->generatorRunning = false;
-    }
+            if ( col == LogbookHTML::WATERMO )
+            {
+                s = dialog->logGrids[grid]->GetCellValue( i,LogbookHTML::WATER );
+                s.Replace( _T( "," ),_T( "." ) );
+                s.ToDouble( &t1 );
 
-    opt->bRPMCheck = t;
+                if ( i == 0 )
+                {
+                    s = dialog->logGrids[grid]->GetCellValue( i,LogbookHTML::WATERT );
+                    s.Replace( _T( "," ),_T( "." ) );
+                    s.ToDouble( &t2 );
+                }
+                current = t + t1 + t2;
+            }
+            else if ( col == LogbookHTML::WATER )
+            {
+                s = dialog->logGrids[grid]->GetCellValue( i,LogbookHTML::WATERMO );
+                s.Replace( _T( "," ),_T( "." ) );
+                s.ToDouble( &t1 );
 
-}
+                if ( i == 0 )
+                {
+                    s = dialog->logGrids[grid]->GetCellValue( i,LogbookHTML::WATERT );
+                    s.Replace( _T( "," ),_T( "." ) );
+                    s.ToDouble( &t2 );
 
-void Logbook::checkNMEADeviceIsOn()
-{
-	wxDateTime dtn = wxDateTime::Now();
-    wxString    onOff[2];
-    onOff[0] = _(" off");
-    onOff[1] = _(" on");
-    
-	if(bDepth && dtn.Subtract(dtDepth).GetSeconds() > DEVICE_TIMEOUT)						// Sounder
-	{
-		sDepth = wxEmptyString;
-		bDepth = false;
-	}
-	if(bSOW && dtn.Subtract(dtSOW).GetSeconds() > DEVICE_TIMEOUT)							// Speedo
-	{
-		sSOW = wxEmptyString;
-		bSOW = false;
-	}
-	if(bWindA && dtn.Subtract(dtWindA).GetSeconds() > DEVICE_TIMEOUT)						// Wind Rel
-	{
-		sWindA = wxEmptyString;
-		sWindSpeedA = wxEmptyString;
-		bWindA = false;
-	}
-	if(bWindT && dtn.Subtract(dtWindT).GetSeconds() > DEVICE_TIMEOUT)						// Wind True
-	{
-		sWindT = wxEmptyString;
-		sWindSpeedT = wxEmptyString;
-		bWindT = false;
-	}
-	if(bCOW && dtn.Subtract(dtCOW).GetSeconds() > DEVICE_TIMEOUT)							// Heading
-	{
-		sCOW = wxEmptyString;
-		bCOW = false;
-	}
-	if(bTemperatureWater && dtn.Subtract(dtTemperatureWater).GetSeconds() > DEVICE_TIMEOUT)  // Watertemperature
-	{
-		sTemperatureWater = wxEmptyString;
-		bTemperatureWater = false;
-	}
-
-	if(wimdaSentence && dtn.Subtract(dtWimda).GetSeconds() > DEVICE_TIMEOUT)				// WeatherStation
-	{
-		sPressure		= wxEmptyString;
-		sTemperatureAir = wxEmptyString;
-		sHumidity		= wxEmptyString;
-		wimdaSentence	= false;
-	}
-	if(rpmSentence && dtn.Subtract(dtRPM).GetSeconds() > DEVICE_TIMEOUT)					// Engine RPM and Engine elapsed time
-	{
-		rpmSentence = false;
-		wxDateTime now = wxDateTime::Now();
+                    current = t + t2;
+                }
+                else
+                {
+                    current = t + t1 + t2;
+                }
 
-        if(opt->bEng1RPMIsChecked)
-        {
-            bRPM1 = false;
-            dtEngine1Off = now.Subtract(opt->dtEngine1On);
-            opt->dtEngine1On = -1;
-            sRPM1 = wxEmptyString;
-            sRPM1Shaft = wxEmptyString;
-            dialog->m_toggleBtnEngine1->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[0]);
+            }
+            else
+            {
+                current = t + t1;
+            }
         }
 
-        if(opt->bEng2RPMIsChecked)
+        if ( i > 0 )
         {
-            bRPM2 = false;
-            dtEngine2Off = now.Subtract(opt->dtEngine2On);
-            opt->dtEngine2On = -1;
-            sRPM2 = wxEmptyString;
-            sRPM2Shaft = wxEmptyString;
-            dialog->m_toggleBtnEngine2->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[0]);
-        }
+            wxString temp;
+            if ( col != LogbookHTML::WATERMO )
+                temp = dialog->logGrids[grid]->GetCellValue( i-1,col+1 );
+            else
+                temp = dialog->logGrids[grid]->GetCellValue( i-1,col+2 );
 
-        if(opt->bGenRPMIsChecked)
-        {
-            bGEN = false;
-            dtGeneratorOff = now.Subtract(opt->dtGeneratorOn);
-            opt->dtGeneratorOn = -1;
-            dialog->m_toggleBtnGenerator->SetLabel(dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[0]);
+            temp.Replace( _T( "," ),_T( "." ) );
+            if ( grid == 2 && ( col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
+                                col == LogbookHTML::GENE  || col == LogbookHTML::WATERM ) )
+            {
+                if ( temp.Contains( _T( ":" ) ) )
+                {
+                    wxArrayString time = wxStringTokenize( temp,_T( ":" ) );
+                    time[0].ToLong( &hourLast );
+                    time[1].ToLong( &minLast );
+                }
+                else
+                {
+                    hourLast = 0;
+                    minLast = 0;
+                }
+            }
+            else
+                temp.ToDouble( &last );
         }
-
-		appendRow(true, true);
-        
-        if(opt->bEng1RPMIsChecked)
+        else
         {
-            opt->engine1Running = false;
+            last = 0.0f;
+            hourLast = 0;
+            minLast = 0;
         }
-        if(opt->bEng1RPMIsChecked)
+
+        if ( grid == 2 && ( col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
+                            col == LogbookHTML::GENE  || col == LogbookHTML::WATERM ) )
         {
-            opt->engine2Running = false;
+            hourLast += hourCur;
+            minLast  += minCur;
+            if ( minLast >= 60 )
+            {
+                hourLast++;
+                minLast -= 60;
+            }
+#ifdef __WXOSX__
+            s = wxString::Format( _T( "%05ld:%02ld %s" ),( wchar_t )hourLast,( wchar_t )minLast,abrev.c_str() );
+#else
+            s = wxString::Format( _T( "%05ld:%02ld %s" ),hourLast,minLast,abrev.c_str() );
+#endif
+            dialog->logGrids[grid]->SetCellValue( i,col+1,s );
+#ifdef __WXOSX__
+            cur = wxString::Format( _T( "%02ld:%02ld %s" ),( wchar_t )hourCur,( wchar_t )minCur,abrev.c_str() );
+#else
+            cur = wxString::Format( _T( "%02ld:%02ld %s" ),hourCur,minCur,abrev.c_str() );
+#endif
+            dialog->logGrids[grid]->SetCellValue( i,col,cur );
         }
-        if(opt->bGenRPMIsChecked)
+        else
         {
-            opt->generatorRunning = false;
+#ifdef __WXOSX__
+            s = wxString::Format( _T( "%10.2f %s" ),last+current,abrev.c_str() );
+#else
+            s = wxString::Format( _T( "%10.2f %s" ),last+current,abrev.c_str() );
+#endif
+            s.Replace( _T( "." ),dialog->decimalPoint );
+            if ( col != LogbookHTML::WATERMO )
+                dialog->logGrids[grid]->SetCellValue( i,col+1,s );
+            else
+                dialog->logGrids[grid]->SetCellValue( i,col+2,s );
         }
-	}
+    }
+    return cur;
 }
 
-void Logbook::recalculateLogbook(int row)
+wxString Logbook::toSDMM ( int NEflag, double a, bool mode )
 {
-	int cells[] = { LogbookHTML::POSITION,LogbookHTML::MOTOR,LogbookHTML::MOTOR1,LogbookHTML::FUEL,
-		LogbookHTML::GENE,LogbookHTML::BANK1,LogbookHTML::BANK2,LogbookHTML::WATERM,LogbookHTML::WATER };
-	int grid;
+    short neg = 0;
+    int d;
+    long m;
+    wxDouble sec;
 
-	if(row < 0) return;
-	if(row == 0  && dialog->m_gridGlobal->GetNumberRows() > 1) row = 1; 
+    if ( a < 0.0 )
+    {
+        a = -a;
+        neg = 1;
+    }
+    d = ( int ) a;
+    m = ( long ) ( ( a - ( double ) d ) * 60000.0 );
+    double z = ( m % 1000 );
+    sec = 60 * ( z/1000 ) ;
+
+    if ( neg )
+        d = -d;
+
+    wxString s;
+
+    if ( !NEflag )
+        s.Printf ( _T ( "%d%02ld%02ld" ), d, m / 1000, m % 1000 );
+    else
+    {
+        if ( NEflag == 1 )
+        {
+            char c = 'N';
 
-	int len = sizeof(cells)/sizeof(cells[0]);
-	for(int i = 0; i < len ; i++)
-	{
-		if(i == 0)
-			grid = 0;
-		else
-			grid = 2;
+            if ( neg )
+            {
+                d = -d;
+                c = 'S';
+            }
+            newPosition.posLat = a;
+            newPosition.latitude = d;
+            newPosition.latmin   = m / 1000.0;
+            newPosition.WEflag = c;
 
-		if(dialog->m_gridGlobal->GetNumberRows() >= 2)
-			getModifiedCellValue(grid,row,0,cells[i]);
-	}
+            s.Printf ( _T( "%03d%02ld%05.2f%c" ), d, m / 1000, sec , c );
+        }
+        else if ( NEflag == 2 )
+        {
+            char c = 'E';
 
+            if ( neg )
+            {
+                d = -d;
+                c = 'W';
+            }
+            newPosition.posLon = a;
+            newPosition.longitude = d;
+            newPosition.lonmin   = m / 1000.0;
+            newPosition.NSflag = c;
+            s.Printf ( _T( "%03d%02ld%05.2f%c" ), d, m / 1000, sec, c );
+        }
+    }
+    return s;
 }
 
-void Logbook::checkCourseChanged()
+wxString Logbook::toSDMMOpenCPN ( int NEflag, double a, bool hi_precision )
 {
-	static wxDateTime dt;
-	static bool timer = true;
-
-	wxDouble cog;
-	wxGrid* grid = dialog->m_gridGlobal;
+    wxString s;
+    double mpy;
+    short neg = 0;
+    int d;
+    long m;
+    double ang = a;
+    char c = 'N';
+    int g_iSDMMFormat = 0;
 
-	wxString temp = grid->GetCellValue(grid->GetNumberRows()-1,8);
-	temp.Replace(_T(","),_T("."));
-	temp.ToDouble(&cog);
+    if ( a < 0.0 )
+    {
+        a = -a;
+        neg = 1;
+    }
+    d = ( int ) a;
+    if ( neg )
+        d = -d;
+    if ( NEflag )
+    {
+        if ( NEflag == 1 )
+        {
+            c = 'N';
 
-	if((cog == dCOG) || (oldLogbook || temp.IsEmpty())) return;
+            if ( neg )
+            {
+                d = -d;
+                c = 'S';
+            }
+        }
+        else if ( NEflag == 2 )
+        {
+            c = 'E';
 
+            if ( neg )
+            {
+                d = -d;
+                c = 'W';
+            }
+        }
+    }
 
-#ifdef __WXOSX__
-	wxDouble result = labs(cog-dCOG); 
-#else
-	wxDouble result = abs(cog-dCOG); 
-#endif
-	if(result > 180) result -= 360;
+    switch ( g_iSDMMFormat )
+    {
+    case 0:
+        mpy = 600.0;
+        if ( hi_precision )
+            mpy = mpy * 1000;
 
-#ifdef __WXOSX__
-	if(labs(result) >= opt->dCourseChangeDegrees && !dialog->logbookPlugIn->eventsEnabled)
-#else
-	if(abs(result) >= opt->dCourseChangeDegrees && !dialog->logbookPlugIn->eventsEnabled)
-#endif
-	{
-		if(timer)
-		{
-			timer = false;
-			dt = mCorrectedDateTime;
-			long min;
-			opt->courseTextAfterMinutes.ToLong(&min);
-			wxTimeSpan t(0,(int)min);
-			dt.Add(t);
-		}
-
-
-		if(mCorrectedDateTime >= dt)
-		{
-			dialog->logbookTimerWindow->popUp();
-			timer = true;
-			courseChange = true;
-			appendRow(true, true);
-			courseChange = false;
-		}
-	}
-}
-
-void Logbook::checkWayPoint(RMB rmb)
-{
-	if(lastWayPoint == rmb.From) return;
-
-	dialog->logbookTimerWindow->popUp();
-	tempRMB = rmb;
-	waypointArrived = true;
-	appendRow(true, true);
-	waypointArrived = false;
-	lastWayPoint = rmb.From;
-}
+        m = ( long ) wxRound( ( a - ( double ) d ) * mpy );
 
-void Logbook::checkGuardChanged()
-{
-	if(dLastMinute == -1)
-	{ dLastMinute = (long) mCorrectedDateTime.GetMinute()+1; return; }
+        if ( !NEflag || NEflag < 1 || NEflag > 2 ) //Does it EVER happen?
+        {
+            if ( hi_precision )
+                s.Printf ( _T ( "%d %02ld.%04ld'" ), d, m / 10000, m % 10000 );
+            else
+                s.Printf ( _T ( "%d %02ld.%01ld'" ), d, m / 10,   m % 10 );
+        }
+        else
+        {
+            if ( NEflag == 1 )
+            {
+                newPosition.posLat = a;
+                newPosition.latitude = d;
+                newPosition.latmin   = m / 1000.0;
+                newPosition.WEflag = c;
+            }
+            else
+            {
+                newPosition.posLon = a;
+                newPosition.longitude = d;
+                newPosition.lonmin   = m / 1000.0;
+                newPosition.NSflag = c;
+            }
+            if ( hi_precision )
+                s.Printf ( _T ( "%03d%02ld.%04ld%c" ), d, m / 10000,( m % 10000 ), c );
+            else
+                s.Printf ( _T ( "%03d%02ld.%01ld%c" ), d, m / 10,   ( m % 10 ), c );
+        }
+        break;
+    case 1:
+        if ( hi_precision )
+            s.Printf ( _T ( "%03.6f" ), ang ); //cca 11 cm - the GPX precision is higher, but as we use hi_precision almost everywhere it would be a little too much....
+        else
+            s.Printf ( _T ( "%03.4f" ), ang ); //cca 11m
+        break;
+    case 2:
+        m = ( long ) ( ( a - ( double ) d ) * 60 );
+        mpy = 10.0;
+        if ( hi_precision )
+            mpy = mpy * 100;
+        long sec = ( long ) ( ( a - ( double ) d - ( ( ( double ) m ) / 60 ) ) * 3600 * mpy );
 
-	long hour,minute;
-	long m_minute = (long) mCorrectedDateTime.GetMinute();
-	long m_hour = (long) mCorrectedDateTime.GetHour();
-	bool append = false;
-
-	if(m_minute >= dLastMinute)
-	{
-		for(int row = 0; row < dialog->m_gridCrewWake->GetNumberRows(); row++)
-		{
-			for(int col = 2; col < dialog->m_gridCrewWake->GetNumberCols(); col += 2)
-			{
-				wxString s = dialog->m_gridCrewWake->GetCellValue(row,col);
-				if(s.IsEmpty()) continue;
-				wxStringTokenizer tkz(s,_T(":"));
-				tkz.GetNextToken().ToLong(&hour);
-				tkz.GetNextToken().ToLong(&minute);
-				if(hour != m_hour) continue;
-				if(minute == m_minute)
-					append = true;
-			}
-		}
-		if(append) 
-		{ 
-			guardChange = true;
-			appendRow(true, true);
-			guardChange = false;
-		}
-		dLastMinute = m_minute + 1;
-	}
+        if ( !NEflag || NEflag < 1 || NEflag > 2 ) //Does it EVER happen?
+        {
+            if ( hi_precision )
+                s.Printf ( _T ( "%d %ld'%ld.%ld\"" ), d, m, sec / 1000, sec % 1000 );
+            else
+                s.Printf ( _T ( "%d %ld'%ld.%ld\"" ), d, m, sec / 10, sec % 10 );
+        }
+        else
+        {
+            if ( hi_precision )
+                s.Printf ( _T ( "%03d %02ld %02ld.%03ld %c" ), d, m, sec / 1000, sec % 1000, c );
+            else
+                s.Printf ( _T ( "%03d %02ld %02ld.%ld %c" ), d, m,sec / 10, sec % 10, c );
+        }
+        break;
+    }
+    return s;
 }
 
-void Logbook::checkDistance()
+bool Logbook::checkGPS( bool autoLine )
 {
-	if(oldPosition.latitude == 500)
-		oldPosition = newPosition;
+    sLogText = _T( "" );
 
-	double fromlat = oldPosition.posLat * PI/180;
-	double fromlon = oldPosition.posLon * PI/180;
-	double tolat = newPosition.posLat * PI/180;
-	double tolon = newPosition.posLon * PI/180;
-	if(oldPosition.NSflag == 'S') fromlat = -fromlat;
-	if(oldPosition.WEflag == 'W') fromlon = -fromlon;
-	if(newPosition.NSflag == 'S') tolat = -fromlat;
-	if(newPosition.WEflag == 'W') tolon = -fromlon;
-
-	double sm = 
-		acos(cos(fromlat)*cos(fromlon)*cos(tolat)*cos(tolon) + 
-		cos(fromlat)*sin(fromlon)*cos(tolat)*sin(tolon) + sin(fromlat)*sin(tolat)) * 3443.9;
-
-	if(sm >= opt->dEverySM && !dialog->logbookPlugIn->eventsEnabled)
-	{
-		dialog->logbookTimerWindow->popUp();
-		everySM = true;	
-		appendRow(true, true);
-		everySM = false;
-		oldPosition = newPosition;
-	}
-}
-
-wxString Logbook::calculateDistance(wxString fromstr, wxString tostr)
-{
-	if((fromstr.IsEmpty() || tostr.IsEmpty()) || fromstr == tostr) 
-		return wxString(_T("0.00 ")+opt->distance);
-
-	wxString sLat, sLon, sLatto, sLonto;
-	wxDouble fromlat,fromlon,tolat,tolon, sm;
-
-	wxStringTokenizer tkz(fromstr, _T("\n"));
-	sLat = tkz.GetNextToken();
-	sLon = tkz.GetNextToken();
-	wxStringTokenizer tkzto(tostr, _T("\n"));
-	sLatto = tkzto.GetNextToken();
-	sLonto = tkzto.GetNextToken();
-
-	if(opt->traditional)
-	{
-		fromlat = positionStringToDezimal(sLat)* (PI/180);
-		fromlon = positionStringToDezimal(sLon)* (PI/180);
-		tolat = positionStringToDezimal(sLatto)* (PI/180);
-		tolon = positionStringToDezimal(sLonto)* (PI/180);
-	}
-	else
-	{
-		fromlat = positionStringToDezimalModern(sLat)* (PI/180);
-		fromlon = positionStringToDezimalModern(sLon)* (PI/180);
-		tolat = positionStringToDezimalModern(sLatto)* (PI/180);
-		tolon = positionStringToDezimalModern(sLonto)* (PI/180);
-	}
-	if(oldPosition.NSflag == 'S') fromlat = -fromlat;
-	if(oldPosition.WEflag == 'W') fromlon = -fromlon;
-	if(newPosition.NSflag == 'S') tolat = -fromlat;
-	if(newPosition.WEflag == 'W') tolon = -fromlon;
-
-	///////
-	sm = acos(cos(fromlat)*cos(fromlon)*cos(tolat)*cos(tolon) + 
-		cos(fromlat)*sin(fromlon)*cos(tolat)*sin(tolon) + sin(fromlat)*sin(tolat)) * 3443.9;
-	////// code snippet from http://www2.nau.edu/~cvm/latlongdist.html#formats
-
-	wxString ret = wxString::Format(_T("%.2f %s"),sm,opt->distance.c_str());
-	ret.Replace(_T("."),dialog->decimalPoint);
-	return ret;
-}
-
-wxDouble Logbook::positionStringToDezimal(wxString pos)
-{
-	wxDouble resdeg, resmin, ressec = 0;
-	wxString temp = pos;
-
-	wxStringTokenizer tkz(pos, _T(" "));
-	temp = tkz.GetNextToken();
-	temp.Replace(_T(","),_T("."));
-	temp.ToDouble(&resdeg);
-	if(pos.Contains(_T("S"))) resdeg = -resdeg;
-	if(pos.Contains(_T("W"))) resdeg = -resdeg;
-	temp = tkz.GetNextToken();
-	temp.Replace(_T(","),_T("."));
-	temp.ToDouble(&resmin);
-	if(pos.Contains(_T("S"))) resmin = -resmin;
-	if(pos.Contains(_T("W"))) resmin = -resmin;
-	temp = tkz.GetNextToken();
-	temp.Replace(_T(","),_T("."));
-	temp.ToDouble(&ressec);
-	if(pos.Contains(_T("S"))) ressec = -ressec;
-	if(pos.Contains(_T("W"))) ressec = -ressec;
-	resmin = (resmin/60 + ressec/3600);
-
-	return resdeg + resmin;
-}
-
-wxDouble Logbook::positionStringToDezimalModern(wxString pos)
-{
-	wxDouble resdeg, resmin;
-	wxString temp = pos;
-
-	wxStringTokenizer tkz(pos, _T(" "));
-	temp = tkz.GetNextToken();
-	temp.Replace(_T(","),_T("."));
-	temp.ToDouble(&resdeg);
-	if(pos.Contains(_T("S"))) resdeg = -resdeg;
-	if(pos.Contains(_T("W"))) resdeg = -resdeg;
-	temp = tkz.GetNextToken();
-	temp.Replace(_T(","),_T("."));
-	temp.ToDouble(&resmin);
-	if(pos.Contains(_T("S"))) resmin = -resmin;
-	if(pos.Contains(_T("W"))) resmin = -resmin;
-
-	return resdeg + (resmin/60);
-}
-
-void Logbook::deleteRow(int row)
-{
-	dialog->logGrids[dialog->m_notebook8->GetSelection()]->SelectRow(row,true);
-	int answer = wxMessageBox(wxString::Format(_("Delete Row Nr. %i ?"),row+1), _("Confirm"),
-		wxYES_NO | wxCANCEL, dialog);
-	if (answer == wxYES)
-	{
-		deleteRows();
-		modified = true;
-	}
-}
-
-void Logbook::changeCellValue(int row, int col, int mode)
-{
-	if(mode)
-		for(int g =0; g < LOGGRIDS; g++)
-			for(int i = 0; i < dialog->logGrids[g]->GetNumberCols(); i++)
-				getModifiedCellValue(g,row,i,i);
-	else
-		getModifiedCellValue(dialog->m_notebook8->GetSelection(),row,col,col);
-}
-
-void Logbook::update()
-{
-	if(!modified) return;
-	modified = false;
+    if ( gpsStatus )
+    {
+        if ( opt->showWindHeading == 1 && !bCOW )
+        {
+            sLogText = _( "Wind is set to Heading,\nbut GPS sends no Heading Data.\nWind is set now to Relative to boat\n\n" );
+            opt->showWindHeading = 0;
+        }
+        if ( courseChange && autoLine )
+            sLogText += opt->courseChangeText+opt->courseChangeDegrees+opt->Deg;
+        else if ( guardChange )
+            sLogText += opt->guardChangeText;
+        else if ( waypointArrived )
+        {
+            wxString s, ext;
 
-	dialog->logGrids[0]->Refresh();
-	dialog->logGrids[1]->Refresh();
-	dialog->logGrids[2]->Refresh();
-
-	int count;
-	if((count  = dialog->logGrids[0]->GetNumberRows() )== 0) { wxFile f; f.Create(data_locn,true); return; }
-
-	wxString s = _T(""), temp;
-
-	wxString newLocn = data_locn;
-	newLocn.Replace(_T("txt"),_T("Bak"));
-	wxRename(data_locn,newLocn);
-
-	wxFileOutputStream output( data_locn );
-	wxTextOutputStream* stream = new wxTextOutputStream (output,wxEOL_NATIVE,wxConvUTF8);
-
-	stream->WriteString(_T("#1.2#\t")+logbookDescription+_T("\n"));
-	for(int r = 0; r < count; r++)
-	{
-		for(int g = 0; g < LOGGRIDS; g++)
-		{
-			for(int c = 0; c < dialog->logGrids[g]->GetNumberCols(); c++)
-			{
-				if(g == 1 && (c == LogbookHTML::HYDRO || c == LogbookHTML::WATERTE || c == LogbookHTML::AIRTE ||
-					c == LogbookHTML::WINDR || c == LogbookHTML::WSPDR))
-					continue;
-				if(g == 2 && (c == LogbookHTML::MOTOR1  || c == LogbookHTML::MOTOR1T ||
-					c == LogbookHTML::RPM1	|| c == LogbookHTML::RPM2	 ||
-					c == LogbookHTML::GENE    || c == LogbookHTML::GENET   ||
-					c == LogbookHTML::WATERM  || c == LogbookHTML::WATERMT ||
-					c == LogbookHTML::WATERMO || c == LogbookHTML::BANK1   ||
-					c == LogbookHTML::BANK1T  || c == LogbookHTML::BANK2   ||
-					c == LogbookHTML::BANK2T  ||
-					c == LogbookHTML::TRACKID || c == LogbookHTML::ROUTEID))
-					continue;
-				if(g == 0 && c == RDATE)
-				{
-					wxString t = dialog->logGrids[g]->GetCellValue(r,c);
-					if(!t.IsEmpty())
-					{
-						wxDateTime dt;
-						dialog->myParseDate(t,dt);
-						temp = wxString::Format(_T("%i \t%i \t%i"),dt.GetMonth(),dt.GetDay(),dt.GetYear());
-					}
-					else
-						temp = wxString::Format(_T(" \t \t"));
-				}
-				else if(g == 0 && c == RTIME)
-				{
-					wxString t = dialog->logGrids[g]->GetCellValue(r,c);
-					if(!t.IsEmpty())
-					{
-						wxDateTime dt;
-						dialog->myParseTime(t,dt);
-						temp = wxString::Format(_T("%i \t%i \t%i"),dt.GetHour(),dt.GetMinute(),dt.GetSecond());
-					}
-					else
-						temp = wxString::Format(_T(" \t \t"));
-				}
-				else
-					temp = dialog->logGrids[g]->GetCellValue(r,c);
-
-				s += dialog->replaceDangerChar(temp);
-				s += _T(" \t");
-			}
-		}
-
-		for(int ext = LogbookHTML::HYDRO; ext != LogbookHTML::WIND; ext ++) // extended 3 columns in weathergrid
-		{
-			temp = dialog->logGrids[1]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		for(int ext = LogbookHTML::MOTOR1; ext <= LogbookHTML::MOTOR1T; ext ++) // extend MOTOR #1
-		{
-			temp = dialog->logGrids[2]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		for(int ext = LogbookHTML::GENE; ext <= LogbookHTML::BANK2T; ext ++) // extend for GENERATOR and Battery-Banks
-		{
-			temp = dialog->logGrids[2]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		for(int ext = LogbookHTML::WATERM; ext <= LogbookHTML::WATERMO; ext ++) // extend WATERMAKER
-		{
-			temp = dialog->logGrids[2]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		for(int ext = LogbookHTML::ROUTEID; ext < parent->m_gridMotorSails->GetNumberCols(); ext ++) // extend GUID's
-		{
-			temp = dialog->logGrids[2]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		for(int ext = LogbookHTML::RPM1; ext < LogbookHTML::MOTOR1; ext ++) // extend RPM #1
-		{
-			temp = dialog->logGrids[2]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		for(int ext = LogbookHTML::RPM2; ext < LogbookHTML::FUEL; ext ++) // extend RPM #2
-		{
-			temp = dialog->logGrids[2]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		for(int ext = LogbookHTML::WINDR; ext < LogbookHTML::CURRENT; ext ++) // extend WINDR
-		{
-			temp = dialog->logGrids[1]->GetCellValue(r,ext);
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-
-		s.RemoveLast();
-		s += _T("\n");
-		stream->WriteString(s);
-		s = _T("");
-	}
-	output.Close();
-}
-
-void  Logbook::getModifiedCellValue(int grid, int row, int selCol, int col)
-{
-	wxString s, wind, depth;
-
-	modified = true;
-
-	s = dialog->logGrids[grid]->GetCellValue(row,col);
-
-	if((grid == 0 && (col == WAKE || col == REMARKS)) ||
-		(grid == 1 && (col == LogbookHTML::WEATHER || col == LogbookHTML::CLOUDS || col == LogbookHTML::VISIBILITY)) ||
-		(grid == 2 && (col == LogbookHTML::SAILS || col == LogbookHTML::REEF || col == LogbookHTML::MREMARKS)))
-	{
-		return;
-	}
-
-	if(grid == 0 && col == ROUTE )
-	{
-		if(s.IsEmpty()) return;
-		if(s.Last() == '\n')
-		{
-			s.RemoveLast();
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 0 && col == RDATE )
-	{
-		wxDateTime dt;
-
-		if(!dialog->myParseDate(s,dt))
-		{
-			dt = dt.Now();
-			wxMessageBox(wxString::Format(_("Please enter the Date in the format:\n      %s"),dt.Format(opt->sdateformat).c_str()),_("Information"));
-			dialog->logGrids[grid]->SetCellValue(row,col,_T(""));
-		}
-		else
-		{
-			dialog->logGrids[grid]->SetCellValue(row,col,dt.Format(opt->sdateformat));
-
-			if(row == dialog->m_gridGlobal->GetNumberRows()-1)
-				dialog->maintenance->checkService(row);
-		}
-	}
-	else if(grid == 0 && col == RTIME)
-	{
-		if(s.IsEmpty()) return;
-		wxDateTime dt;
-		bool c;
-		s.Replace(_T(","),_T(":"));
-		s.Replace(_T("."),_T(":"));
-		c = dialog->myParseTime(s,dt);
-
-		if(!c)
-		{
-			wxMessageBox(wxString::Format(_("Please enter the Time in the format:\n   %s"),dt.Format(opt->stimeformat).c_str()));
-			dialog->logGrids[grid]->SetCellValue(row,col,_T(""));
-		}
-		else
-		{
-			dialog->logGrids[grid]->SetCellValue(row,col,dt.Format(opt->stimeformat));
-			if(row == dialog->m_gridGlobal->GetNumberRows()-1)
-				dialog->maintenance->checkService(row);
-		}
-	}
-	else if(grid == 0 && col == DISTANCE)
-	{	
-		s.Replace(_T(","),_T("."));
-
-		s = wxString::Format(_T("%.2f %s"),wxAtof(s),opt->distance.c_str());
-
-		s.Replace(_T("."),dialog->decimalPoint);
-		dialog->logGrids[grid]->SetCellValue(row,col,s);
-
-		computeCell(grid, row, col, s, true);
-		if(row == dialog->m_gridGlobal->GetNumberRows()-1)
-			dialog->maintenance->checkService(row);
-
-		s.Replace(_T(","),_T("."));
-		if(wxAtof(s) >= 0.1) 
-			dialog->m_gridGlobal->SetCellValue(row,STATUS,_T("S"));
-		else
-			dialog->m_gridGlobal->SetCellValue(row,STATUS,_T(""));
-	}
-
-	else if(grid == 0 && col== STATUS)
-	{
-		dialog->logGrids[grid]->SetCellValue(row,col,s.Upper());
-		if(row == dialog->m_gridGlobal->GetNumberRows()-1)
-			dialog->maintenance->checkService(row);
-	}
-	else if(grid == 0 && col== POSITION)
-	{ 
-		if(s != _T("") && !s.Contains(opt->Deg)
-			&& !s.Contains(opt->Min)
-			&& !s.Contains(opt->Sec))
-		{
-			if(opt->traditional && s.length() != 22)
-			{
-				wxMessageBox(_("Please enter 0544512.15n0301205.15e for\n054Deg 45Min 12.15Sec N 030Deg 12Min 05.15Sec E"),_("Information"),wxOK);
-				s = _T("");
-			}
-			else if(!opt->traditional && s.length() != 22)
-			{
-				wxMessageBox(_("Please enter 05445.1234n03012.0504e for\n054Deg 45.1234Min N 030Deg 12.0504Min E"),_("Information"),wxOK);
-				s = _T("");
-			}
-			if(s == _T("")) return;
-			s.Replace(_T(","),_T("."));
-
-			if(opt->traditional)
-			{
-				wxString temp = s.SubString(0,2)+opt->Deg+_T(" ");
-				temp += s.SubString(3,4) + opt->Min+_T(" ");
-				temp += s.SubString(5,9) + opt->Sec+_T(" ");
-				temp += s.SubString(10,10).Upper() + _T("\n");
-				temp += s.SubString(11,13) + opt->Deg+_T(" ");
-				temp += s.SubString(14,15) + opt->Min+_T(" ");
-				temp += s.SubString(16,20) + opt->Sec+_T(" ");
-				temp += s.SubString(21,21).Upper();
-				s = temp;
-			}
-			else
-			{
-				wxString temp = s.SubString(0,2)+opt->Deg+_T(" ");
-				temp += s.SubString(3,9) + opt->Min+_T(" ");
-				temp += s.SubString(10,10).Upper() + _T("\n");
-				temp += s.SubString(11,13) + opt->Deg+_T(" ");
-				temp += s.SubString(14,20) + opt->Min+_T(" ");
-				temp += s.SubString(21,22).Upper();
-				s = temp;
-			}
-		}
-		s.Replace(_T("."),dialog->decimalPoint);
-		dialog->logGrids[grid]->SetCellValue(row,col,s);
-		if(row != 0)
-		{
-			for(int i = row; i < dialog->logGrids[grid]->GetNumberRows(); i++)
-			{
-				double distTotal,dist;
-				dialog->logGrids[grid]->SetCellValue(i,5,
-					calculateDistance(dialog->logGrids[grid]->GetCellValue(i-1,col),s));
-				wxString temp = dialog->logGrids[grid]->GetCellValue(i-1,6);
-				temp.Replace(_T(","),_T("."));
-				temp.ToDouble(&distTotal);
-				temp = dialog->logGrids[grid]->GetCellValue(i,5);
-				temp.Replace(_T(","),_T("."));
-				temp.ToDouble(&dist);
-				s= wxString::Format(_T("%9.2f %s"),distTotal+dist,opt->distance.c_str());
-				s.Replace(_T("."),dialog->decimalPoint);
-				dialog->logGrids[grid]->SetCellValue(i,6,s);
-
-				if(dist >= 0.1)
-					dialog->m_gridGlobal->SetCellValue(i,3,_T("S"));
-				else
-					dialog->m_gridGlobal->SetCellValue(i,3,_T(""));
-
-				if(i < dialog->m_gridGlobal->GetNumberRows()-1)
-				{
-					s = dialog->logGrids[grid]->GetCellValue(i+1,col);
-					if(s.IsEmpty() || s == _T(" "))
-						break;
-				}
-			}							
-		}
-	}
-	else if(grid == 0 && col == COG)
-	{
-		if(s != _T(""))
-		{
-			s.Replace(_T(","),_T("."));
-			s = wxString::Format(_T("%3.2f%s"),wxAtof(s),opt->Deg.c_str());
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 0 && col == COW)
-	{
-		if(s != _T(""))
-		{
-			s.Replace(_T(","),_T("."));
-			s = wxString::Format(_T("%3.2f%s %s"),wxAtof(s),opt->Deg.c_str(),(opt->showHeading)?_T("M"):_T("T"));
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 0 && (col == SOG || col == SOW))
-	{
-		if(s != _T(""))
-		{
-			s.Replace(_T(","),_T("."));
-#ifdef __WXOSX__
-			s = wxString::Format(_T("%2.2f %s"),wxAtof(s),(const wchar_t*)opt->speed.c_str());
-#else
-			s = wxString::Format(_T("%2.2f %s"),wxAtof(s),opt->speed.c_str());
-#endif
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 0 && col == DEPTH)
-	{
-		if(s != _T(""))
-		{
-			switch(opt->showDepth)
-			{
-			case 0:	depth = opt->meter; break;
-			case 1: depth = opt->feet; break;
-			case 2: depth = opt->fathom; break;
-			}
-			if(s.Contains(opt->meter) || 
-				s.Contains(opt->feet) || 
-				s.Contains(opt->fathom.c_str()) ||
-				s.Contains(_T("--")))
-			{
-				s.Replace(_T("."),dialog->decimalPoint);
-				dialog->logGrids[grid]->SetCellValue(row,col,s);
-			}
-			else
-			{
-				s.Replace(_T(","),_T("."));
-				s = wxString::Format(_T("%3.1f %s"),wxAtof(s),depth.c_str());
-				s.Replace(_T("."),dialog->decimalPoint);
-				dialog->logGrids[grid]->SetCellValue(row,col,s);
-			}
-
-		}
-	}
-	else if(grid == 1 && col == LogbookHTML::BARO)
-	{
-		if(s != _T(""))
-		{
-			s = wxString::Format(_T("%4.1f %s"),wxAtof(s),opt->baro.c_str());
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 1 && col == LogbookHTML::HYDRO)
-	{
-		if(s != _T(""))
-		{
-			s.Replace(_T(","),_T("."));
-			s = wxString::Format(_T("%4.1f%%"),wxAtof(s));
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 1 && col == LogbookHTML::AIRTE)
-	{
-		if(s != _T("") && !s.Contains(opt->Deg))
-		{
-			s = wxString::Format(_T("%3.0f %s %s"),wxAtof(s), opt->Deg.c_str(),opt->temperature.c_str());
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 1 && col == LogbookHTML::WATERTE)
-	{
-		if(s != _T("") && !s.Contains(opt->Deg))
-		{
-			s = wxString::Format(_T("%3.0f %s %s"),wxAtof(s), opt->Deg.c_str(),opt->temperature.c_str());
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 1 && col == LogbookHTML::WIND)
-	{
-		if(s != _T("") && !s.Contains(opt->Deg))
-		{
-			s = wxString::Format(_T("%3.0f%s %s"),wxAtof(s), opt->Deg.c_str(),opt->showWindDir?_T("R"):_T("T"));
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 1 && col == LogbookHTML::WSPD )
-	{
-		if(s != _T(""))
-		{
-			if(!s.Contains(opt->windkts) && !s.Contains(opt->windmeter) && !s.Contains(opt->windkmh))
-			{
-				switch(opt->showWindSpeed)
-				{
-				case 0:	wind = opt->windkts; break;
-				case 1: wind = opt->windmeter; break;
-				case 2: wind = opt->windkmh; break;
-				}
-				s.Replace(_T(","),_T("."));
-				s = wxString::Format(_T("%3.2f %s"),wxAtof(s),wind.c_str());
-				s.Replace(_T("."),dialog->decimalPoint);
-			}
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 1 && col == LogbookHTML::CURRENT)
-	{
-		if(s != _T("") && !s.Contains(opt->Deg))
-		{
-			s.Replace(_T(","),_T("."));
-			s = wxString::Format(_T("%3.0f%s"),wxAtof(s), opt->Deg.c_str());
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);						
-		}
-	}				
-	else if(grid == 1 && col == LogbookHTML::CSPD)
-	{
-		if(s != _T(""))
-		{
-			s.Replace(_T(","),_T("."));
-			s = wxString::Format(_T("%3.2f %s"),wxAtof(s),opt->speed.c_str());
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 1 && (col == LogbookHTML::WAVE || col == LogbookHTML::SWELL))
-	{
-		wxString d;
-		switch(opt->showWaveSwell)
-		{
-		case 0:	d = opt->meter; break;
-		case 1: d = opt->feet; break;
-		case 2: d = opt->fathom; break;
-		}
-		if(s != _T(""))
-		{
-			s.Replace(_T(","),_T("."));
-			s = wxString::Format(_T("%3.2f %s"),wxAtof(s),d.c_str());
-			s.Replace(_T("."),dialog->decimalPoint);
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-	}
-	else if(grid == 2 && ((col == LogbookHTML::MOTORT || col == LogbookHTML::MOTOR1T ||
-		col == LogbookHTML::GENET  || col == LogbookHTML::WATERMT )  && !s.IsEmpty()))
-	{
-		wxString pre, cur;
-		double hp,hc,mp,mc;
-		double res,hp_,hc_;
-
-		if(!s.Contains(_T(":")) && !s.Contains(_T(",")) && !s.Contains(_T("."))) 
-			s += _T(":");
-
-		if(s.Contains(_T(",")) || s.Contains(_T(".")))
-		{
-			double d;
-			s.Replace(_T(","),_T("."));
-			s.ToDouble(&d);
-			int h = (int) d;
-			int m = (60*(d - h));
-			s = wxString::Format(_T("%i:%i"),h,m);
-
-		}
-
-		if(row > 0)
-		{
-			pre = dialog->m_gridMotorSails->GetCellValue(row-1,col);
-			wxStringTokenizer tkz(pre,_T(":"));
-			tkz.GetNextToken().ToDouble(&hp);
-			tkz.GetNextToken().ToDouble(&mp);
-
-		}
-		else
-		{ hp = 0; mp = 0; }
-
-		cur = s;
-		wxStringTokenizer tkz1(cur,_T(":"));
-		tkz1.GetNextToken().ToDouble(&hc);
-		tkz1.GetNextToken().ToDouble(&mc);
-
-		hc_ = hc + ((mc*(100.0/60.0))/100);
-		hp_ = hp + ((mp*(100.0/60.0))/100);
-
-		res = hc_ - hp_;
-
-		if(row == 0 || res <= 0.0)
-			dialog->m_gridMotorSails->SetCellValue(row,col-1,wxString::Format(_T("00:00 %s"),opt->motorh.c_str()));
-		else
-			dialog->m_gridMotorSails->SetCellValue(row,col-1,decimalToHours(res,false));
-
-		dialog->m_gridMotorSails->SetCellValue(row,col,  decimalToHours(hc_,true));
-
-		if(row < dialog->m_gridMotorSails->GetNumberRows()-1)
-			computeCell(grid,row+1,col-1,dialog->m_gridMotorSails->GetCellValue(row+1,col-1),true);
-		if(row == dialog->m_gridGlobal->GetNumberRows()-1)
-			dialog->maintenance->checkService(row);
-	}
-	else if(grid == 2 && ((col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
-		col == LogbookHTML::GENE  || col == LogbookHTML::WATERM)  && !s.IsEmpty()))
-	{
-		double watermaker;
-		opt->watermaker.ToDouble(&watermaker);
-
-		bool t = false;
-		wxString sep;
-
-		if(s.Contains(_T(".")))
-		{
-			t = true;
-			sep = _T(".");
-		}
-		if(s.Contains(_T(",")))
-		{
-			t = true;
-			sep = _T(",");
-		}
-		if(s.Contains(_T(":")))
-		{
-			t = true;
-			sep = _T(":");
-		}
-
-		if(true != t)
-			s.Append(_T(":0"));
-
-		wxStringTokenizer tkz(s,sep);
-		wxString h = tkz.GetNextToken();
-		wxString m = wxEmptyString;
-		if(tkz.HasMoreTokens())
-			m = tkz.GetNextToken();
-
-		if(wxAtoi(m) > 59)
-		{
-			wxMessageBox(_("Minutes greater than 59"),_T(""));
-			dialog->logGrids[grid]->SetCellValue(row,col,_T("00:00"));
-			return;
-		}
-		else
-		{
-			s = wxString::Format(_T("%s:%s"),h.c_str(),m.c_str());
-			s = wxString::Format(_T("%s %s"),s.c_str(),opt->motorh.c_str());
-			dialog->logGrids[grid]->SetCellValue(row,col,s);
-			computeCell(grid, row, col,s, true);
-			if(row == dialog->m_gridGlobal->GetNumberRows()-1)
-				dialog->maintenance->checkService(row);
-			if(col == LogbookHTML::WATERM)
-			{
-				wxString t = dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::WATERM);
-				wxStringTokenizer tkz(t,_T(":"));
-				double h,m;
-				tkz.GetNextToken().ToDouble(&h);
-				tkz.GetNextToken().ToDouble(&m);
-				h = h + (m*(100/60)/100);
-				double output = watermaker * h;
-				dialog->m_gridMotorSails->SetCellValue(row,LogbookHTML::WATERMO,wxString::Format(_T("+%2.2f %s"),output,opt->vol.c_str()));
-				computeCell(grid,row,LogbookHTML::WATERMO, dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::WATERMO),false);
-			}
-		}						
-	}
-
-	else if(grid == 2 && ( col == LogbookHTML::FUELT || col == LogbookHTML::WATERT ||
-		col == LogbookHTML::BANK1T || col == LogbookHTML::BANK2T) && !s.IsEmpty())
-	{
-		double div = 1.0;
-		long capacity;
-		wxString ap;
-		double t,c;
-		wxString ind;
-
-		if(col == LogbookHTML::BANK1T || col == LogbookHTML::BANK2T)
-			ap = opt->ampereh;
-		else
-			ap = opt->vol;
-
-		if(row > 0)
-			dialog->m_gridMotorSails->GetCellValue(row-1,col).ToDouble(&t);						
-		else
-		{ t = 0; c = 0; }
-		dialog->m_gridMotorSails->GetCellValue(row,col).ToDouble(&c);
-
-		if(s.Contains(_T("/")))
-		{
-			double a,b;
-			wxStringTokenizer tkz(s,_T("/"));
-			tkz.GetNextToken().ToDouble(&a);
-			tkz.GetNextToken().ToDouble(&b);
-			div = a/b;
-			if(col == LogbookHTML::FUELT) 
-				opt->fuelTank.ToLong(&capacity);
-			else if( col == LogbookHTML::BANK1T)
-				opt->bank1.ToLong(&capacity);
-			else if(col == LogbookHTML::BANK2T)
-				opt->bank2.ToLong(&capacity);
-			else
-				opt->waterTank.ToLong(&capacity);
-
-			c = capacity*div;						
-		}
-
-		s.Replace(_T(","),_T("."));
-		ind = (c < t)?_T("-"):_T("+");
-
-		if(row != 0)
-			dialog->m_gridMotorSails->SetCellValue(row,col-1,wxString::Format(_T("%s%.2f %s"),ind.c_str(),fabs(t-c),ap.c_str()));
-		else
-			dialog->m_gridMotorSails->SetCellValue(row,col-1,wxString::Format(_T("%s0.00 %s"),ind.c_str(),ap.c_str()));
-
-		dialog->m_gridMotorSails->SetCellValue(row,col,wxString::Format(_T("%.2f %s"),c,ap.c_str()));
-
-		int x;
-		if(col == LogbookHTML::WATERT)
-			x = 2;
-		else
-			x =1;
-		if(row < dialog->m_gridMotorSails->GetNumberRows()-1)
-			computeCell(grid,row+1,col-x,dialog->m_gridMotorSails->GetCellValue(row+1,col-x),false);
-
-		dialog->maintenance->checkService(row);
-	}
-	else if(grid == 2 && ( col == LogbookHTML::FUEL    || col == LogbookHTML::WATER ||
-		col == LogbookHTML::WATERMO || col == LogbookHTML::BANK1 || col == LogbookHTML::BANK2) && !s.IsEmpty())
-	{
-		wxChar ch;
-		wxString ap;
-
-		if(col == LogbookHTML::BANK1 || col == LogbookHTML::BANK2)
-			ap = opt->ampereh;
-		else
-			ap = opt->vol;
-
-		s.Replace(_T(","),_T("."));
-		if(col != LogbookHTML::WATERMO)
-			ch = s.GetChar(0);
-		else 
-			ch = '+';
-
-		s = wxString::Format(_T("%.2f %s"),wxAtof(s),ap.c_str());
-		s.Replace(_T("."),dialog->decimalPoint);
-
-		if(ch != '-' && ch != '+')
-			dialog->logGrids[grid]->SetCellValue(row,col,_T("-")+s);
-		else
-		{
-			if(ch == '+')
-				dialog->logGrids[grid]->SetCellValue(row,col,wxString(ch)+s);
-			else
-				dialog->logGrids[grid]->SetCellValue(row,col,s);
-		}
-
-		computeCell(grid, row, col,s, false);
-		dialog->maintenance->checkService(row);
-	}
-	return;
-}
+            if ( !OCPN_Message )
+            {
+                /* s = wxString::Format(_("\nName of Waypoint: %s\nTrue bearing to destination: %4.1f%s\nRange to destination: %4.2f%s"),
+                tempRMB.From.c_str(),
+                tempRMB.BearingToDestinationDegreesTrue,opt->Deg.c_str(),
+                tempRMB.RangeToDestinationNauticalMiles,opt->distance.c_str());
+                s.Replace(_T("."),dialog->decimalPoint);*/
+            }
+            else
+            {
+                setWayPointArrivedText();
+            }
 
-void Logbook::deleteRows()
-{
-	wxArrayInt rows;
-	unsigned int rowsCount;
-	int tab = dialog->m_notebook8->GetSelection();
-
-	rows = dialog->logGrids[tab]->GetSelectedRows();
-	rowsCount = rows.GetCount();
-
-	if(rowsCount == 0) // complete grid
-	{
-		wxGridCellCoordsArray art = dialog->logGrids[tab]->GetSelectionBlockTopLeft();
-		wxGridCellCoordsArray arb = dialog->logGrids[tab]->GetSelectionBlockBottomRight();
-		int start = art[0].GetRow();
-		int end = arb[0].GetRow();
-		for(int grid = 0; grid < LOGGRIDS; grid++)
-		{
-			dialog->logGrids[grid]->DeleteRows(start,(end-start)+1);
-			dialog->logGrids[grid]->ForceRefresh();
-		}
-
-		if(start == dialog->m_gridGlobal->GetNumberRows()-1)
-			start--;
-
-		if(dialog->logGrids[tab]->GetNumberRows() != 0)
-		{
-			dialog->selGridRow = start;
-			dialog->logGrids[tab]->SetGridCursor(start,0);
-			recalculateLogbook(start);
-		}
-		else
-		{
-			dialog->selGridRow = 0;
-		}
-		modified = true;
-		return;
-	}
-
-	bool sort = true;
-	if(rowsCount > 1)
-	{
-		while(sort)
-		{
-			sort = false;
-			for(unsigned int i = 0; i < rowsCount-1; i++)
-			{
-				if(rows[i+1] > rows[i])
-				{
-					sort = true;
-					int temp = rows[i];
-					rows[i] = rows[i+1];
-					rows[i+1] = temp;
-				}
-			}
-		}
-	}
-
-
-	for(int grid = 0; grid < LOGGRIDS; grid++)
-	{
-		for(unsigned int i = 0; i < rowsCount; i++)
-			dialog->logGrids[grid]->DeleteRows(rows[i]);
-	}
-	dialog->selGridRow = rows[rowsCount-1]-1;
-	if(dialog->logGrids[tab]->GetNumberRows() > 0)
-		dialog->logGrids[tab]->SetGridCursor(rows[rowsCount-1]-1,0);
-
-	modified = true;
-	if(dialog->logGrids[0]->GetNumberRows() > 0)
-		recalculateLogbook(rows[rows.GetCount()-1]-1);
-}
-
-wxString  Logbook::decimalToHours(double res,bool b)
-{
-	int h = (int) res;
-	double m = res - h;
-	m = m * (60.0/100.0)*100;
-
-	wxString fmt = (b)?_T("%05i:%02.0f %s"):_T("%02i:%02.0f %s");
-	wxString str =  wxString::Format(fmt,h,m,opt->motorh.c_str());
-	return str;
-}
-
-wxString Logbook::computeCell(int grid, int row, int col, wxString s, bool mode)
-{
-	double current = 0, last = 0.0;
-	long hourCur=0, minCur=0 ,hourLast=0, minLast = 0;
-	int count;
-	wxString cur;
-	wxString abrev;
-
-	s.Replace(_T(","),_T("."));
-
-	if(col == DISTANCE)
-		abrev = opt->distance; 
-	else if(col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
-		col == LogbookHTML::GENE || col == LogbookHTML::WATERM)
-		abrev = opt->motorh; 
-	else if(col == LogbookHTML::FUEL || col == LogbookHTML::WATER ||
-		col == LogbookHTML::WATERMO)
-		abrev = opt->vol; 
-	else if(col == LogbookHTML::BANK1 || col == LogbookHTML::BANK2)
-		abrev = opt->ampereh;
-
-
-	count = dialog->m_gridGlobal->GetNumberRows();
-
-	for(int i = row; i < count; i++)
-	{
-		if(col != LogbookHTML::WATERMO && col != LogbookHTML::WATER && col != LogbookHTML::FUEL &&
-			col != LogbookHTML::BANK1   && col != LogbookHTML::BANK2)
-		{
-			s = dialog->logGrids[grid]->GetCellValue(i,col);
-			s.Replace(_T(","),_T("."));
-			if(s == _T("0000")) s = _T("00:00");
-			if(grid == 2 && (col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
-				col == LogbookHTML::GENE  || col == LogbookHTML::WATERM))
-			{
-				wxArrayString time = wxStringTokenize(s,_T(":"));
-				time[0].ToLong(&hourCur);
-				time[1].ToLong(&minCur);
-			}
-			else
-			{
-				s.ToDouble(&current);
-			}
-		}
-		else
-		{
-			double t,t1 = 0.0 ,t2 = 0.0;
-
-			s = dialog->logGrids[grid]->GetCellValue(i,col);
-			s.Replace(_T(","),_T("."));
-			s.ToDouble(&t);
-
-			if(col == LogbookHTML::WATERMO)
-			{
-				s = dialog->logGrids[grid]->GetCellValue(i,LogbookHTML::WATER);
-				s.Replace(_T(","),_T("."));
-				s.ToDouble(&t1);
-
-				if(i == 0)
-				{
-					s = dialog->logGrids[grid]->GetCellValue(i,LogbookHTML::WATERT);
-					s.Replace(_T(","),_T("."));
-					s.ToDouble(&t2);
-				}
-				current = t + t1 + t2;
-			}
-			else if(col == LogbookHTML::WATER)
-			{
-				s = dialog->logGrids[grid]->GetCellValue(i,LogbookHTML::WATERMO);
-				s.Replace(_T(","),_T("."));
-				s.ToDouble(&t1);
-
-				if(i == 0)
-				{
-					s = dialog->logGrids[grid]->GetCellValue(i,LogbookHTML::WATERT);
-					s.Replace(_T(","),_T("."));
-					s.ToDouble(&t2);
-
-					current = t + t2;
-				}
-				else
-				{ current = t + t1 + t2; }
-
-			}
-			else
-			{
-				current = t + t1;
-			}
-		}
-
-		if(i > 0)
-		{
-			wxString temp;
-			if(col != LogbookHTML::WATERMO)
-				temp = dialog->logGrids[grid]->GetCellValue(i-1,col+1);
-			else
-				temp = dialog->logGrids[grid]->GetCellValue(i-1,col+2);
-
-			temp.Replace(_T(","),_T("."));
-			if(grid == 2 && (col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
-				col == LogbookHTML::GENE  || col == LogbookHTML::WATERM))
-			{
-				if(temp.Contains(_T(":")))
-				{
-					wxArrayString time = wxStringTokenize(temp,_T(":"));
-					time[0].ToLong(&hourLast);
-					time[1].ToLong(&minLast);
-				}
-				else { hourLast = 0; minLast = 0; }
-			}
-			else
-				temp.ToDouble(&last);
-		}
-		else { 
-			last = 0.0f; hourLast = 0; minLast = 0; 			
-		}
-
-		if(grid == 2 && (col == LogbookHTML::MOTOR || col == LogbookHTML::MOTOR1 ||
-			col == LogbookHTML::GENE  || col == LogbookHTML::WATERM))
-		{
-			hourLast += hourCur;
-			minLast  += minCur;
-			if(minLast >= 60) { hourLast++; minLast -= 60; }
-#ifdef __WXOSX__
-			s = wxString::Format(_T("%05ld:%02ld %s"),(wchar_t)hourLast,(wchar_t)minLast,abrev.c_str());
-#else
-			s = wxString::Format(_T("%05ld:%02ld %s"),hourLast,minLast,abrev.c_str());
-#endif
-			dialog->logGrids[grid]->SetCellValue(i,col+1,s);
-#ifdef __WXOSX__
-			cur = wxString::Format(_T("%02ld:%02ld %s"),(wchar_t)hourCur,(wchar_t)minCur,abrev.c_str());
-#else
-			cur = wxString::Format(_T("%02ld:%02ld %s"),hourCur,minCur,abrev.c_str());
-#endif
-			dialog->logGrids[grid]->SetCellValue(i,col,cur);
-		}
-		else
-		{
-#ifdef __WXOSX__
-			s = wxString::Format(_T("%10.2f %s"),last+current,abrev.c_str());
-#else
-			s = wxString::Format(_T("%10.2f %s"),last+current,abrev.c_str());
-#endif
-			s.Replace(_T("."),dialog->decimalPoint);
-			if(col != LogbookHTML::WATERMO)
-				dialog->logGrids[grid]->SetCellValue(i,col+1,s);
-			else
-				dialog->logGrids[grid]->SetCellValue(i,col+2,s);
-		}	
-	}
-	return cur;
-}
+        }
+        else if ( everySM && autoLine )
+            sLogText += opt->everySMText+opt->everySMAmount+opt->distance;
+        else if ( ( dialog->timer->IsRunning() || opt->timerType != 0 ) && autoLine )
+            sLogText += opt->ttext;
 
-wxString Logbook::toSDMM ( int NEflag, double a, bool mode )
-{
-	short neg = 0;
-	int d;
-	long m;
-	wxDouble sec;
-
-	if ( a < 0.0 )
-	{
-		a = -a;
-		neg = 1;
-	}
-	d = ( int ) a;
-	m = ( long ) ( ( a - ( double ) d ) * 60000.0 );
-	double z = (m % 1000);
-	sec = 60 * (z/1000) ;
-
-	if ( neg )
-		d = -d;
-
-	wxString s;
-
-	if ( !NEflag )
-		s.Printf ( _T ( "%d%02ld%02ld" ), d, m / 1000, m % 1000 );
-	else
-	{
-		if ( NEflag == 1 )
-		{
-			char c = 'N';
-
-			if ( neg )
-			{
-				d = -d;
-				c = 'S';
-			}
-			newPosition.posLat = a;
-			newPosition.latitude = d;
-			newPosition.latmin   = m / 1000.0;
-			newPosition.WEflag = c;
-
-			s.Printf ( _T("%03d%02ld%05.2f%c"), d, m / 1000, sec , c );
-		}
-		else if ( NEflag == 2 )
-		{
-			char c = 'E';
-
-			if ( neg )
-			{
-				d = -d;
-				c = 'W';
-			}
-			newPosition.posLon = a;
-			newPosition.longitude = d;
-			newPosition.lonmin   = m / 1000.0;
-			newPosition.NSflag = c;
-			s.Printf ( _T("%03d%02ld%05.2f%c"), d, m / 1000, sec, c );
-		}
-	}
-	return s;
-}
+        return true;
+    }
+    else
+    {
+        //	sLat = sLon = sDate = sTime = _T("");
+        //		sCOG = sCOW = sSOG = sSOW = sDepth = sWind = sWindSpeed = sTemperatureWater = sTemperatureAir = sPressure = sHumidity = _T("");
+        sCOG = sSOG = _T( "" );
+        bCOW = false;
 
-wxString Logbook::toSDMMOpenCPN ( int NEflag, double a, bool hi_precision )
-{
-	wxString s;
-	double mpy;
-	short neg = 0;
-	int d;
-	long m;
-	double ang = a;
-	char c = 'N';
-	int g_iSDMMFormat = 0;
-
-	if ( a < 0.0 )
-	{
-		a = -a;
-		neg = 1;
-	}
-	d = ( int ) a;
-	if ( neg )
-		d = -d;
-	if(NEflag)
-	{
-		if ( NEflag == 1 )
-		{
-			c = 'N';
-
-			if ( neg )
-			{
-				d = -d;
-				c = 'S';
-			}
-		}
-		else if ( NEflag == 2 )
-		{
-			c = 'E';
-
-			if ( neg )
-			{
-				d = -d;
-				c = 'W';
-			}
-		}
-	}
-
-	switch (g_iSDMMFormat)
-	{
-	case 0:
-		mpy = 600.0;
-		if(hi_precision)
-			mpy = mpy * 1000;
-
-		m = ( long ) wxRound( ( a - ( double ) d ) * mpy );
-
-		if ( !NEflag || NEflag < 1 || NEflag > 2) //Does it EVER happen?
-		{
-			if(hi_precision)
-				s.Printf ( _T ( "%d %02ld.%04ld'" ), d, m / 10000, m % 10000 );
-			else
-				s.Printf ( _T ( "%d %02ld.%01ld'" ), d, m / 10,   m % 10 );
-		}
-		else
-		{
-			if(NEflag == 1)
-			{
-				newPosition.posLat = a;
-				newPosition.latitude = d;
-				newPosition.latmin   = m / 1000.0;
-				newPosition.WEflag = c;
-			}
-			else
-			{
-				newPosition.posLon = a;
-				newPosition.longitude = d;
-				newPosition.lonmin   = m / 1000.0;
-				newPosition.NSflag = c;
-			}
-			if(hi_precision)
-				s.Printf ( _T ( "%03d%02ld.%04ld%c" ), d, m / 10000,( m % 10000 ), c );
-			else
-				s.Printf ( _T ( "%03d%02ld.%01ld%c" ), d, m / 10,   ( m % 10 ), c );
-		}
-		break;
-	case 1:
-		if (hi_precision)
-			s.Printf (_T ( "%03.6f" ), ang); //cca 11 cm - the GPX precision is higher, but as we use hi_precision almost everywhere it would be a little too much....
-		else
-			s.Printf (_T ( "%03.4f" ), ang); //cca 11m
-		break;
-	case 2:
-		m = ( long ) ( ( a - ( double ) d ) * 60 );
-		mpy = 10.0;
-		if (hi_precision)
-			mpy = mpy * 100;
-		long sec = (long) (( a - ( double ) d - ( ( ( double ) m ) / 60 ) ) * 3600 * mpy);
-
-		if ( !NEflag || NEflag < 1 || NEflag > 2) //Does it EVER happen?
-		{
-			if(hi_precision)
-				s.Printf ( _T ( "%d %ld'%ld.%ld\"" ), d, m, sec / 1000, sec % 1000 );
-			else
-				s.Printf ( _T ( "%d %ld'%ld.%ld\"" ), d, m, sec / 10, sec % 10 );
-		}
-		else
-		{
-			if(hi_precision)
-				s.Printf ( _T ( "%03d %02ld %02ld.%03ld %c" ), d, m, sec / 1000, sec % 1000, c );
-			else
-				s.Printf ( _T ( "%03d %02ld %02ld.%ld %c" ), d, m,sec / 10, sec % 10, c );
-		}
-		break;
-	}
-	return s;
-}
-
-bool Logbook::checkGPS(bool autoLine)
-{
-	sLogText = _T("");
-
-	if(gpsStatus)
-	{
-		if(opt->showWindHeading == 1 && !bCOW)
-		{
-			sLogText = _("Wind is set to Heading,\nbut GPS sends no Heading Data.\nWind is set now to Relative to boat\n\n"); 
-			opt->showWindHeading = 0;
-		}
-		if(courseChange && autoLine)
-			sLogText += opt->courseChangeText+opt->courseChangeDegrees+opt->Deg;
-		else if(guardChange)
-			sLogText += opt->guardChangeText;
-		else if(waypointArrived)
-		{
-			wxString s, ext;
-
-			if(!OCPN_Message)
-			{	/* s = wxString::Format(_("\nName of Waypoint: %s\nTrue bearing to destination: %4.1f%s\nRange to destination: %4.2f%s"),
-				tempRMB.From.c_str(),
-				tempRMB.BearingToDestinationDegreesTrue,opt->Deg.c_str(),
-				tempRMB.RangeToDestinationNauticalMiles,opt->distance.c_str());
-				s.Replace(_T("."),dialog->decimalPoint);*/
-			}
-			else
-			{
-				setWayPointArrivedText();
-			}
-
-		}
-		else if(everySM && autoLine)
-			sLogText += opt->everySMText+opt->everySMAmount+opt->distance;
-		else if((dialog->timer->IsRunning() || opt->timerType != 0) && autoLine)
-			sLogText += opt->ttext;
-
-		return true;
-	}
-	else
-	{
-		//	sLat = sLon = sDate = sTime = _T("");
-		//		sCOG = sCOW = sSOG = sSOW = sDepth = sWind = sWindSpeed = sTemperatureWater = sTemperatureAir = sPressure = sHumidity = _T("");
-		sCOG = sSOG = _T("");
-		bCOW = false;
-
-		if(opt->noGPS)
-			sLogText = _("No GPS-Signal !");
-		else
-			sLogText = _T("");
-		if(waypointArrived)
-		{
-			setWayPointArrivedText();
-		}
-		return false;
-	}
+        if ( opt->noGPS )
+            sLogText = _( "No GPS-Signal !" );
+        else
+            sLogText = _T( "" );
+        if ( waypointArrived )
+        {
+            setWayPointArrivedText();
+        }
+        return false;
+    }
 }
 
 void Logbook::setWayPointArrivedText()
 {
-	wxString ext;
-	wxString msg;
+    wxString ext;
+    wxString msg;
 
-	if(tempRMB.To != _T("-1"))
-	{ msg = _("Next WP Name: "); }
-	else
-	{ msg = _("Last waypoint of the Route"); tempRMB.To = wxEmptyString; }
+    if ( tempRMB.To != _T( "-1" ) )
+    {
+        msg = _( "Next WP Name: " );
+    }
+    else
+    {
+        msg = _( "Last waypoint of the Route" );
+        tempRMB.To = wxEmptyString;
+    }
 
-	wxString s = wxString::Format(_("\nName of Waypoint: %s\n%s %s"),tempRMB.From.c_str(), msg.c_str(), tempRMB.To.c_str());
+    wxString s = wxString::Format( _( "\nName of Waypoint: %s\n%s %s" ),tempRMB.From.c_str(), msg.c_str(), tempRMB.To.c_str() );
 
-	if(WP_skipped)
-		ext = _("Waypoint skipped");
-	else
-		ext = _("WayPoint arrived");
+    if ( WP_skipped )
+        ext = _( "Waypoint skipped" );
+    else
+        ext = _( "WayPoint arrived" );
 
-	if(sLogText != _T(""))
-		sLogText += wxString::Format(_T("\n%s\n%s%s"),opt->waypointText.c_str(),ext.c_str(),s.c_str());
-	else
-		sLogText += wxString::Format(_T("%s\n%s%s"),opt->waypointText.c_str(),ext.c_str(),s.c_str());
+    if ( sLogText != _T( "" ) )
+        sLogText += wxString::Format( _T( "\n%s\n%s%s" ),opt->waypointText.c_str(),ext.c_str(),s.c_str() );
+    else
+        sLogText += wxString::Format( _T( "%s\n%s%s" ),opt->waypointText.c_str(),ext.c_str(),s.c_str() );
 }
 
-class ActuellWatch;
-void Logbook::SetGPSStatus(bool status)
+class ActualWatch;
+void Logbook::SetGPSStatus( bool status )
 {
-	if(!status)
-		sDate = _T("");
+    if ( !status )
+        sDate = _T( "" );
 
-	if(status != gpsStatus)
-		dialog->crewList->dayNow(false);
+    if ( status != gpsStatus )
+        dialog->crewList->dayNow( false );
 
-	gpsStatus = status;
+    gpsStatus = status;
 
 }
 
-void Logbook::showSearchDlg(int row, int col)
+void Logbook::showSearchDlg( int row, int col )
 {
-	LogbookSearch* dlg = new LogbookSearch(dialog, row, col);
-	dlg->Show(true);
+    LogbookSearch* dlg = new LogbookSearch( dialog, row, col );
+    dlg->Show( true );
 }
 
 ////////////////////////////////////////////////////
-NoAppendDialog::NoAppendDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+NoAppendDialog::NoAppendDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-	wxBoxSizer* bSizer20;
-	bSizer20 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer20;
+    bSizer20 = new wxBoxSizer( wxVERTICAL );
 
-	m_staticText73 = new wxStaticText( this, wxID_ANY, _("It's not allowed to append Data to a old Logbook\n\n\
-														 OpenCPN switchs to actual logbook"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText73->Wrap( -1 );
-	bSizer20->Add( m_staticText73, 0, wxALL|wxEXPAND, 5 );
+    m_staticText73 = new wxStaticText( this, wxID_ANY, _( "It's not allowed to append Data to a old Logbook\n\n\
+														 OpenCPN switchs to actual logbook" ), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticText73->Wrap( -1 );
+    bSizer20->Add( m_staticText73, 0, wxALL|wxEXPAND, 5 );
 
-	m_sdbSizer5 = new wxStdDialogButtonSizer();
-	m_sdbSizer5OK = new wxButton( this, wxID_OK );
-	m_sdbSizer5->AddButton( m_sdbSizer5OK );
-	m_sdbSizer5->Realize();
-	bSizer20->Add( m_sdbSizer5, 0, wxALIGN_CENTER, 5 );
+    m_sdbSizer5 = new wxStdDialogButtonSizer();
+    m_sdbSizer5OK = new wxButton( this, wxID_OK );
+    m_sdbSizer5->AddButton( m_sdbSizer5OK );
+    m_sdbSizer5->Realize();
+    bSizer20->Add( m_sdbSizer5, 0, wxALIGN_CENTER, 5 );
 
-	this->SetSizer( bSizer20 );
-	this->Layout();
+    this->SetSizer( bSizer20 );
+    this->Layout();
 
-	this->Centre( wxBOTH );
+    this->Centre( wxBOTH );
 }
 
 NoAppendDialog::~NoAppendDialog()
@@ -3358,280 +3536,280 @@
 ////////////////////////////
 PBVEDialog::PBVEDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	dialog = (LogbookDialog*)parent;
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    dialog = ( LogbookDialog* )parent;
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-	wxBoxSizer* bSizer21;
-	bSizer21 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer21;
+    bSizer21 = new wxBoxSizer( wxVERTICAL );
 
-	m_textCtrlPVBE = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	bSizer21->Add( m_textCtrlPVBE, 1, wxALL|wxEXPAND, 5 );
+    m_textCtrlPVBE = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+    bSizer21->Add( m_textCtrlPVBE, 1, wxALL|wxEXPAND, 5 );
 
-	this->SetSizer( bSizer21 );
-	this->Layout();
+    this->SetSizer( bSizer21 );
+    this->Layout();
 
-	this->Centre( wxBOTH );
-	m_textCtrlPVBE->AppendText(_T("this is a test if you have received PBVE-Sentences\nthey are manufacturer-specific\nit's use is for engine-hours and fuel-consumption\n"));
+    this->Centre( wxBOTH );
+    m_textCtrlPVBE->AppendText( _T( "this is a test if you have received PBVE-Sentences\nthey are manufacturer-specific\nit's use is for engine-hours and fuel-consumption\n" ) );
 }
 
 PBVEDialog::~PBVEDialog()
 {
-	dialog->logbook->pvbe = NULL;
+    dialog->logbook->pvbe = NULL;
 }
 
-void PBVEDialog::PBVEDialogOnClose(wxCloseEvent &event)
+void PBVEDialog::PBVEDialogOnClose( wxCloseEvent &event )
 {
-	dialog->logbook->pvbe = NULL;
+    dialog->logbook->pvbe = NULL;
 }
 
-void PBVEDialog::OnCloseWindow(wxCloseEvent& ev)
+void PBVEDialog::OnCloseWindow( wxCloseEvent& ev )
 {
-	dialog->logbook->pvbe = NULL;
+    dialog->logbook->pvbe = NULL;
 }
 
 /////////////////////// LogbookSearchDlg ////////////////////////////////////////////////////
 
 LogbookSearch::LogbookSearch( wxWindow* parent, int row, int col, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->parent = (LogbookDialog*)parent;
-	this->row = row;
-	this->col = col;
+    this->parent = ( LogbookDialog* )parent;
+    this->row = row;
+    this->col = col;
 
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-	wxBoxSizer* bSizer23;
-	bSizer23 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer23;
+    bSizer23 = new wxBoxSizer( wxVERTICAL );
 
-	wxFlexGridSizer* fgSizer41;
-	fgSizer41 = new wxFlexGridSizer( 0, 3, 0, 0 );
-	fgSizer41->SetFlexibleDirection( wxBOTH );
-	fgSizer41->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxFlexGridSizer* fgSizer41;
+    fgSizer41 = new wxFlexGridSizer( 0, 3, 0, 0 );
+    fgSizer41->SetFlexibleDirection( wxBOTH );
+    fgSizer41->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	m_staticText96 = new wxStaticText( this, wxID_ANY, _("Search in"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	fgSizer41->Add( m_staticText96, 0, wxALL, 5 );
+    m_staticText96 = new wxStaticText( this, wxID_ANY, _( "Search in" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    fgSizer41->Add( m_staticText96, 0, wxALL, 5 );
 
-	m_radioBtnActuell = new wxRadioButton( this, wxID_ANY, _("Actual Logbook"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer41->Add( m_radioBtnActuell, 0, wxALL, 5 );
+    m_radioBtnActual = new wxRadioButton( this, wxID_ANY, _( "Actual Logbook" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer41->Add( m_radioBtnActual, 0, wxALL, 5 );
 
-	m_radioBtnAll = new wxRadioButton( this, wxID_ANY, _("All Logbooks"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer41->Add( m_radioBtnAll, 0, wxALL, 5 );
+    m_radioBtnAll = new wxRadioButton( this, wxID_ANY, _( "All Logbooks" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer41->Add( m_radioBtnAll, 0, wxALL, 5 );
 
-	bSizer23->Add( fgSizer41, 0, wxALIGN_CENTER, 5 );
+    bSizer23->Add( fgSizer41, 0, wxALIGN_CENTER, 5 );
 
-	m_staticline32 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer23->Add( m_staticline32, 0, wxEXPAND | wxALL, 5 );
+    m_staticline32 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer23->Add( m_staticline32, 0, wxEXPAND | wxALL, 5 );
 
-	wxFlexGridSizer* fgSizer411;
-	fgSizer411 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer411->SetFlexibleDirection( wxBOTH );
-	fgSizer411->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxFlexGridSizer* fgSizer411;
+    fgSizer411 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer411->SetFlexibleDirection( wxBOTH );
+    fgSizer411->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	m_staticText108 = new wxStaticText( this, wxID_ANY, _("Searchstring"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText108->Wrap( -1 );
-	fgSizer411->Add( m_staticText108, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticText108 = new wxStaticText( this, wxID_ANY, _( "Searchstring" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText108->Wrap( -1 );
+    fgSizer411->Add( m_staticText108, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_textCtrl72 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 250,-1 ), wxTE_LEFT|wxTE_MULTILINE );
-	fgSizer411->Add( m_textCtrl72, 0, wxALL, 5 );
+    m_textCtrl72 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 250,-1 ), wxTE_LEFT|wxTE_MULTILINE );
+    fgSizer411->Add( m_textCtrl72, 0, wxALL, 5 );
 
-	m_staticText110 = new wxStaticText( this, wxID_ANY, _("In Column"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText110->Wrap( -1 );
-	fgSizer411->Add( m_staticText110, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticText110 = new wxStaticText( this, wxID_ANY, _( "In Column" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText110->Wrap( -1 );
+    fgSizer411->Add( m_staticText110, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	wxArrayString m_choice23Choices;
-	m_choice23 = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( 250,-1 ), m_choice23Choices, 0 );
-	m_choice23->SetSelection( 0 );
-	fgSizer411->Add( m_choice23, 0, wxALL, 5 );
+    wxArrayString m_choice23Choices;
+    m_choice23 = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( 250,-1 ), m_choice23Choices, 0 );
+    m_choice23->SetSelection( 0 );
+    fgSizer411->Add( m_choice23, 0, wxALL, 5 );
 
-	m_staticText97 = new wxStaticText( this, wxID_ANY, _("Date"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText97->Wrap( -1 );
-	fgSizer411->Add( m_staticText97, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+    m_staticText97 = new wxStaticText( this, wxID_ANY, _( "Date" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText97->Wrap( -1 );
+    fgSizer411->Add( m_staticText97, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	wxFlexGridSizer* fgSizer42;
-	fgSizer42 = new wxFlexGridSizer( 0, 3, 0, 0 );
-	fgSizer42->SetFlexibleDirection( wxBOTH );
-	fgSizer42->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxFlexGridSizer* fgSizer42;
+    fgSizer42 = new wxFlexGridSizer( 0, 3, 0, 0 );
+    fgSizer42->SetFlexibleDirection( wxBOTH );
+    fgSizer42->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	wxString m_choiceGreaterEqualChoices[] = { wxT(">="), wxT("<=") };
-	int m_choiceGreaterEqualNChoices = sizeof( m_choiceGreaterEqualChoices ) / sizeof( wxString );
-	m_choiceGreaterEqual = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGreaterEqualNChoices, m_choiceGreaterEqualChoices, 0 );
-	m_choiceGreaterEqual->SetSelection( 0 );
-	fgSizer42->Add( m_choiceGreaterEqual, 0, wxALL, 5 );
+    wxString m_choiceGreaterEqualChoices[] = { wxT( ">=" ), wxT( "<=" ) };
+    int m_choiceGreaterEqualNChoices = sizeof( m_choiceGreaterEqualChoices ) / sizeof( wxString );
+    m_choiceGreaterEqual = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceGreaterEqualNChoices, m_choiceGreaterEqualChoices, 0 );
+    m_choiceGreaterEqual->SetSelection( 0 );
+    fgSizer42->Add( m_choiceGreaterEqual, 0, wxALL, 5 );
 
-	m_datePicker = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT );
-	fgSizer42->Add( m_datePicker, 0, wxALL, 5 );
+    m_datePicker = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT );
+    fgSizer42->Add( m_datePicker, 0, wxALL, 5 );
 
-	m_buttonSelectDate = new wxButton( this, wxID_ANY, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer42->Add( m_buttonSelectDate, 0, wxALL, 5 );
+    m_buttonSelectDate = new wxButton( this, wxID_ANY, _( "Select" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer42->Add( m_buttonSelectDate, 0, wxALL, 5 );
 
-	fgSizer411->Add( fgSizer42, 1, wxEXPAND, 5 );
+    fgSizer411->Add( fgSizer42, 1, wxEXPAND, 5 );
 
-	bSizer23->Add( fgSizer411, 0, wxEXPAND, 5 );
+    bSizer23->Add( fgSizer411, 0, wxEXPAND, 5 );
 
-	m_staticline39 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer23->Add( m_staticline39, 0, wxEXPAND | wxALL, 5 );
+    m_staticline39 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer23->Add( m_staticline39, 0, wxEXPAND | wxALL, 5 );
 
-	wxFlexGridSizer* fgSizer43;
-	fgSizer43 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer43->SetFlexibleDirection( wxBOTH );
-	fgSizer43->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    wxFlexGridSizer* fgSizer43;
+    fgSizer43 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer43->SetFlexibleDirection( wxBOTH );
+    fgSizer43->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	m_buttonBack = new wxButton( this, wxID_ANY, wxT("<<"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer43->Add( m_buttonBack, 0, wxALL, 5 );
+    m_buttonBack = new wxButton( this, wxID_ANY, wxT( "<<" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer43->Add( m_buttonBack, 0, wxALL, 5 );
 
-	m_buttonForward = new wxButton( this, wxID_ANY, wxT(">>"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer43->Add( m_buttonForward, 0, wxALIGN_CENTER|wxALL, 5 );
+    m_buttonForward = new wxButton( this, wxID_ANY, wxT( ">>" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer43->Add( m_buttonForward, 0, wxALIGN_CENTER|wxALL, 5 );
 
-	bSizer23->Add( fgSizer43, 0, wxALIGN_CENTER, 0 );
+    bSizer23->Add( fgSizer43, 0, wxALIGN_CENTER, 0 );
 
-	this->SetSizer( bSizer23 );
-	this->Layout();
+    this->SetSizer( bSizer23 );
+    this->Layout();
 
-	this->Centre( wxBOTH );
+    this->Centre( wxBOTH );
 
-	// Connect Events
-	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookSearch::OnInitDialog ) );
-	m_buttonBack->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickBack ), NULL, this );
-	m_buttonForward->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickForward ), NULL, this );
-	m_buttonSelectDate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickSelectDate ), NULL, this );
+    // Connect Events
+    this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookSearch::OnInitDialog ) );
+    m_buttonBack->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickBack ), NULL, this );
+    m_buttonForward->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickForward ), NULL, this );
+    m_buttonSelectDate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickSelectDate ), NULL, this );
 }
 
 LogbookSearch::~LogbookSearch()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookSearch::OnInitDialog ) );
-	m_buttonBack->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickBack ), NULL, this );
-	m_buttonForward->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickForward ), NULL, this );
-	m_buttonSelectDate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickSelectDate ), NULL, this );
+    // Disconnect Events
+    this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookSearch::OnInitDialog ) );
+    m_buttonBack->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickBack ), NULL, this );
+    m_buttonForward->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickForward ), NULL, this );
+    m_buttonSelectDate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookSearch::OnButtonClickSelectDate ), NULL, this );
 
 }
 
 void LogbookSearch::OnInitDialog( wxInitDialogEvent& event )
 {
-	wxDateTime dt;
-	searchrow = 0;
+    wxDateTime dt;
+    searchrow = 0;
 
-	parent->myParseDate(parent->m_gridGlobal->GetCellValue(0,1),dt);
-	m_datePicker->SetValue(dt);
+    parent->myParseDate( parent->m_gridGlobal->GetCellValue( 0,1 ),dt );
+    m_datePicker->SetValue( dt );
 
-	int gridNo = parent->m_notebook8->GetSelection();
-	for(int i = 0; i < parent->logGrids[gridNo]->GetNumberCols(); i++)
-		this->m_choice23->Append(parent->logGrids[gridNo]->GetColLabelValue(i));
+    int gridNo = parent->m_notebook8->GetSelection();
+    for ( int i = 0; i < parent->logGrids[gridNo]->GetNumberCols(); i++ )
+        this->m_choice23->Append( parent->logGrids[gridNo]->GetColLabelValue( i ) );
 
-	m_choice23->SetSelection(col);
-	m_textCtrl72->SetFocus();
+    m_choice23->SetSelection( col );
+    m_textCtrl72->SetFocus();
 
-	m_radioBtnAll->Hide();
-	Fit();
+    m_radioBtnAll->Hide();
+    Fit();
 }
 
 void LogbookSearch::OnButtonClickSelectDate( wxCommandEvent& event )
 {
-	DateDialog dateDlg(this);
-	if(dateDlg.ShowModal() == wxID_OK)
-		this->m_datePicker->SetValue(dateDlg.m_calendar2->GetDate());
+    DateDialog dateDlg( this );
+    if ( dateDlg.ShowModal() == wxID_OK )
+        this->m_datePicker->SetValue( dateDlg.m_calendar2->GetDate() );
 }
 
 void LogbookSearch::OnButtonClickForward( wxCommandEvent& event )
 {
-	int gridNo = parent->m_notebook8->GetSelection();
-	int col = this->m_choice23->GetSelection();
-	wxString ss = this->m_textCtrl72->GetValue().Lower();
-	wxDateTime dt,dlgDt;
-
-	dlgDt = m_datePicker->GetValue();
-	if(searchrow < 0 ) searchrow = 0 ;
-	if(!direction) searchrow++;
-	direction = true;
-
-	for(; searchrow < parent->logGrids[gridNo]->GetNumberRows(); searchrow++)
-	{
-		parent->myParseDate(parent->logGrids[0]->GetCellValue(searchrow,LogbookHTML::RDATE),dt);
-
-		if(m_choiceGreaterEqual->GetSelection() == 0)
-		{
-			if(dt < dlgDt) 
-				continue;
-		}
-		else
-		{
-			if(dt > dlgDt) 
-				continue;
-		}
-
-		if(parent->logGrids[gridNo]->GetCellValue(searchrow,col).Lower().Contains(ss))
-		{
-			parent->logGrids[gridNo]->SetFocus();
-			parent->logGrids[gridNo]->SetGridCursor(searchrow,col);
-			searchrow++;
-			break;
-		}
-	}
+    int gridNo = parent->m_notebook8->GetSelection();
+    int col = this->m_choice23->GetSelection();
+    wxString ss = this->m_textCtrl72->GetValue().Lower();
+    wxDateTime dt,dlgDt;
+
+    dlgDt = m_datePicker->GetValue();
+    if ( searchrow < 0 ) searchrow = 0 ;
+    if ( !direction ) searchrow++;
+    direction = true;
+
+    for ( ; searchrow < parent->logGrids[gridNo]->GetNumberRows(); searchrow++ )
+    {
+        parent->myParseDate( parent->logGrids[0]->GetCellValue( searchrow,LogbookHTML::RDATE ),dt );
+
+        if ( m_choiceGreaterEqual->GetSelection() == 0 )
+        {
+            if ( dt < dlgDt )
+                continue;
+        }
+        else
+        {
+            if ( dt > dlgDt )
+                continue;
+        }
+
+        if ( parent->logGrids[gridNo]->GetCellValue( searchrow,col ).Lower().Contains( ss ) )
+        {
+            parent->logGrids[gridNo]->SetFocus();
+            parent->logGrids[gridNo]->SetGridCursor( searchrow,col );
+            searchrow++;
+            break;
+        }
+    }
 }
 
 void LogbookSearch::OnButtonClickBack( wxCommandEvent& event )
 {
-	int gridNo = parent->m_notebook8->GetSelection();
-	int col = this->m_choice23->GetSelection();
-	wxString ss = this->m_textCtrl72->GetValue().Lower();
-	wxDateTime dt,dlgDt;
-
-	if(direction) searchrow--;
-	direction = false;
-
-	dlgDt = m_datePicker->GetValue();
-	if(searchrow > parent->logGrids[gridNo]->GetNumberRows()-1) searchrow--;
-
-	for(; searchrow >= 0; searchrow--)
-	{
-		parent->myParseDate(parent->logGrids[0]->GetCellValue(searchrow,LogbookHTML::RDATE),dt);
-		if(m_choiceGreaterEqual->GetSelection() == 0)
-		{
-			if(m_choiceGreaterEqual->GetSelection() == 0)
-			{
-				if(dt < dlgDt) 
-					continue;
-			}
-			else
-			{
-				if(dt > dlgDt) 
-					continue;
-			}
-		}
-
-		if(parent->logGrids[gridNo]->GetCellValue(searchrow,col).Lower().Contains(ss))
-		{
-			parent->logGrids[gridNo]->SetFocus();
-			parent->logGrids[gridNo]->SetGridCursor(searchrow,col);
-			searchrow--;
-			break;
-		}
-	}
+    int gridNo = parent->m_notebook8->GetSelection();
+    int col = this->m_choice23->GetSelection();
+    wxString ss = this->m_textCtrl72->GetValue().Lower();
+    wxDateTime dt,dlgDt;
+
+    if ( direction ) searchrow--;
+    direction = false;
+
+    dlgDt = m_datePicker->GetValue();
+    if ( searchrow > parent->logGrids[gridNo]->GetNumberRows()-1 ) searchrow--;
+
+    for ( ; searchrow >= 0; searchrow-- )
+    {
+        parent->myParseDate( parent->logGrids[0]->GetCellValue( searchrow,LogbookHTML::RDATE ),dt );
+        if ( m_choiceGreaterEqual->GetSelection() == 0 )
+        {
+            if ( m_choiceGreaterEqual->GetSelection() == 0 )
+            {
+                if ( dt < dlgDt )
+                    continue;
+            }
+            else
+            {
+                if ( dt > dlgDt )
+                    continue;
+            }
+        }
+
+        if ( parent->logGrids[gridNo]->GetCellValue( searchrow,col ).Lower().Contains( ss ) )
+        {
+            parent->logGrids[gridNo]->SetFocus();
+            parent->logGrids[gridNo]->SetGridCursor( searchrow,col );
+            searchrow--;
+            break;
+        }
+    }
 }
 
 ////////////////////  Reminder Dlg //////////////////////
-LinesReminderDlg::LinesReminderDlg(wxString str, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+LinesReminderDlg::LinesReminderDlg( wxString str, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-	wxBoxSizer* bSizer38;
-	bSizer38 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer38;
+    bSizer38 = new wxBoxSizer( wxVERTICAL );
 
-	m_staticTextreminder = new wxStaticText( this, wxID_ANY, str, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticTextreminder->Wrap( -1 );
-	bSizer38->Add( m_staticTextreminder, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+    m_staticTextreminder = new wxStaticText( this, wxID_ANY, str, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticTextreminder->Wrap( -1 );
+    bSizer38->Add( m_staticTextreminder, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-	m_sdbSizer9 = new wxStdDialogButtonSizer();
-	m_sdbSizer9OK = new wxButton( this, wxID_OK );
-	m_sdbSizer9->AddButton( m_sdbSizer9OK );
-	m_sdbSizer9->Realize();
-	bSizer38->Add( m_sdbSizer9, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+    m_sdbSizer9 = new wxStdDialogButtonSizer();
+    m_sdbSizer9OK = new wxButton( this, wxID_OK );
+    m_sdbSizer9->AddButton( m_sdbSizer9OK );
+    m_sdbSizer9->Realize();
+    bSizer38->Add( m_sdbSizer9, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-	this->SetSizer( bSizer38 );
-	this->Layout();
+    this->SetSizer( bSizer38 );
+    this->Layout();
 
-	this->Fit();
-	this->Centre( wxBOTH );
+    this->Fit();
+    this->Centre( wxBOTH );
 }
 
 LinesReminderDlg::~LinesReminderDlg()
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/LogbookDialog.cpp opencpn-plugin-logbookkonni-1.2024/src/LogbookDialog.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/LogbookDialog.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/LogbookDialog.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -31,7 +31,7 @@
 #include <wx/textctrl.h>
 #include <wx/html/htmlwin.h>
 #include <wx/dialog.h>
-#include <wx/dirdlg.h> 
+#include <wx/dirdlg.h>
 #include <wx/splitter.h>
 #include <wx/treectrl.h>
 #include "wx/stdpaths.h"
@@ -41,14 +41,14 @@
 #include "wx/grid.h"
 #include <wx/msgdlg.h>
 #include <wx/textctrl.h>
-#include <wx/dir.h> 
+#include <wx/dir.h>
 #include <wx/filefn.h>
-#include <wx/msgdlg.h> 
+#include <wx/msgdlg.h>
 #include <wx/textfile.h>
 #include <wx/tokenzr.h>
 #include <wx/mimetype.h>
 #include <wx/platinfo.h>
-#include <wx/timer.h> 
+#include <wx/timer.h>
 #include <wx/arrimpl.cpp>
 #if wxCHECK_VERSION(2,9,0)
 #ifdef __WXOSX__
@@ -64,52 +64,52 @@
 //#define PBVE_DEBUG 1
 //////////////////////////////////////////////////////////////////////////
 
-WX_DEFINE_ARRAY_INT(unsigned int, ArrayTimerFull);
-WX_DEFINE_ARRAY_INT(unsigned int, ArrayTimerIndividualH);
-WX_DEFINE_ARRAY_INT(unsigned int, ArrayTimerIndividualM);
+WX_DEFINE_ARRAY_INT( unsigned int, ArrayTimerFull );
+WX_DEFINE_ARRAY_INT( unsigned int, ArrayTimerIndividualH );
+WX_DEFINE_ARRAY_INT( unsigned int, ArrayTimerIndividualM );
 
-ArrayTimerFull TimerFull; 
+ArrayTimerFull TimerFull;
 ArrayTimerIndividualH TimerIndividualH;
 ArrayTimerIndividualM TimerIndividualM;
 wxArrayString TimerIndidividualAMPM;
 
-LogbookDialog::LogbookDialog(logbookkonni_pi * d, wxTimer* t, LogbookTimer* lt, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style )
-:wxDialog( parent, id, title, pos, size, style )
+LogbookDialog::LogbookDialog( logbookkonni_pi * d, wxTimer* t, LogbookTimer* lt, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style )
+    :wxDialog( parent, id, title, pos, size, style )
 {
-	logbook = NULL;
-	logbookPlugIn = d;
-	timer = t;
-	logbookTimerWindow = lt;
-	GPSTimer = NULL;
+    logbook = NULL;
+    logbookPlugIn = d;
+    timer = t;
+    logbookTimerWindow = lt;
+    GPSTimer = NULL;
 //	wxInitAllImageHandlers();
 
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
+    this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+
     wxSizer* bSizer2;
-	bSizer2 = new wxBoxSizer( wxVERTICAL );
-	
-	m_logbook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP );
-	m_panel2 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer361;
-	bSizer361 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer6 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button4 = new wxButton( m_panel2, wxID_ANY , _("Add Line"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_button4->SetToolTip( _("add a line to the end of your logbook") );
-	
-	bSizer6->Add( m_button4, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	logSave = new wxButton( m_panel2, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
-	logSave->SetToolTip( _("export your logbook-data as:\nHTML, ODT,  ODS, XML, CSV") );
-	
-	bSizer6->Add( logSave, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_staticline8 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer6->Add( m_staticline8, 0, wxEXPAND | wxALL, 5 );
-	
-	m_bpButtonShowHideLayout = new wxBitmapButton( m_panel2, wxID_ANY, forward_xpm, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-    m_bpButtonShowHideLayout->SetToolTip( _("Show Layout Selection Mode") );
+    bSizer2 = new wxBoxSizer( wxVERTICAL );
+
+    m_logbook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_TOP );
+    m_panel2 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer361;
+    bSizer361 = new wxBoxSizer( wxVERTICAL );
+
+    bSizer6 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button4 = new wxButton( m_panel2, wxID_ANY , _( "Add Line" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_button4->SetToolTip( _( "add a line to the end of your logbook" ) );
+
+    bSizer6->Add( m_button4, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    logSave = new wxButton( m_panel2, wxID_ANY, _( "Export" ), wxDefaultPosition, wxDefaultSize, 0 );
+    logSave->SetToolTip( _( "export your logbook-data as:\nHTML, ODT,  ODS, XML, CSV" ) );
+
+    bSizer6->Add( logSave, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_staticline8 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer6->Add( m_staticline8, 0, wxEXPAND | wxALL, 5 );
+
+    m_bpButtonShowHideLayout = new wxBitmapButton( m_panel2, wxID_ANY, forward_xpm, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+    m_bpButtonShowHideLayout->SetToolTip( _( "Show Layout Selection Mode" ) );
 
     bSizer6->Add( m_bpButtonShowHideLayout, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
@@ -117,26 +117,26 @@
     wxBoxSizer* bSizer46;
     bSizer46 = new wxBoxSizer( wxHORIZONTAL );
 
-	m_staticText32 = new wxStaticText( m_panelLayout, wxID_ANY, _("Select Layout: "), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText32->Wrap( -1 );
-	bSizer46->Add( m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-	
-	wxArrayString logbookChoiceChoices;
-	logbookChoice = new wxChoice( m_panelLayout, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), logbookChoiceChoices, 0 );
-	logbookChoice->SetSelection( 0 );
-	logbookChoice->SetToolTip( _("Select a layout which is displayed\nwith button \"View\"") );
-	
-	bSizer46->Add( logbookChoice, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_buttonReloadLayout = new wxButton( m_panelLayout, wxID_ANY, _("R"), wxPoint( -1,-1 ), wxSize( -1,-1 ), wxBU_EXACTFIT );
-	m_buttonReloadLayout->SetToolTip( _("Reload Layouts") );
-	
-	bSizer46->Add( m_buttonReloadLayout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-	
-	m_buttonEditLayout = new wxButton( m_panelLayout, wxID_ANY, _("E"), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT );
-	m_buttonEditLayout->SetToolTip( _("Edit Layout") );
-	
-	bSizer46->Add( m_buttonEditLayout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+    m_staticText32 = new wxStaticText( m_panelLayout, wxID_ANY, _( "Select Layout: " ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText32->Wrap( -1 );
+    bSizer46->Add( m_staticText32, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+    wxArrayString logbookChoiceChoices;
+    logbookChoice = new wxChoice( m_panelLayout, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), logbookChoiceChoices, 0 );
+    logbookChoice->SetSelection( 0 );
+    logbookChoice->SetToolTip( _( "Select a layout which is displayed\nwith button \"View\"" ) );
+
+    bSizer46->Add( logbookChoice, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_buttonReloadLayout = new wxButton( m_panelLayout, wxID_ANY, _( "R" ), wxPoint( -1,-1 ), wxSize( -1,-1 ), wxBU_EXACTFIT );
+    m_buttonReloadLayout->SetToolTip( _( "Reload Layouts" ) );
+
+    bSizer46->Add( m_buttonReloadLayout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+    m_buttonEditLayout = new wxButton( m_panelLayout, wxID_ANY, _( "E" ), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT );
+    m_buttonEditLayout->SetToolTip( _( "Edit Layout" ) );
+
+    bSizer46->Add( m_buttonEditLayout, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
     m_panelLayout->SetSizer( bSizer46 );
     m_panelLayout->Layout();
@@ -149,459 +149,197 @@
     wxBoxSizer* bSizer45;
     bSizer45 = new wxBoxSizer( wxHORIZONTAL );
 
-	wxBoxSizer* bSizer49;
-	bSizer49 = new wxBoxSizer( wxVERTICAL );
-	
-	m_toggleBtnEngine1 = new wxToggleButton( m_panelEngine, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer49->Add( m_toggleBtnEngine1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 0 );
-	
-	m_toggleBtnEngine2 = new wxToggleButton( m_panelEngine, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer49->Add( m_toggleBtnEngine2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 0 );
+    wxBoxSizer* bSizer49;
+    bSizer49 = new wxBoxSizer( wxVERTICAL );
+
+    m_toggleBtnEngine1 = new wxToggleButton( m_panelEngine, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer49->Add( m_toggleBtnEngine1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 0 );
+
+    m_toggleBtnEngine2 = new wxToggleButton( m_panelEngine, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer49->Add( m_toggleBtnEngine2, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 0 );
 
     m_toggleBtnGenerator = new wxToggleButton( m_panelEngine, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
     bSizer49->Add( m_toggleBtnGenerator, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 0 );
-    
+
     bSizer45->Add( bSizer49, 0, wxRIGHT|wxLEFT|wxBOTTOM, 5 );
-	
-	fgSizerSails = new wxFlexGridSizer( 3, 5, 0, 0 );
-	fgSizerSails->SetFlexibleDirection( wxBOTH );
-	fgSizerSails->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE );
-		
-	bSizer45->Add( fgSizerSails, 0, wxRIGHT|wxLEFT, 0 );
+
+    fgSizerSails = new wxFlexGridSizer( 3, 5, 0, 0 );
+    fgSizerSails->SetFlexibleDirection( wxBOTH );
+    fgSizerSails->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE );
+
+    bSizer45->Add( fgSizerSails, 0, wxRIGHT|wxLEFT, 0 );
     m_panelEngine->SetSizer( bSizer45 );
     m_panelEngine->Layout();
     bSizer45->Fit( m_panelEngine );
     bSizer6->Add( m_panelEngine, 1, wxEXPAND | wxALL, 0 );
-	
-	m_radioBtnHTML = new wxRadioButton( m_panel2, wxID_ANY, _("HTML"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnHTML->SetValue( true ); 
-	bSizer6->Add( m_radioBtnHTML, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_radioBtnODT = new wxRadioButton( m_panel2, wxID_ANY, _("ODT"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer6->Add( m_radioBtnODT, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	logView = new wxButton( m_panel2, wxID_ANY, _("View"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	logView->SetToolTip( _("View data in browser (HTML) or Openoffice/LibreOffice (ODT)") );
-	
-	bSizer6->Add( logView, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_staticline7 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer6->Add( m_staticline7, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	newLogbook = new wxButton( m_panel2, wxID_ANY, _("New Logbook"), wxDefaultPosition, wxDefaultSize, 0 );
-	newLogbook->SetToolTip( _("Create a new logbook\nthe active logbook is saved with today's date\nand can be viewed with Button \"Select Logbook\"") );
+
+    m_radioBtnHTML = new wxRadioButton( m_panel2, wxID_ANY, _( "HTML" ), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnHTML->SetValue( true );
+    bSizer6->Add( m_radioBtnHTML, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_radioBtnODT = new wxRadioButton( m_panel2, wxID_ANY, _( "ODT" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer6->Add( m_radioBtnODT, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    logView = new wxButton( m_panel2, wxID_ANY, _( "View" ), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    logView->SetToolTip( _( "View data in browser (HTML) or Openoffice/LibreOffice (ODT)" ) );
+
+    bSizer6->Add( logView, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_staticline7 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer6->Add( m_staticline7, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    newLogbook = new wxButton( m_panel2, wxID_ANY, _( "New Logbook" ), wxDefaultPosition, wxDefaultSize, 0 );
+    newLogbook->SetToolTip( _( "Create a new logbook\nthe active logbook is saved with today's date\nand can be viewed with Button \"Select Logbook\"" ) );
 
     bSizer6->Add( newLogbook, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-	
-	selLogbook = new wxButton( m_panel2, wxID_ANY, _("Select Logbook"), wxDefaultPosition, wxDefaultSize, 0 );
-	selLogbook->SetToolTip( _("Select a old logbook\nEverytime a new logbook is created, you'll \nfind the active logbook as old logbook here") );
+
+    selLogbook = new wxButton( m_panel2, wxID_ANY, _( "Select Logbook" ), wxDefaultPosition, wxDefaultSize, 0 );
+    selLogbook->SetToolTip( _( "Select a old logbook\nEverytime a new logbook is created, you'll \nfind the active logbook as old logbook here" ) );
 
     bSizer6->Add( selLogbook, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
 
-	m_staticline411 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer6->Add( m_staticline411, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_bpButtonShowHideStatusGlobal = new wxBitmapButton( m_panel2, wxID_ANY, up_xpm, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonShowHideStatusGlobal->SetToolTip( _("Show/Hide Statusbar") );
-	
-	bSizer6->Add( m_bpButtonShowHideStatusGlobal, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonHelpGlobal = new wxBitmapButton( m_panel2, wxID_ANY, wxArtProvider::GetBitmap( wxART_HELP_BOOK, wxART_BUTTON ), wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonHelpGlobal->SetToolTip( _("Help") );
-	
-	bSizer6->Add( m_bpButtonHelpGlobal, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-	bSizer361->Add( bSizer6, 0, 0, 0 );
-	
-	m_staticline401 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer361->Add( m_staticline401, 0, wxEXPAND | wxALL, 5 );
+    m_staticline411 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer6->Add( m_staticline411, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_bpButtonShowHideStatusGlobal = new wxBitmapButton( m_panel2, wxID_ANY, up_xpm, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+    m_bpButtonShowHideStatusGlobal->SetToolTip( _( "Show/Hide Statusbar" ) );
+
+    bSizer6->Add( m_bpButtonShowHideStatusGlobal, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonHelpGlobal = new wxBitmapButton( m_panel2, wxID_ANY, wxArtProvider::GetBitmap( wxART_HELP_BOOK, wxART_BUTTON ), wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+    m_bpButtonHelpGlobal->SetToolTip( _( "Help" ) );
+
+    bSizer6->Add( m_bpButtonHelpGlobal, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    bSizer361->Add( bSizer6, 0, 0, 0 );
+
+    m_staticline401 = new wxStaticLine( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer361->Add( m_staticline401, 0, wxEXPAND | wxALL, 5 );
 
-    // inserted statusbar start
-    
     Statusbar = new wxPanel( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     Statusbar->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-    
+
     wxBoxSizer* bSizer39;
     bSizer39 = new wxBoxSizer( wxHORIZONTAL );
-    
-    m_buttonSetTimer = new wxButton( Statusbar, wxID_ANY, _("Set Timer"), wxDefaultPosition, wxSize( -1,20 ), 0 );
-    m_buttonSetTimer->SetToolTip( _("Set the interval for the timer") );
-    
+
+    m_buttonSetTimer = new wxButton( Statusbar, wxID_ANY, _( "Set Timer" ), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonSetTimer->SetToolTip( _( "Set the interval for the timer" ) );
+
     bSizer39->Add( m_buttonSetTimer, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 0 );
-    
-#if wxCHECK_VERSION(2, 9, 0)
-    m_bpButtonTimer = new myBitmapButton( Statusbar, wxID_ANY, _("Timer"),*_img_Bullet_red, wxDefaultPosition, wxSize( -1,20 ), 0 );
-#else
-    m_staticText1241 = new wxStaticText( Statusbar, wxID_ANY, _("Timer"), wxDefaultPosition, wxDefaultSize, 0 );
+
+#ifdef __WXGTK__
+    m_staticText1241 = new wxStaticText( Statusbar, wxID_ANY, _( "Timer" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText1241->Wrap( -1 );
     bSizer39->Add( m_staticText1241, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
     m_bpButtonTimer = new myBitmapButton( Statusbar, wxID_ANY, *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+#else
+    m_bpButtonTimer = new myBitmapButton( Statusbar, wxID_ANY, _( "Timer" ),*_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 #endif
+
     bSizer39->Add( m_bpButtonTimer, 0, wxALIGN_CENTER_VERTICAL, 5 );
     m_staticline40 = new wxStaticLine( Statusbar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
     bSizer39->Add( m_staticline40, 0, wxEXPAND | wxALL, 5 );
-    
-#if wxCHECK_VERSION(2, 9, 0)
-    m_bpButtonWatch = new myBitmapButton( Statusbar, wxID_ANY, _("Watch"), *_img_Bullet_red, wxDefaultPosition, wxSize( -1,20 ), 0 );
-#else
-    m_staticText12411 = new wxStaticText( Statusbar, wxID_ANY, _("Watch"), wxDefaultPosition, wxDefaultSize, 0 );
+
+#ifdef __WXGTK__
+    m_staticText12411 = new wxStaticText( Statusbar, wxID_ANY, _( "Watch" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText12411->Wrap( -1 );
     bSizer39->Add( m_staticText12411, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
     m_bpButtonWatch = new myBitmapButton( Statusbar, wxID_ANY, *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+#else
+    m_bpButtonWatch = new myBitmapButton( Statusbar, wxID_ANY, _( "Watch" ), *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 #endif
-    
+
     bSizer39->Add( m_bpButtonWatch, 0, wxALIGN_CENTER_VERTICAL, 5 );
-    
+
     m_staticline41 = new wxStaticLine( Statusbar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
     bSizer39->Add( m_staticline41, 0, wxEXPAND | wxALL, 5 );
-    
-#if wxCHECK_VERSION(2, 9, 0)
-    m_bpButton8Waypoint = new myBitmapButton( Statusbar, wxID_ANY,  _("Waypoint"), *_img_Bullet_red, wxDefaultPosition, wxSize( -1,20 ), 0 );
-#else
-    m_staticText124111 = new wxStaticText( Statusbar, wxID_ANY, _("Waypoint"), wxDefaultPosition, wxDefaultSize, 0 );
+
+#ifdef __WXGTK__
+    m_staticText124111 = new wxStaticText( Statusbar, wxID_ANY, _( "Waypoint" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText124111->Wrap( -1 );
     bSizer39->Add( m_staticText124111, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
     m_bpButton8Waypoint = new myBitmapButton( Statusbar, wxID_ANY, *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+#else
+    m_bpButton8Waypoint = new myBitmapButton( Statusbar, wxID_ANY,  _( "Waypoint" ), *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 #endif
+
     bSizer39->Add( m_bpButton8Waypoint, 0, wxALIGN_CENTER_VERTICAL, 5 );
-    
+
     m_staticline42 = new wxStaticLine( Statusbar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
     bSizer39->Add( m_staticline42, 0, wxEXPAND | wxALL, 5 );
-    
-#if wxCHECK_VERSION(2, 9, 0)
-    m_bpButtonDistance = new myBitmapButton( Statusbar, wxID_ANY,  _("Distance"), *_img_Bullet_red, wxDefaultPosition, wxSize( -1,20 ), 0 );
-#else
-    m_staticText12411 = new wxStaticText( Statusbar, wxID_ANY, _("Distance"), wxDefaultPosition, wxDefaultSize, 0 );
+
+#ifdef __WXGTK__
+    m_staticText12411 = new wxStaticText( Statusbar, wxID_ANY, _( "Distance" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText12411->Wrap( -1 );
     bSizer39->Add( m_staticText12411, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
     m_bpButtonDistance = new myBitmapButton( Statusbar, wxID_ANY, *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+#else
+    m_bpButtonDistance = new myBitmapButton( Statusbar, wxID_ANY,  _( "Distance" ), *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 #endif
-    
+
     bSizer39->Add( m_bpButtonDistance, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-    
+
     m_textCtrlStatusDistance = new wxTextCtrl( Statusbar, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), wxTE_PROCESS_ENTER  );
-    m_textCtrlStatusDistance->SetToolTip( _("Set the desired distance in NM\n = (Track made good)") );
-    
+    m_textCtrlStatusDistance->SetToolTip( _( "Set the desired distance in NM\n = (Track made good)" ) );
+
     bSizer39->Add( m_textCtrlStatusDistance, 0, wxALIGN_CENTER_VERTICAL, 5 );
-    
+
     m_staticline43 = new wxStaticLine( Statusbar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
     bSizer39->Add( m_staticline43, 0, wxEXPAND | wxALL, 5 );
-    
-#if wxCHECK_VERSION(2, 9, 0)
-    m_bpButtonCourse = new myBitmapButton( Statusbar, wxID_ANY, _("Course"),  *_img_Bullet_red );
-#else
-    m_staticText1241 = new wxStaticText( Statusbar, wxID_ANY, _("Course"), wxDefaultPosition, wxDefaultSize, 0  );
+
+#ifdef __WXGTK__
+    m_staticText1241 = new wxStaticText( Statusbar, wxID_ANY, _( "Course" ), wxDefaultPosition, wxDefaultSize, 0  );
     m_staticText1241->Wrap( -1 );
     bSizer39->Add( m_staticText1241, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
     m_bpButtonCourse = new myBitmapButton( Statusbar, wxID_ANY, *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+#else
+    m_bpButtonCourse = new myBitmapButton( Statusbar, wxID_ANY, _( "Course" ),  *_img_Bullet_red, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 #endif
     bSizer39->Add( m_bpButtonCourse, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-    
+
     m_textCtrlStatusCourseDeg = new wxTextCtrl( Statusbar, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER  );
-    m_textCtrlStatusCourseDeg->SetToolTip( _("Set desired Degrees\nif the course changes by this amount\na course-changed-event occurs") );
-    
+    m_textCtrlStatusCourseDeg->SetToolTip( _( "Set desired Degrees\nif the course changes by this amount\na course-changed-event occurs" ) );
+
     bSizer39->Add( m_textCtrlStatusCourseDeg, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-    
+
     m_textCtrlStatusCourseMin = new wxTextCtrl( Statusbar, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 35,-1 ), wxTE_PROCESS_ENTER  );
-    m_textCtrlStatusCourseMin->SetToolTip( _("Set desired delay in minutes\nIt's a good idea to set here a value > 0\nto find the right wind.") );
-    
+    m_textCtrlStatusCourseMin->SetToolTip( _( "Set desired delay in minutes\nIt's a good idea to set here a value > 0\nto find the right wind." ) );
+
     bSizer39->Add( m_textCtrlStatusCourseMin, 0, wxALIGN_CENTER_VERTICAL, 5 );
-    
+
     m_staticline44 = new wxStaticLine( Statusbar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
     bSizer39->Add( m_staticline44, 0, wxEXPAND | wxALL, 5 );
-    
-    m_buttonStartStop = new wxButton( Statusbar, wxID_ANY, _("Stop"), wxDefaultPosition, wxSize( -1,20 ), 0 );
+
+    m_buttonStartStop = new wxButton( Statusbar, wxID_ANY, _( "Stop" ), wxDefaultPosition, wxSize( -1,-1 ), 0 );
     m_buttonStartStop->Enable( false );
-    m_buttonStartStop->SetToolTip( _("Suspend/Resume running event/s") );
-    
+    m_buttonStartStop->SetToolTip( _( "Suspend/Resume running event/s" ) );
+
     bSizer39->Add( m_buttonStartStop, 0, wxALIGN_CENTER_VERTICAL, 5 );
-    
+
     m_staticline46 = new wxStaticLine( Statusbar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
     bSizer39->Add( m_staticline46, 0, wxEXPAND | wxALL, 5 );
-    
+
     wxFlexGridSizer* fgSizer53;
     fgSizer53 = new wxFlexGridSizer( 1, 1, 0, 0 );
     fgSizer53->AddGrowableCol( 0 );
     fgSizer53->AddGrowableRow( 0 );  // T und T ???
-    
+
     fgSizer53->SetFlexibleDirection( wxBOTH );
     fgSizer53->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-    
+
 #ifdef __WXOSX__
     fgSizer53->SetMinSize( wxSize( -1,45 ) );  // war ,25
-    m_staticTextStatusText = new wxStaticText( Statusbar, wxID_ANY, _T("T\nT"), wxDefaultPosition, wxSize(350,-1), 0 );
+    m_staticTextStatusText = new wxStaticText( Statusbar, wxID_ANY, _T( "T\nT" ), wxDefaultPosition, wxSize( 350,-1 ), 0 );
 #else
-    m_staticTextStatusText = new wxStaticText( Statusbar, wxID_ANY, _T("T\nT"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusText = new wxStaticText( Statusbar, wxID_ANY, _T( "T\nT" ), wxDefaultPosition, wxDefaultSize, 0 );
 #endif
     m_staticTextStatusText->Wrap( -1 );
     fgSizer53->Add( m_staticTextStatusText, 0, wxRIGHT|wxLEFT, 5 );
-    m_staticTextStatusText->SetFont( wxFont( 7, 74, 90, 90, false, wxT("Tahoma") ) );
-    
+    m_staticTextStatusText->SetFont( wxFont( 7, 74, 90, 90, false, wxT( "Tahoma" ) ) );
+
     bSizer39->Add( fgSizer53, 1, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 0 );
- 
-    if (!logbookPlugIn->opt->statusbar)
-    {
-    Statusbar->SetSizer( bSizer39 );
-    Statusbar->Layout();
-    bSizer39->Fit( Statusbar );
-    bSizer361->Add( Statusbar, 0, wxEXPAND, 5 );
-    }
-    
-// -------inserted statusbar end
-    
-	m_notebook8 = new wxNotebook( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panel6 = new wxPanel( m_notebook8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    
-	wxBoxSizer* bSizer391;
-	bSizer391 = new wxBoxSizer( wxVERTICAL );
-	m_gridGlobal = new wxGrid( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
-	
-	// Grid
-	m_gridGlobal->CreateGrid( 0, 14 );
-	m_gridGlobal->EnableEditing( true );
-	m_gridGlobal->EnableGridLines( true );
-	m_gridGlobal->EnableDragGridSize( false );
-	m_gridGlobal->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridGlobal->SetColSize( 0, 144 );
-	m_gridGlobal->SetColSize( 1, 89 );
-	m_gridGlobal->SetColSize( 2, 63 );
-	m_gridGlobal->SetColSize( 3, 35 );
-	m_gridGlobal->SetColSize( 4, 157 );
-	m_gridGlobal->SetColSize( 5, 58 );
-	m_gridGlobal->SetColSize( 6, 86 );
-	m_gridGlobal->SetColSize( 7, 143 );
-	m_gridGlobal->SetColSize( 8, 54 );
-	m_gridGlobal->SetColSize( 9, 50 );
-	m_gridGlobal->SetColSize( 10, 55 );
-	m_gridGlobal->SetColSize( 11, 57 );
-	m_gridGlobal->SetColSize( 12, 62 );
-	m_gridGlobal->SetColSize( 13, 248 );
-	m_gridGlobal->EnableDragColMove( false );
-	m_gridGlobal->EnableDragColSize( true );
-	m_gridGlobal->SetColLabelSize( 30 );
-	m_gridGlobal->SetColLabelValue( 0, _("Route") );
-	m_gridGlobal->SetColLabelValue( 1, _("Date") );
-	m_gridGlobal->SetColLabelValue( 2, _("Time") );
-	m_gridGlobal->SetColLabelValue( 3, _("Status") );
-	m_gridGlobal->SetColLabelValue( 4, _("Watch") );
-	m_gridGlobal->SetColLabelValue( 5, _("Distance") );
-	m_gridGlobal->SetColLabelValue( 6, _("DistanceTotal") );
-	m_gridGlobal->SetColLabelValue( 7, _("Position") );
-	m_gridGlobal->SetColLabelValue( 8, _("COG (T)") );
-	m_gridGlobal->SetColLabelValue( 9, _("Heading") );
-	m_gridGlobal->SetColLabelValue( 10, _("SOG") );
-	m_gridGlobal->SetColLabelValue( 11, _("STW") );
-	m_gridGlobal->SetColLabelValue( 12, _("Depth") );
-	m_gridGlobal->SetColLabelValue( 13, _("Remarks") );
-	m_gridGlobal->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-	// Rows
-	m_gridGlobal->AutoSizeRows();
-	m_gridGlobal->EnableDragRowSize( true );
-	m_gridGlobal->SetRowLabelSize( 30 );
-	m_gridGlobal->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridGlobal->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
-	m_menu1 = new wxMenu();
-	wxMenuItem* m_menuItem1;
-	m_menuItem1 = new wxMenuItem( m_menu1, 500, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem1 );
-	
-	m_menu1->AppendSeparator();
-	
-	wxMenuItem* m_menuItem132;
-	m_menuItem132 = new wxMenuItem( m_menu1, 503, wxString( _("Show hidden columns") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem132 );
-	
-	wxMenuItem* m_menuItem15;
-	m_menuItem15 = new wxMenuItem( m_menu1, 506, wxString( _("Hide column") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItem15 );
-	
-	wxMenuItem* m_menuItemSearch;
-	m_menuItemSearch = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Search in Logbook") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItemSearch );
-	
-	m_menu1->AppendSeparator();
-	
-	wxMenuItem* m_menuItemShutDown;
-	m_menuItemShutDown = new wxMenuItem( m_menu1, wxID_ANY, wxString( _("Shutdown Logbook") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu1->Append( m_menuItemShutDown );
-	
-	m_gridGlobal->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( LogbookDialog::m_gridGlobalOnContextMenu ), NULL, this ); 
-	
-	bSizer391->Add( m_gridGlobal, 1, wxALL|wxEXPAND, 5 );
-	
-	m_panel6->SetSizer( bSizer391 );
-	m_panel6->Layout();
-	bSizer391->Fit( m_panel6 );
-
-	m_menu10 = new wxMenu();
-	wxMenuItem* m_menuItemDelRows;
-	m_menuItemDelRows = new wxMenuItem( m_menu10, 518, wxString( _("Delete Rows") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu10->Append( m_menuItemDelRows );
-	
-	wxMenuItem* m_menuItemFlip;
-	m_menuItemFlip = new wxMenuItem( m_menu10, 519, wxString( _("Flip Day<->Month") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu10->Append( m_menuItemFlip );
-
-	m_notebook8->AddPage( m_panel6, _("Navigation"), true );
-	m_panel7 = new wxPanel( m_notebook8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer11;
-	bSizer11 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gridWeather = new wxGrid( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
-	
-	// Grid
-	m_gridWeather->CreateGrid( 0, 15 );
-	m_gridWeather->EnableEditing( true );
-	m_gridWeather->EnableGridLines( true );
-	m_gridWeather->EnableDragGridSize( false );
-	m_gridWeather->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridWeather->SetColSize( 0, 69 );
-	m_gridWeather->SetColSize( 1, 78 );
-	m_gridWeather->SetColSize( 2, 74 );
-	m_gridWeather->SetColSize( 3, 66 );
-	m_gridWeather->SetColSize( 4, 81 );
-	m_gridWeather->SetColSize( 5, 76 );
-	m_gridWeather->SetColSize( 6, 81 );
-	m_gridWeather->SetColSize( 7, 76 );
-	m_gridWeather->SetColSize( 8, 63 );
-	m_gridWeather->SetColSize( 9, 76 );
-	m_gridWeather->SetColSize( 10, 92 );
-	m_gridWeather->SetColSize( 11, 89 );
-	m_gridWeather->SetColSize( 12, 80 );
-	m_gridWeather->SetColSize( 13, 80 );
-	m_gridWeather->SetColSize( 14, 80 );
-	m_gridWeather->EnableDragColMove( false );
-	m_gridWeather->EnableDragColSize( true );
-	m_gridWeather->SetColLabelSize( 30 );
-	m_gridWeather->SetColLabelValue( 0, _("Barometer") );
-	m_gridWeather->SetColLabelValue( 1, _("Hygrometer") );
-	m_gridWeather->SetColLabelValue( 2, _("Air") );
-	m_gridWeather->SetColLabelValue( 3, _("Water") );
-	m_gridWeather->SetColLabelValue( 4, _("TWA") );
-	m_gridWeather->SetColLabelValue( 5, _("TWS") );
-	m_gridWeather->SetColLabelValue( 6, _("AWA") );
-	m_gridWeather->SetColLabelValue( 7, _("AWS") );
-	m_gridWeather->SetColLabelValue( 8, _("Current") );
-	m_gridWeather->SetColLabelValue( 9, _("C/Strength") );
-	m_gridWeather->SetColLabelValue( 10, _("Wave") );
-	m_gridWeather->SetColLabelValue( 11, _("Swell") );
-	m_gridWeather->SetColLabelValue( 12, _("Weather") );
-	m_gridWeather->SetColLabelValue( 13, _("Clouds") );
-	m_gridWeather->SetColLabelValue( 14, _("Visibility") );
-	m_gridWeather->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridWeather->EnableDragRowSize( true );
-	m_gridWeather->SetRowLabelSize( 30 );
-	m_gridWeather->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridWeather->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
-	bSizer11->Add( m_gridWeather, 1, wxEXPAND|wxALL, 5 );
-	
-	m_panel7->SetSizer( bSizer11 );
-	m_panel7->Layout();
-	bSizer11->Fit( m_panel7 );
-	m_notebook8->AddPage( m_panel7, _("Meteo"), false );
-	m_panel71 = new wxPanel( m_notebook8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer111;
-	bSizer111 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gridMotorSails = new wxGrid( m_panel71, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
-	
-	// Grid
-	m_gridMotorSails->CreateGrid( 0, 24 );
-	m_gridMotorSails->EnableEditing( true );
-	m_gridMotorSails->EnableGridLines( true );
-	m_gridMotorSails->EnableDragGridSize( false );
-	m_gridMotorSails->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridMotorSails->SetColSize( 0, 62 );
-	m_gridMotorSails->SetColSize( 1, 96 );
-	m_gridMotorSails->SetColSize( 2, 63 );
-	m_gridMotorSails->SetColSize( 3, 101 );
-	m_gridMotorSails->SetColSize( 4, 87 );
-	m_gridMotorSails->SetColSize( 5, 70 );
-	m_gridMotorSails->SetColSize( 6, 82 );
-	m_gridMotorSails->SetColSize( 7, 75 );
-	m_gridMotorSails->SetColSize( 8, 63 );
-	m_gridMotorSails->SetColSize( 9, 66 );
-	m_gridMotorSails->SetColSize( 10, 66 );
-	m_gridMotorSails->SetColSize( 11, 75 );
-	m_gridMotorSails->SetColSize( 12, 116 );
-	m_gridMotorSails->SetColSize( 13, 76 );
-	m_gridMotorSails->SetColSize( 14, 97 );
-	m_gridMotorSails->SetColSize( 15, 75 );
-	m_gridMotorSails->SetColSize( 16, 77 );
-	m_gridMotorSails->SetColSize( 17, 62 );
-	m_gridMotorSails->SetColSize( 18, 80 );
-	m_gridMotorSails->SetColSize( 19, 124 );
-    m_gridMotorSails->SetColSize( 20, 80 );
-    m_gridMotorSails->SetColSize( 21, 250 );
-    m_gridMotorSails->SetColSize( 22, 219 );
-    m_gridMotorSails->SetColSize( 23, 219 );
-	m_gridMotorSails->EnableDragColMove( false );
-	m_gridMotorSails->EnableDragColSize( true );
-	m_gridMotorSails->SetColLabelSize( 30 );
-	m_gridMotorSails->SetColLabelValue( 0, _("Engine #1") );
-	m_gridMotorSails->SetColLabelValue( 1, _("#1 Total") );
-    m_gridMotorSails->SetColLabelValue( 2, _T("#1 ") );
-    m_gridMotorSails->SetColLabelValue( 3, _("Engine #2") );
-    m_gridMotorSails->SetColLabelValue( 4, _("#2 Total") );
-    m_gridMotorSails->SetColLabelValue( 5, _T("#2 ") );
-    m_gridMotorSails->SetColLabelValue( 6, _("Fuel") );
-    m_gridMotorSails->SetColLabelValue( 7, _("FuelTotal") );
-    m_gridMotorSails->SetColLabelValue( 8, _("Sails") );
-    m_gridMotorSails->SetColLabelValue( 9, _("Reef") );
-    m_gridMotorSails->SetColLabelValue( 10, _("Generator") );
-    m_gridMotorSails->SetColLabelValue( 11, _("Gen. total") );
-    m_gridMotorSails->SetColLabelValue( 12, _("Bank #1") );
-    m_gridMotorSails->SetColLabelValue( 13, _("AH #1 Total") );
-    m_gridMotorSails->SetColLabelValue( 14, _("Bank #2") );
-    m_gridMotorSails->SetColLabelValue( 15, _("AH #2 Total") );
-    m_gridMotorSails->SetColLabelValue( 16, _("Watermaker") );
-    m_gridMotorSails->SetColLabelValue( 17, _("W-Total") );
-    m_gridMotorSails->SetColLabelValue( 18, _("W-Output") );
-    m_gridMotorSails->SetColLabelValue( 19, _("Water") );
-    m_gridMotorSails->SetColLabelValue( 20, _("WaterTotal") );
-    m_gridMotorSails->SetColLabelValue( 21, _("Remarks") );
-    m_gridMotorSails->SetColLabelValue( 22, _("RouteID") );
-    m_gridMotorSails->SetColLabelValue( 23, _("TrackID") );
-	m_gridMotorSails->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridMotorSails->EnableDragRowSize( true );
-	m_gridMotorSails->SetRowLabelSize( 30 );
-	m_gridMotorSails->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridMotorSails->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
-	bSizer111->Add( m_gridMotorSails, 1, wxEXPAND|wxALL, 5 );
-	
-	m_panel71->SetSizer( bSizer111 );
-	m_panel71->Layout();
-	bSizer111->Fit( m_panel71 );
-	m_notebook8->AddPage( m_panel71, _("Motor/Sails"), false );
-	
-	bSizer361->Add( m_notebook8, 1, wxALL|wxEXPAND, 0 );
-	
-///------------------------------ deleted status bar
-    
-    if (logbookPlugIn->opt->statusbar)
+
+    if ( !logbookPlugIn->opt->statusbar )
     {
         Statusbar->SetSizer( bSizer39 );
         Statusbar->Layout();
@@ -609,3007 +347,3278 @@
         bSizer361->Add( Statusbar, 0, wxEXPAND, 5 );
     }
 
-	m_panel2->SetSizer( bSizer361 );
-	m_panel2->Layout();
-	bSizer361->Fit( m_panel2 );
-	m_logbook->AddPage( m_panel2, _("Logbook"), true );
-	m_panel142 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer251;
-#ifdef __WXOSX__
-    fgSizer251 = new wxFlexGridSizer( 3, 1, 0, 0 );
-	fgSizer251->AddGrowableCol( 0 );
-	fgSizer251->AddGrowableRow( 2 );  // Übersicht???
-	fgSizer251->SetFlexibleDirection( wxBOTH );
-	fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-#else
-	fgSizer251 = new wxFlexGridSizer( 3, 1, 0, 0 );
-	fgSizer251->AddGrowableCol( 0 );
-	fgSizer251->AddGrowableRow( 2 );
-	fgSizer251->SetFlexibleDirection( wxBOTH );
-	fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-#endif
-	fgSizer251->SetMinSize( wxSize( -1,400 ) ); 
-	wxBoxSizer* bSizer51;
-	bSizer51 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer61;
-	bSizer61 = new wxBoxSizer( wxHORIZONTAL );
-	
-	logSaveOverview = new wxButton( m_panel142, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
-	logSaveOverview->SetToolTip( _("export your Overview-data as HTML or ODT") );
-	bSizer61->Add( logSaveOverview, 0, wxALL, 5 );
-	
-	m_staticline81 = new wxStaticLine( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer61->Add( m_staticline81, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText323 = new wxStaticText( m_panel142, wxID_ANY, _("Select Layout: "), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText323->Wrap( -1 );
-	bSizer61->Add( m_staticText323, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString overviewChoiceChoices;
-	overviewChoice = new wxChoice( m_panel142, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), overviewChoiceChoices, 0 );
-	overviewChoice->SetToolTip( _("Select a layout which is displayed\nwith button \"View\"") );
-	overviewChoice->SetSelection( 0 );
-	
-	bSizer61->Add( overviewChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonReloadLayoutOview = new wxButton( m_panel142, wxID_ANY, _("R"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonReloadLayoutOview->SetToolTip( _("Reload Layouts") );
-	
-	bSizer61->Add( m_buttonReloadLayoutOview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonEditLayoutOview = new wxButton( m_panel142, wxID_ANY, _("E"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonEditLayoutOview->SetToolTip( _("Edit Layout") );
-	
-	bSizer61->Add( m_buttonEditLayoutOview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnHTMLOverview = new wxRadioButton( m_panel142, wxID_ANY, _T("HTML"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnHTMLOverview->SetValue( true ); 
-	bSizer61->Add( m_radioBtnHTMLOverview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnODTOverview = new wxRadioButton( m_panel142, wxID_ANY, wxT("ODT"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer61->Add( m_radioBtnODTOverview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	logViewOverview = new wxButton( m_panel142, wxID_ANY, _("View"), wxDefaultPosition, wxDefaultSize, 0 );
-	logViewOverview->SetToolTip( _("View data in browser (HTML) or Openoffice/LibreOffice (ODT)") );
-
-	bSizer61->Add( logViewOverview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline71 = new wxStaticLine( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer61->Add( m_staticline71, 0, wxEXPAND | wxALL, 5 );
-
-	m_radioBtnActuellLogbook = new wxRadioButton( m_panel142, wxID_ANY, _("Actual Logbook"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnActuellLogbook->SetValue( true ); 
-	bSizer61->Add( m_radioBtnActuellLogbook, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnAllLogbooks = new wxRadioButton( m_panel142, wxID_ANY, _("All Logbooks"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer61->Add( m_radioBtnAllLogbooks, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnSelectLogbook = new wxRadioButton( m_panel142, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer61->Add( m_radioBtnSelectLogbook, 0, wxALL|wxEXPAND, 5 );
-
-	m_buttonSelectLogbook = new wxButton( m_panel142, wxID_ANY, _("Select Logbook"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectLogbook->SetToolTip( _("Select one of the old logbooks") );
-	bSizer61->Add( m_buttonSelectLogbook, 0, wxALL, 5 );
-	
-	bSizer51->Add( bSizer61, 1, wxEXPAND, 5 );
-
-	fgSizer251->Add( bSizer51, 1, wxEXPAND, 5 );
-	
-	m_staticline11 = new wxStaticLine( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer251->Add( m_staticline11, 0, wxEXPAND | wxALL, 5 );
-	
-	m_gridOverview = new wxGrid( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridOverview->CreateGrid( 1, 33 );
-	m_gridOverview->EnableEditing( false );
-	m_gridOverview->EnableGridLines( true );
-	m_gridOverview->EnableDragGridSize( false );
-	m_gridOverview->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridOverview->SetColSize( 0, 153 );
-	m_gridOverview->SetColSize( 1, 144 );
-	m_gridOverview->SetColSize( 2, 60 );
-	m_gridOverview->SetColSize( 3, 60 );
-	m_gridOverview->SetColSize( 4, 100 );
-	m_gridOverview->SetColSize( 5, 73 );
-	m_gridOverview->SetColSize( 6, 93 );
-	m_gridOverview->SetColSize( 7, 96 );
-	m_gridOverview->SetColSize( 8, 70 );
-	m_gridOverview->SetColSize( 9, 80 );
-	m_gridOverview->SetColSize( 10, 80 );
-	m_gridOverview->SetColSize( 11, 80 );
-	m_gridOverview->SetColSize( 12, 80 );
-	m_gridOverview->SetColSize( 13, 114 );
-	m_gridOverview->SetColSize( 14, 108 );
-	m_gridOverview->SetColSize( 15, 93 );
-	m_gridOverview->SetColSize( 16, 129 );
-	m_gridOverview->SetColSize( 17, 80 );
-	m_gridOverview->SetColSize( 18, 80 );
-	m_gridOverview->SetColSize( 19, 100 );
-	m_gridOverview->SetColSize( 20, 80 );
-	m_gridOverview->SetColSize( 21, 80 );
-	m_gridOverview->SetColSize( 22, 80 );
-	m_gridOverview->SetColSize( 23, 80 );
-	m_gridOverview->SetColSize( 24, 123 );
-	m_gridOverview->SetColSize( 25, 80 );
-	m_gridOverview->SetColSize( 26, 80 );
-	m_gridOverview->SetColSize( 27, 80 );
-	m_gridOverview->SetColSize( 28, 80 );
-	m_gridOverview->SetColSize( 29, 80 );
-	m_gridOverview->SetColSize( 30, 80 );
-	m_gridOverview->SetColSize( 31, 110 );
-	m_gridOverview->SetColSize( 32, 80 );
-	m_gridOverview->EnableDragColMove( false );
-	m_gridOverview->EnableDragColSize( true );
-	m_gridOverview->SetColLabelSize( 30 );
-	m_gridOverview->SetColLabelValue( 0, _("Logbook") );
-	m_gridOverview->SetColLabelValue( 1, _("Route") );
-	m_gridOverview->SetColLabelValue( 2, _("Start") );
-	m_gridOverview->SetColLabelValue( 3, _("End") );
-	m_gridOverview->SetColLabelValue( 4, _("Total Time") );
-	m_gridOverview->SetColLabelValue( 5, _("Distance") );
-	m_gridOverview->SetColLabelValue( 6, _("Distance p. Day") );
-	m_gridOverview->SetColLabelValue( 7, _("Best Dist. p. Day") );
-	m_gridOverview->SetColLabelValue( 8, _("Speed Avg.") );
-	m_gridOverview->SetColLabelValue( 9, _("Speed Max.") );
-	m_gridOverview->SetColLabelValue( 10, _("Engine #1") );
-	m_gridOverview->SetColLabelValue( 11, _("Engine #2") );
-	m_gridOverview->SetColLabelValue( 12, _("Fuel") );
-	m_gridOverview->SetColLabelValue( 13, _("Generator") );
-	m_gridOverview->SetColLabelValue( 14, _("Bank #1 gen.") );
-	m_gridOverview->SetColLabelValue( 15, _("Bank #1 used") );
-	m_gridOverview->SetColLabelValue( 16, _("Bank #2 gen.") );
-	m_gridOverview->SetColLabelValue( 17, _("Bank #2 used") );
-	m_gridOverview->SetColLabelValue( 18, _("Watermaker") );
-	m_gridOverview->SetColLabelValue( 19, _("Waterm. Outp") );
-	m_gridOverview->SetColLabelValue( 20, _("Water used") );
-	m_gridOverview->SetColLabelValue( 21, _("TWA Avg.") );
-	m_gridOverview->SetColLabelValue( 22, _("TWS Avg.") );
-	m_gridOverview->SetColLabelValue( 23, _("TWS Max.") );
-	m_gridOverview->SetColLabelValue( 24, _("Currentdirection Avg.") );
-	m_gridOverview->SetColLabelValue( 25, _("Current Avg.") );
-	m_gridOverview->SetColLabelValue( 26, _("Current Max.") );
-	m_gridOverview->SetColLabelValue( 27, _("Wave Avg.") );
-	m_gridOverview->SetColLabelValue( 28, _("Wave Max.") );
-	m_gridOverview->SetColLabelValue( 29, _("Swell Avg.") );
-	m_gridOverview->SetColLabelValue( 30, _("Swell Max.") );
-	m_gridOverview->SetColLabelValue( 31, _("Sails used mostly") );
-	m_gridOverview->SetColLabelValue( 32, _("Path") );
-	m_gridOverview->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridOverview->EnableDragRowSize( true );
-	m_gridOverview->SetRowLabelSize( 30 );
-	m_gridOverview->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridOverview->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
-	m_gridOverview->SetMinSize( wxSize( -1,400 ) );
-	
-	m_menuOverView = new wxMenu();
-	wxMenuItem* m_menuItemOverviewRoute;
-	m_menuItemOverviewRoute = new wxMenuItem( m_menuOverView, wxID_ANY, wxString( _("Goto Route") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuOverView->Append( m_menuItemOverviewRoute );
-	
-	wxMenuItem* m_menuItem14;
-	m_menuItem14 = new wxMenuItem( m_menuOverView, wxID_ANY, wxString( _("Show hidden columns") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuOverView->Append( m_menuItem14 );
-
-	wxMenuItem* m_menuItem16;
-	m_menuItem16 = new wxMenuItem( m_menuOverView, wxID_ANY, wxString( _("Hide column") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuOverView->Append( m_menuItem16 );
-	
-	fgSizer251->Add( m_gridOverview, 1, wxALL|wxEXPAND, 5 );
-	
-	m_panel142->SetSizer( fgSizer251 );
-	m_panel142->Layout();
-	fgSizer251->Fit( m_panel142 );
-	m_logbook->AddPage( m_panel142, _("Overview"), true );
-	m_panel21 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer381;
-	bSizer381 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer38;
-	bSizer38 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer3;
-	bSizer3 = new wxBoxSizer( wxHORIZONTAL );
-	
-	crewAdd = new wxButton( m_panel21, wxID_ANY, _("Add Crew"), wxDefaultPosition, wxDefaultSize, 0 );
-	crewAdd->SetToolTip( _("Add a new Crewmember") );
-	
-	bSizer3->Add( crewAdd, 0, wxALL, 5 );
-	
-	crewSave = new wxButton( m_panel21, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
-	crewSave->SetToolTip( _("export your crew-data as:\nHTML, ODT,  ODS, XML, CSV") );
-	
-	bSizer3->Add( crewSave, 0, wxALL, 5 );
-	
-	m_staticline5 = new wxStaticLine( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer3->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText321 = new wxStaticText( m_panel21, wxID_ANY, _("Select Layout: "), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText321->Wrap( -1 );
-	bSizer3->Add( m_staticText321, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString crewChoiceChoices;
-	crewChoice = new wxChoice( m_panel21, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), crewChoiceChoices, 0 );
-	crewChoice->SetSelection( 0 );
-	crewChoice->SetToolTip( _("Select a layout which is displayed\nwith button \"View\"") );
-	
-	bSizer3->Add( crewChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonReloadCrew = new wxButton( m_panel21, wxID_ANY, _("R"), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT );
-	m_buttonReloadCrew->SetToolTip( _("Reload Layouts") );
-	
-	bSizer3->Add( m_buttonReloadCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonEditLayoutCrew = new wxButton( m_panel21, wxID_ANY, _("E"), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT );
-	m_buttonEditLayoutCrew->SetToolTip( _("Edit Layout") );
-	
-	bSizer3->Add( m_buttonEditLayoutCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnHTMLCrew = new wxRadioButton( m_panel21, wxID_ANY, _("HTML"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnHTMLCrew->SetValue( true ); 
-	bSizer3->Add( m_radioBtnHTMLCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnODTCrew = new wxRadioButton( m_panel21, wxID_ANY, _("ODT"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer3->Add( m_radioBtnODTCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	crewView = new wxButton( m_panel21, wxID_ANY, _("View"), wxDefaultPosition, wxDefaultSize, 0 );
-	crewView->SetToolTip( _("View data in browser (HTML) or Openoffice/LibreOffice (ODT)") );
-	
-	bSizer3->Add( crewView, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline36 = new wxStaticLine( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer3->Add( m_staticline36, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText1171 = new wxStaticText( m_panel21, wxID_ANY, _("Copy to watch"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1171->Wrap( -1 );
-	bSizer3->Add( m_staticText1171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxString m_choiceCrewNamesChoices[] = { _("Name in full"), _("Firstname only"), _("Lastname only") };
-	int m_choiceCrewNamesNChoices = sizeof( m_choiceCrewNamesChoices ) / sizeof( wxString );
-	m_choiceCrewNames = new wxChoice( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceCrewNamesNChoices, m_choiceCrewNamesChoices, 0 );
-	m_choiceCrewNames->SetSelection( 0 );
-	bSizer3->Add( m_choiceCrewNames, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer38->Add( bSizer3, 0, wxEXPAND, 5 );
-	
-	m_staticline2 = new wxStaticLine( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer38->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
-	
-	m_splitterWatch = new wxSplitterWindow( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
-	m_splitterWatch->SetSashGravity( 1 );
-	
-	m_panel211 = new wxPanel( m_splitterWatch, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer36;
-	bSizer36 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gridCrew = new wxGrid( m_panel211, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
-	
-	// Grid
-	m_gridCrew->CreateGrid( 0, 15 );
-	m_gridCrew->EnableEditing( true );
-	m_gridCrew->EnableGridLines( true );
-	m_gridCrew->EnableDragGridSize( false );
-	m_gridCrew->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridCrew->SetColSize( 0, 60 );
-	m_gridCrew->SetColSize( 1, 154 );
-	m_gridCrew->SetColSize( 2, 139 );
-	m_gridCrew->SetColSize( 3, 140 );
-	m_gridCrew->SetColSize( 4, 50 );
-	m_gridCrew->SetColSize( 5, 78 );
-	m_gridCrew->SetColSize( 6, 127 );
-	m_gridCrew->SetColSize( 7, 116 );
-	m_gridCrew->SetColSize( 8, 118 );
-	m_gridCrew->SetColSize( 9, 147 );
-	m_gridCrew->SetColSize( 10, 110 );
-	m_gridCrew->SetColSize( 11, 82 );
-	m_gridCrew->SetColSize( 12, 155 );
-	m_gridCrew->SetColSize( 13, 261 );
-	m_gridCrew->SetColSize( 14, 243 );
-	m_gridCrew->EnableDragColMove( false );
-	m_gridCrew->EnableDragColSize( true );
-	m_gridCrew->SetColLabelSize( 30 );
-	m_gridCrew->SetColLabelValue( 0, _("Onboard") );
-	m_gridCrew->SetColLabelValue( 1, _("Name") );
-	m_gridCrew->SetColLabelValue( 2, _("Birthname") );
-	m_gridCrew->SetColLabelValue( 3, _("Firstname") );
-	m_gridCrew->SetColLabelValue( 4, _("Title") );
-	m_gridCrew->SetColLabelValue( 5, _("Date of Birth") );
-	m_gridCrew->SetColLabelValue( 6, _("Place of Birth") );
-	m_gridCrew->SetColLabelValue( 7, _("Nationality") );
-	m_gridCrew->SetColLabelValue( 8, _("Passport-Nr") );
-	m_gridCrew->SetColLabelValue( 9, _("Issued in") );
-	m_gridCrew->SetColLabelValue( 10, _("Date of Issue") );
-	m_gridCrew->SetColLabelValue( 11, _("Zip") );
-	m_gridCrew->SetColLabelValue( 12, _("Country") );
-	m_gridCrew->SetColLabelValue( 13, _("Town") );
-	m_gridCrew->SetColLabelValue( 14, _("Street") );
-	m_gridCrew->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridCrew->EnableDragRowSize( true );
-	m_gridCrew->SetRowLabelSize( 30 );
-	m_gridCrew->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridCrew->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	m_menu2 = new wxMenu();
-	wxMenuItem* m_menuItem2;
-	m_menuItem2 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuItem2 );
-		
-	wxMenuItem* m_menuItem22;
-	m_menuItem22 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Show hidden columns") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuItem22 );
-	
-	 m_menu2->AppendSeparator();
-	
-	wxMenuItem* m_menuItem30;
-	m_menuItem30 = new wxMenuItem( m_menu2, MENUCREWONBOARD, wxString( _("Show onboard only") ) , wxEmptyString, wxITEM_CHECK );
-	m_menu2->Append( m_menuItem30 );
-	m_menuItem30->Check( true );
-	
-	wxMenuItem* m_menuItem31;
-	m_menuItem31 = new wxMenuItem( m_menu2, MENUCREWALL, wxString( _("Show all entries") ) , wxEmptyString, wxITEM_CHECK );
-	m_menu2->Append( m_menuItem31 );
-	
-	m_menu2->AppendSeparator();
-	
-	wxMenuItem* m_menuItem32;
-	m_menuItem32 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Sort ascending") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuItem32 );
-	
-	wxMenuItem* m_menuItem33;
-	m_menuItem33 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _("Sort descending") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu2->Append( m_menuItem33 );
-	
-	
-	bSizer36->Add( m_gridCrew, 1, wxALL|wxEXPAND, 5 );
-	
-	m_panel211->SetSizer( bSizer36 );
-	m_panel211->Layout();
-	bSizer36->Fit( m_panel211 );
-	m_panel22 = new wxPanel( m_splitterWatch, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer37;
-	bSizer37 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer1;
-	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panel22, wxID_ANY, wxEmptyString ), wxVERTICAL );
-	
-	sbSizer61 = new wxStaticBoxSizer( new wxStaticBox( m_panel22, wxID_ANY, _("Set Watchtimes") ), wxHORIZONTAL );
-	
-	m_staticText1141 = new wxStaticText( m_panel22, wxID_ANY, _("Start"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1141->Wrap( -1 );
-	sbSizer61->Add( m_staticText1141, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlWatchStartDate = new wxTextCtrl( m_panel22, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 95,-1 ), wxTE_CENTRE|wxTE_READONLY );
-	m_textCtrlWatchStartDate->SetToolTip( _("Set the startdate of the sailing trip") );
-	
-	sbSizer61->Add( m_textCtrlWatchStartDate, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlWatchStartTime = new wxTextCtrl( m_panel22, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 45,-1 ), wxTE_CENTRE|wxTE_PROCESS_ENTER );
-	m_textCtrlWatchStartTime->SetMaxLength( 5 ); 
-	m_textCtrlWatchStartTime->SetToolTip( _("Set the starttime of your sailing trip") );
-	
-	sbSizer61->Add( m_textCtrlWatchStartTime, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText1161 = new wxStaticText( m_panel22, wxID_ANY, _("Days"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1161->Wrap( -1 );
-	sbSizer61->Add( m_staticText1161, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlWakeTrip = new wxTextCtrl( m_panel22, wxID_ANY, _T("10"), wxDefaultPosition, wxSize( 30,-1 ), 0 );
-	m_textCtrlWakeTrip->SetToolTip( _("Length of your sailing trip") );
-	
-	sbSizer61->Add( m_textCtrlWakeTrip, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonCalculate = new wxButton( m_panel22, wxID_ANY, _("Calculate"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonCalculate->SetToolTip( _("Calculate the watches with the members entered in the columns") );
-	
-	sbSizer61->Add( m_buttonCalculate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonReset = new wxButton( m_panel22, wxID_ANY, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonReset->Enable( false );
-	m_buttonReset->SetToolTip( _("Reset data to edit-level") );
-	
-	sbSizer61->Add( m_buttonReset, 0, wxALL, 5 );
-	
-	m_buttonClear = new wxButton( m_panel22, wxID_ANY, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonClear->SetToolTip( _("Clear all data") );
-	
-	sbSizer61->Add( m_buttonClear, 0, wxALL, 5 );
-	
-	m_staticline35 = new wxStaticLine( m_panel22, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	sbSizer61->Add( m_staticline35, 0, wxEXPAND | wxALL, 5 );
-	
-	m_buttonDayMinus = new wxButton( m_panel22, wxID_ANY, _T("<"), wxDefaultPosition, wxSize( 30,-1 ), 0 );
-	m_buttonDayMinus->Enable( false );
-	m_buttonDayMinus->SetToolTip( _("Day backward") );
-	
-	sbSizer61->Add( m_buttonDayMinus, 0, wxALL, 5 );
-	
-	m_buttonNow = new wxButton( m_panel22, wxID_ANY, _("Now"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonNow->Enable( false );
-	m_buttonNow->SetToolTip( _("Go to date/time now") );
-	
-	sbSizer61->Add( m_buttonNow, 0, wxALL, 5 );
-	
-	m_buttonDayPlus = new wxButton( m_panel22, wxID_ANY, _T(">"), wxDefaultPosition, wxSize( 30,-1 ), 0 );
-	m_buttonDayPlus->Enable( false );
-	m_buttonDayPlus->SetToolTip( _("Day forward") );
-	
-	sbSizer61->Add( m_buttonDayPlus, 0, wxALL, 5 );
-	
-	m_staticTextWakeDay = new wxStaticText( m_panel22, wxID_ANY, _("Day:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextWakeDay->Wrap( -1 );
-	sbSizer61->Add( m_staticTextWakeDay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlWakeDay = new wxTextCtrl( m_panel22, wxID_ANY, _T("0"), wxDefaultPosition, wxSize( 30,-1 ), wxTE_CENTRE|wxTE_PROCESS_ENTER );
-	m_textCtrlWakeDay->SetToolTip( _("Shows/Sets the day\nDisplays the data in your ODT/Browser-program from this day to end") );
-	
-	sbSizer61->Add( m_textCtrlWakeDay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText1181 = new wxStaticText( m_panel22, wxID_ANY, _("Display"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1181->Wrap( -1 );
-	sbSizer61->Add( m_staticText1181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxString m_choiceWakeDisplayChoices[] = { _("all"), _("this day"), _T("+1"), _T("+2"), _T("+3"), _T("+4"), _T("+5"), _T("+6"), _T("+7"), _T("+8"), _T("+9"), _T("+10") };
-	int m_choiceWakeDisplayNChoices = sizeof( m_choiceWakeDisplayChoices ) / sizeof( wxString );
-	m_choiceWakeDisplay = new wxChoice( m_panel22, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceWakeDisplayNChoices, m_choiceWakeDisplayChoices, 0 );
-	m_choiceWakeDisplay->SetSelection( 0 );
-	m_choiceWakeDisplay->SetToolTip( _("Used for ODT/Browser-program\nOne Row for the day + selected days = Days displayed") );
-	
-	sbSizer61->Add( m_choiceWakeDisplay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer1->Add( sbSizer61, 0, wxEXPAND, 5 );
-	
-	bSizer37->Add( sbSizer1, 0, wxEXPAND, 5 );
-	
-	m_gridCrewWake = new wxGrid( m_panel22, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridCrewWake->CreateGrid( 4, 1 );
-	m_gridCrewWake->EnableEditing( true );
-	m_gridCrewWake->EnableGridLines( true );
-	m_gridCrewWake->EnableDragGridSize( true );
-	m_gridCrewWake->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridCrewWake->SetColSize( 0, 160 );
-	m_gridCrewWake->AutoSizeColumns();
-	m_gridCrewWake->EnableDragColMove( false );
-	m_gridCrewWake->EnableDragColSize( true );
-	m_gridCrewWake->SetColLabelSize( 30 );
-	m_gridCrewWake->SetColLabelValue( 0, _("1. Watch") );
-	m_gridCrewWake->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridCrewWake->SetRowSize( 0, 19 );
-	m_gridCrewWake->SetRowSize( 1, 19 );
-	m_gridCrewWake->SetRowSize( 2, 19 );
-	m_gridCrewWake->SetRowSize( 3, 19 );
-	m_gridCrewWake->AutoSizeRows();
-	m_gridCrewWake->EnableDragRowSize( true );
-	m_gridCrewWake->SetRowLabelSize( 80 );
-	m_gridCrewWake->SetRowLabelValue( 0, _("Watchtime") );
-	m_gridCrewWake->SetRowLabelValue( 1, _("Date") );
-	m_gridCrewWake->SetRowLabelValue( 2, _("Time") );
-	m_gridCrewWake->SetRowLabelValue( 3, _("Member") );
-	m_gridCrewWake->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridCrewWake->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP );
-	
-	m_menu21 = new wxMenu();
-	wxMenuItem* m_menuItemNewWatch;
-	m_menuItemNewWatch = new wxMenuItem( m_menu21, wxID_ANY, wxString( _("Set as Watchbase") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu21->Append( m_menuItemNewWatch );
-	
-	wxMenuItem* m_menuItem19;
-	m_menuItem19 = new wxMenuItem( m_menu21, 514, wxString( _("Split Watch") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu21->Append( m_menuItem19 );
-	
-	wxMenuItem* m_menuItem23;
-	m_menuItem23 = new wxMenuItem( m_menu21, 515, wxString( _("Merge Watches") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu21->Append( m_menuItem23 );
-
-	wxMenuItem* m_menuItem36;
-	m_menuItem36 = new wxMenuItem( m_menu21, 520, wxString( _("Swap two Watches") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu21->Append( m_menuItem36 );
-	
-	wxMenuItem* m_menuItem35;
-	m_menuItem35 = new wxMenuItem( m_menu21, 516, wxString( _("Delete Crewmembers") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu21->Append( m_menuItem35 );
-	
-	bSizer37->Add( m_gridCrewWake, 1, wxALL|wxEXPAND, 5 );
-	
-	m_panel22->SetSizer( bSizer37 );
-	m_panel22->Layout();
-	bSizer37->Fit( m_panel22 );
-	m_splitterWatch->SplitHorizontally( m_panel211, m_panel22, -1 );
-	bSizer38->Add( m_splitterWatch, 1, wxEXPAND, 5 );
-	
-	m_panel24 = new wxPanel( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel24->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer371;
-	bSizer371 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextStatusWatch = new wxStaticText( m_panel24, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusWatch->Wrap( -1 );
-	bSizer371->Add( m_staticTextStatusWatch, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel24->SetSizer( bSizer371 );
-	m_panel24->Layout();
-	bSizer371->Fit( m_panel24 );
-	bSizer38->Add( m_panel24, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer381->Add( bSizer38, 1, wxEXPAND, 5 );
-	
-	m_panel21->SetSizer( bSizer381 );
-	m_panel21->Layout();
-	bSizer381->Fit( m_panel21 );
-	m_logbook->AddPage( m_panel21, _("Crewlist"), true );
-
-	m_panel3 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer1;
-
-    fgSizer1 = new wxFlexGridSizer( 2, 1, 0, 0 );
-	fgSizer1->AddGrowableCol( 0 );
-	fgSizer1->AddGrowableRow( 1 );   // Wachen ???
-
-	fgSizer1->SetFlexibleDirection( wxBOTH );
-	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxBoxSizer* bSizer9;
-	bSizer9 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer10;
-	bSizer10 = new wxBoxSizer( wxHORIZONTAL );
-	
-	addEquipmentButton = new wxButton( m_panel3, wxID_ANY, _("Add Equipment"), wxDefaultPosition, wxDefaultSize, 0 );
-	addEquipmentButton->SetToolTip( _("add the equipment of your boat") );
-	bSizer10->Add( addEquipmentButton, 0, wxALL, 5 );
-
-	m_toggleBtnShowEquipment = new wxToggleButton( m_panel3, wxID_ANY, _("Show Equipment"), wxDefaultPosition, wxSize( 120,-1 ), 0 );
-	m_toggleBtnShowEquipment->SetToolTip( _("Show/Hide Equipmentgrid") );
-	bSizer10->Add( m_toggleBtnShowEquipment, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline27 = new wxStaticLine( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer10->Add( m_staticline27, 0, wxEXPAND | wxALL, 5 );
-	
-	boatSave = new wxButton( m_panel3, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
-	boatSave->SetToolTip( _("export your boat/equipment-data as:\n      HTML, ODT,  ODS, XML, CSV") );
-
-	bSizer10->Add( boatSave, 0, wxALL, 5 );
-	
-	m_staticline4 = new wxStaticLine( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer10->Add( m_staticline4, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText322 = new wxStaticText( m_panel3, wxID_ANY, _("Select Layout: "), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText322->Wrap( -1 );
-	bSizer10->Add( m_staticText322, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString boatChoiceChoices;
-	boatChoice = new wxChoice( m_panel3, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), boatChoiceChoices, 0 );
-	boatChoice->SetToolTip( _("Select a layout which is displayed\nwith button \"View\"") );
-	boatChoice->SetSelection( 0 );
-	bSizer10->Add( boatChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonReloadLayoutsBoat = new wxButton( m_panel3, wxID_ANY, _("R"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonReloadLayoutsBoat->SetToolTip( _("Reload Layouts") );
-	
-	bSizer10->Add( m_buttonReloadLayoutsBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonEditLayoutBoat = new wxButton( m_panel3, wxID_ANY, _("E"), wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT );
-	m_buttonEditLayoutBoat->SetToolTip( _("Edit Layouts") );
-	
-	bSizer10->Add( m_buttonEditLayoutBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnHTMLBoat = new wxRadioButton( m_panel3, wxID_ANY, wxT("HTML"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnHTMLBoat->SetValue( true ); 
-	bSizer10->Add( m_radioBtnHTMLBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnODTBoat = new wxRadioButton( m_panel3, wxID_ANY, wxT("ODT"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer10->Add( m_radioBtnODTBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	boatView = new wxButton( m_panel3, wxID_ANY, _("View"), wxDefaultPosition, wxDefaultSize, 0 );
-	boatView->SetToolTip( _("View data in browser (HTML) or Openoffice/LibreOffice (ODT)") );
-
-	bSizer10->Add( boatView, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer9->Add( bSizer10, 1, wxEXPAND, 5 );
-	
-	m_staticline3 = new wxStaticLine( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer9->Add( m_staticline3, 0, wxEXPAND | wxALL, 5 );
-	
-	fgSizer1->Add( bSizer9, 1, wxEXPAND, 5 );
-	
-	m_splitter1 = new wxSplitterWindow( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
-	m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::m_splitter1OnIdle ), NULL, this );
-	m_splitter1->SetMinimumPaneSize( 15 );
-	
-	m_panel72 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer34;
-	fgSizer34 = new wxFlexGridSizer( 3, 1, 0, 0 );
-	fgSizer34->SetFlexibleDirection( wxBOTH );
-	fgSizer34->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxStaticBoxSizer* sbSizer11;
-	sbSizer11 = new wxStaticBoxSizer( new wxStaticBox( m_panel72, wxID_ANY, _("Boat") ), wxHORIZONTAL );
-	
-	wxFlexGridSizer* fgSizer38;
+    m_notebook8 = new wxNotebook( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panel6 = new wxPanel( m_notebook8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 
-    fgSizer38 = new wxFlexGridSizer( 2, 12, 0, 0 );
-	fgSizer38->SetFlexibleDirection( wxBOTH );
-	fgSizer38->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	bname = new wxStaticText( m_panel72, wxID_ANY, _("Name"), wxDefaultPosition, wxDefaultSize, 0 );
-	bname->Wrap( -1 );
-	fgSizer38->Add( bname, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	boatName = new wxTextCtrl( m_panel72, 1, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
-	fgSizer38->Add( boatName, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText114 = new wxStaticText( m_panel72, wxID_ANY, _("Homeport"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText114->Wrap( -1 );
-	fgSizer38->Add( m_staticText114, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	homeport = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer38->Add( homeport, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText115 = new wxStaticText( m_panel72, wxID_ANY, _("Callsign"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText115->Wrap( -1 );
-	fgSizer38->Add( m_staticText115, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	callsign = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer38->Add( callsign, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText116 = new wxStaticText( m_panel72, wxID_ANY, _("HIN-Nr."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText116->Wrap( -1 );
-	fgSizer38->Add( m_staticText116, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	hin = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	hin->SetToolTip( _("Hull Identification No.") );
-	fgSizer38->Add( hin, 0, wxALL, 5 );
-	
-	m_staticText117 = new wxStaticText( m_panel72, wxID_ANY, _("Sail-Nr."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText117->Wrap( -1 );
-	fgSizer38->Add( m_staticText117, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sailno = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer38->Add( sailno, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	fgSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText119 = new wxStaticText( m_panel72, wxID_ANY, _("Insurance"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText119->Wrap( -1 );
-	fgSizer38->Add( m_staticText119, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	insurance = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
-	fgSizer38->Add( insurance, 0, wxALL, 5 );
-	
-	m_staticText118 = new wxStaticText( m_panel72, wxID_ANY, _("Registration"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText118->Wrap( -1 );
-	fgSizer38->Add( m_staticText118, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	registration = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer38->Add( registration, 0, wxALL, 5 );
-	
-	m_staticText120 = new wxStaticText( m_panel72, wxID_ANY, _("Policy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText120->Wrap( -1 );
-	fgSizer38->Add( m_staticText120, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	policy = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer38->Add( policy, 0, wxALL, 5 );
-	
-	m_staticText53 = new wxStaticText( m_panel72, wxID_ANY, _("MMSI"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText53->Wrap( -1 );
-	fgSizer38->Add( m_staticText53, 0, wxALL, 5 );
-	
-	mmsi = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer38->Add( mmsi, 0, wxALL, 5 );
-	
-	sbSizer11->Add( fgSizer38, 1, wxEXPAND, 5 );
-	
-	fgSizer34->Add( sbSizer11, 1, wxEXPAND, 5 );
-	
-	sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( m_panel72, wxID_ANY, _("Owner") ), wxHORIZONTAL );
-	
-	wxFlexGridSizer* fgSizer39;
-	fgSizer39 = new wxFlexGridSizer( 2, 10, 0, 0 );
-	fgSizer39->SetFlexibleDirection( wxBOTH );
-	fgSizer39->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText90 = new wxStaticText( m_panel72, wxID_ANY, _("Name      "), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText90->Wrap( -1 );
-	fgSizer39->Add( m_staticText90, 0, wxALL, 5 );
-	
-	ownerName = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
-	fgSizer39->Add( ownerName, 0, wxALL, 5 );
-	
-	m_staticText91 = new wxStaticText( m_panel72, wxID_ANY, _("Firstname"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText91->Wrap( -1 );
-	fgSizer39->Add( m_staticText91, 0, wxALL, 5 );
-	
-	ownerFirstname = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer39->Add( ownerFirstname, 0, wxALL, 5 );
-	
-	m_staticText95 = new wxStaticText( m_panel72, wxID_ANY, _("Telephone"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText95->Wrap( -1 );
-	fgSizer39->Add( m_staticText95, 0, wxALL, 5 );
-	
-	ownerPhone = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
-	fgSizer39->Add( ownerPhone, 0, wxALL, 5 );
-	
-	
-	fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText92 = new wxStaticText( m_panel72, wxID_ANY, _("Street"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText92->Wrap( -1 );
-	fgSizer39->Add( m_staticText92, 0, wxALL, 5 );
-	
-	ownerStreet = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
-	fgSizer39->Add( ownerStreet, 0, wxALL, 5 );
-	
-	m_staticText93 = new wxStaticText( m_panel72, wxID_ANY, _("Zip"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText93->Wrap( -1 );
-	fgSizer39->Add( m_staticText93, 0, wxALL, 5 );
-	
-	owenerZip = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer39->Add( owenerZip, 0, wxALL, 5 );
-
-	m_staticText94 = new wxStaticText( m_panel72, wxID_ANY, _("Town"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText94->Wrap( -1 );
-	fgSizer39->Add( m_staticText94, 0, wxALL, 5 );
-	
-	ownerTown = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
-	fgSizer39->Add( ownerTown, 0, wxALL, 5 );
-	
-	sbSizer6->Add( fgSizer39, 1, wxEXPAND, 5 );
-	
-	fgSizer34->Add( sbSizer6, 1, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer8;
-	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_panel72, wxID_ANY, _("Details") ), wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer33;
+    wxBoxSizer* bSizer391;
+    bSizer391 = new wxBoxSizer( wxVERTICAL );
+    m_gridGlobal = new wxGrid( m_panel6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
 
-    fgSizer33 = new wxFlexGridSizer( 4, 10, 0, 0 );
-	fgSizer33->SetFlexibleDirection( wxBOTH );
-	fgSizer33->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText128 = new wxStaticText( m_panel72, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText128->Wrap( -1 );
-	fgSizer33->Add( m_staticText128, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	boatType = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer33->Add( boatType, 0, wxALL, 5 );
-	
-	m_staticText125 = new wxStaticText( m_panel72, wxID_ANY, _("Builder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText125->Wrap( -1 );
-	fgSizer33->Add( m_staticText125, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	builder = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer33->Add( builder, 0, wxALL, 5 );
-	
-	m_staticText124 = new wxStaticText( m_panel72, wxID_ANY, _("Hull"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText124->Wrap( -1 );
-	fgSizer33->Add( m_staticText124, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	hull = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer33->Add( hull, 0, wxALL, 5 );
-	
-	m_staticText126 = new wxStaticText( m_panel72, wxID_ANY, _("Date Launched"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText126->Wrap( -1 );
-	fgSizer33->Add( m_staticText126, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	dateLaunched = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer33->Add( dateLaunched, 0, wxALL, 5 );
-	
-	m_staticText127 = new wxStaticText( m_panel72, wxID_ANY, _("Yard-Nr."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText127->Wrap( -1 );
-	fgSizer33->Add( m_staticText127, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	yardNr = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer33->Add( yardNr, 0, wxALL, 5 );
-	
-	m_staticText123 = new wxStaticText( m_panel72, wxID_ANY, _("Designer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText123->Wrap( -1 );
-	fgSizer33->Add( m_staticText123, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	designer = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer33->Add( designer, 0, wxALL, 5 );
-	
-	m_staticText129 = new wxStaticText( m_panel72, wxID_ANY, _("Construction"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText129->Wrap( -1 );
-	fgSizer33->Add( m_staticText129, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	construction = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
-	fgSizer33->Add( construction, 0, wxALL, 5 );
-	
-	
-	fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText106 = new wxStaticText( m_panel72, wxID_ANY, _("LOA"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText106->Wrap( -1 );
-	fgSizer33->Add( m_staticText106, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	LOA = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	LOA->SetToolTip( _("Length over all") );
-	
-	fgSizer33->Add( LOA, 0, wxALL, 5 );
-	
-	m_staticText107 = new wxStaticText( m_panel72, wxID_ANY, _("LOD"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText107->Wrap( -1 );
-	fgSizer33->Add( m_staticText107, 0, wxALL, 5 );
-	
-	LOD = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	LOD->SetToolTip( _("Length over Deck") );
-	
-	fgSizer33->Add( LOD, 0, wxALL, 5 );
-	
-	m_staticText108 = new wxStaticText( m_panel72, wxID_ANY, _("LWL"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText108->Wrap( -1 );
-	fgSizer33->Add( m_staticText108, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	LWL = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	LWL->SetToolTip( _("Length in Waterline") );
-	
-	fgSizer33->Add( LWL, 0, wxALL, 5 );
-	
-	m_staticText109 = new wxStaticText( m_panel72, wxID_ANY, _("Beam"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText109->Wrap( -1 );
-	fgSizer33->Add( m_staticText109, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	beam = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	beam->SetToolTip( _("Greatest Width of Hull") );
-	
-	fgSizer33->Add( beam, 0, wxALL, 5 );
-	
-	m_staticText110 = new wxStaticText( m_panel72, wxID_ANY, _("Draft"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText110->Wrap( -1 );
-	fgSizer33->Add( m_staticText110, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	draft = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	fgSizer33->Add( draft, 0, wxALL, 5 );
-	
-	UserLabel1 = new wxTextCtrl( m_panel72, wxID_ANY, _("UserLabel"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	UserLabel1->SetToolTip( _("write your own label") );
-	
-	fgSizer33->Add( UserLabel1, 0, wxALL, 5 );
-	
-	Userfield1 = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer33->Add( Userfield1, 0, wxALL, 5 );
-	
-	UserLabel2 = new wxTextCtrl( m_panel72, wxID_ANY, _("UserLabel"), wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	UserLabel2->SetToolTip( _("write your own label") );
-	
-	fgSizer33->Add( UserLabel2, 0, wxALL, 5 );
-	
-	Userfield2 = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer33->Add( Userfield2, 0, wxALL, 5 );
-	
-	UserLabel3 = new wxTextCtrl( m_panel72, wxID_ANY, _("UserLabel"), wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	UserLabel3->SetToolTip( _("write your own label") );
-	UserLabel3->SetMaxSize( wxSize( 30,-1 ) );
-	
-	fgSizer33->Add( UserLabel3, 0, wxALL, 5 );
-	
-	Userfield3 = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	fgSizer33->Add( Userfield3, 0, wxALL, 5 );
-	
-	m_staticText122 = new wxStaticText( m_panel72, wxID_ANY, _("Displacement"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText122->Wrap( -1 );
-	fgSizer33->Add( m_staticText122, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	displacement = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	fgSizer33->Add( displacement, 0, wxALL, 5 );
-	
-	sbSizer8->Add( fgSizer33, 1, wxEXPAND, 5 );
-	
-	fgSizer34->Add( sbSizer8, 1, wxEXPAND, 5 );
-	
-	m_panel72->SetSizer( fgSizer34 );
-	m_panel72->Layout();
-	fgSizer34->Fit( m_panel72 );
-	m_panel8 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxTAB_TRAVERSAL );
-
-	sbSizer12 = new wxStaticBoxSizer( new wxStaticBox( m_panel8, wxID_ANY, _("Equipment") ), wxVERTICAL );
-
-	sbSizer12->SetMinSize( wxSize( -1,-1 ) ); 
-
-	m_gridEquipment = new wxGrid( m_panel8, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridEquipment->CreateGrid( 0, 4 );
-	m_gridEquipment->EnableEditing( true );
-	m_gridEquipment->EnableGridLines( true );
-	m_gridEquipment->EnableDragGridSize( false );
-	m_gridEquipment->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridEquipment->SetColSize( 0, 120 );
-	m_gridEquipment->SetColSize( 1, 296 );
-	m_gridEquipment->SetColSize( 2, 151 );
-	m_gridEquipment->SetColSize( 3, 297 );
-	m_gridEquipment->EnableDragColMove( false );
-	m_gridEquipment->EnableDragColSize( true );
-	m_gridEquipment->SetColLabelSize( 30 );
-	m_gridEquipment->SetColLabelValue( 0, _("Type") );
-	m_gridEquipment->SetColLabelValue( 1, _("Description") );
-	m_gridEquipment->SetColLabelValue( 2, _("Serial-Nr.") );
-	m_gridEquipment->SetColLabelValue( 3, _("Remarks") );
-	m_gridEquipment->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridEquipment->EnableDragRowSize( true );
-	m_gridEquipment->SetRowLabelSize( 30 );
-	m_gridEquipment->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridEquipment->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	m_menu3 = new wxMenu();
-	wxMenuItem* m_menuItem3;
-	m_menuItem3 = new wxMenuItem( m_menu3, wxID_ANY, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu3->Append( m_menuItem3 );
-	
-	
-	sbSizer12->Add( m_gridEquipment, 1, wxALL|wxEXPAND, 5 );
-	
-	m_panel8->SetSizer( sbSizer12 );
-	m_panel8->Layout();
-	sbSizer12->Fit( m_panel8 );
-	
-	m_splitter1->SplitHorizontally( m_panel72, m_panel8, 315 );
-
-	fgSizer1->Add( m_splitter1, 1, wxEXPAND, 5 );
-	
-	m_panel3->SetSizer( fgSizer1 );
-	m_panel3->Layout();
-	fgSizer1->Fit( m_panel3 );
-	m_logbook->AddPage( m_panel3, _("Boat"), false );
-	m_panel13 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer13;
-	bSizer13 = new wxBoxSizer( wxVERTICAL );
-// -------------------------------------------Maintenance-------------------------------------
-	m_notebook6 = new wxNotebook( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panel14 = new wxPanel( m_notebook6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer151;
-	fgSizer151 = new wxFlexGridSizer( 4, 1, 0, 0 );
-	fgSizer151->AddGrowableCol( 0 );
-
-	fgSizer151->AddGrowableRow( 3 );
-	fgSizer151->SetFlexibleDirection( wxBOTH );
-	fgSizer151->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxBoxSizer* bSizer1011;
-	bSizer1011 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonAddLineService = new wxButton( m_panel14, wxID_ANY, _("Add Line"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonAddLineService->SetToolTip( _("Add a new line") );
-	bSizer1011->Add( m_buttonAddLineService, 0, wxALL, 5 );
-	
-	m_buttonSaveService = new wxButton( m_panel14, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSaveService->SetToolTip( _("export your Service-data as HTML or ODT") );	
-	bSizer1011->Add( m_buttonSaveService, 0, wxALL, 5 );
-	
-	m_staticline151 = new wxStaticLine( m_panel14, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer1011->Add( m_staticline151, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText621 = new wxStaticText( m_panel14, wxID_ANY, _("Select Layout:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText621->Wrap( -1 );
-	bSizer1011->Add( m_staticText621, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString m_choiceSelectLayoutServiceChoices;
-	m_choiceSelectLayoutService = new wxChoice( m_panel14, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_choiceSelectLayoutServiceChoices, 0 );
-	m_choiceSelectLayoutService->SetToolTip( _("Select a layout which is displayed\nwith button \"View\"") );
-	m_choiceSelectLayoutService->SetSelection( 0 );
-	bSizer1011->Add( m_choiceSelectLayoutService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonReloadLayoutsServiceHTML = new wxButton( m_panel14, wxID_ANY, _("R"),wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonReloadLayoutsServiceHTML->SetToolTip( _("Reload Layouts") );
-	
-	bSizer1011->Add( m_buttonReloadLayoutsServiceHTML, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonEditLayoutODTService = new wxButton( m_panel14, wxID_ANY, _("E"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonEditLayoutODTService->SetToolTip( _("Edit Layout") );
-	
-	bSizer1011->Add( m_buttonEditLayoutODTService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnHTMLService = new wxRadioButton( m_panel14, wxID_ANY, wxT("HTML"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnHTMLService->SetValue( true ); 
-	bSizer1011->Add( m_radioBtnHTMLService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnODTService = new wxRadioButton( m_panel14, wxID_ANY, wxT("ODT"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1011->Add( m_radioBtnODTService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonViewService = new wxButton( m_panel14, wxID_ANY, _("View"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonViewService->SetToolTip( _("View data in browser (HTML) or Openoffice/LibreOffice (ODT)") );
-	bSizer1011->Add( m_buttonViewService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1011->Add( 300, 0, 1, wxEXPAND, 5 );
-	
-	fgSizer151->Add( bSizer1011, 1, wxEXPAND, 5 );
-	
-	m_staticline141 = new wxStaticLine( m_panel14, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer151->Add( m_staticline141, 0, wxEXPAND | wxALL, 5 );
-	
-	wxBoxSizer* bSizer12;
-	bSizer12 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer12->SetMinSize( wxSize( -1,400 ) ); 
-	m_gridMaintanence = new wxGrid( m_panel14, wxID_ANY, wxDefaultPosition, wxSize(1000,400), 0 );
-	
-	// Grid
-	m_gridMaintanence->CreateGrid( 0, 7 );
-	m_gridMaintanence->EnableEditing( true );
-	m_gridMaintanence->EnableGridLines( true );
-	m_gridMaintanence->EnableDragGridSize( false );
-	m_gridMaintanence->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridMaintanence->SetColSize( 0, 50 );
-	m_gridMaintanence->SetColSize( 1, 400 );
-	m_gridMaintanence->SetColSize( 2, 100 );
-	m_gridMaintanence->SetColSize( 3, 100 );
-	m_gridMaintanence->SetColSize( 4, 80 );
-	m_gridMaintanence->SetColSize( 5, 80 );
-	m_gridMaintanence->EnableDragColMove( false );
-	m_gridMaintanence->EnableDragColSize( true );
-	m_gridMaintanence->SetColLabelSize( 30 );
-	m_gridMaintanence->SetColLabelValue( 0, _("Priority") );
-	m_gridMaintanence->SetColLabelValue( 1, _("Service TODO") );
-	m_gridMaintanence->SetColLabelValue( 2, _("If") );
-	m_gridMaintanence->SetColLabelValue( 3, _("Warnvalue") );
-	m_gridMaintanence->SetColLabelValue( 4, _("Urgentvalue") );
-	m_gridMaintanence->SetColLabelValue( 5, _("Startvalue") );
-	m_gridMaintanence->SetColLabelValue( 6, _("Active") );
-	m_gridMaintanence->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridMaintanence->AutoSizeRows();
-	m_gridMaintanence->EnableDragRowSize( true );
-	m_gridMaintanence->SetRowLabelSize( 30 );
-	m_gridMaintanence->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	m_gridMaintanence->SetLabelTextColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
-	
-	// Cell Defaults
-	m_gridMaintanence->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
-	m_menu7 = new wxMenu();
-	wxMenuItem* m_menuItem9;
-	m_menuItem9 = new wxMenuItem( m_menu7, wxID_ANY, wxString( _("Service done") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu7->Append( m_menuItem9 );
-	
-	wxMenuItem* m_menuItem92;
-	m_menuItem92 = new wxMenuItem( m_menu7, wxID_ANY, wxString( _("Buy parts for this service") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu7->Append( m_menuItem92 );
-	
-	wxMenuItem* m_menuItem13;
-	m_menuItem13 = new wxMenuItem( m_menu7, wxID_ANY, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu7->Append( m_menuItem13 );
-	
-	
-	bSizer12->Add( m_gridMaintanence, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	fgSizer151->Add( bSizer12, 1, wxEXPAND, 5 );
-	
-	m_panel14->SetSizer( fgSizer151 );
-	m_panel14->Layout();
-	fgSizer151->Fit( m_panel14 );
-	m_notebook6->AddPage( m_panel14, _("Service"), true );
-	m_panel141 = new wxPanel( m_notebook6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer1513;
-	fgSizer1513 = new wxFlexGridSizer( 3, 1, 0, 0 );
-	fgSizer1513->AddGrowableCol( 0 );
-	fgSizer1513->AddGrowableRow( 2 );  // Reparaturen???
-	fgSizer1513->SetFlexibleDirection( wxBOTH );
-	fgSizer1513->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxBoxSizer* bSizer10113;
-	bSizer10113 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonAddLineRepairs = new wxButton( m_panel141, wxID_ANY, _("Add Line"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonAddLineRepairs->SetToolTip( _("Add a new line") );
-	bSizer10113->Add( m_buttonAddLineRepairs, 0, wxALL, 5 );
-	
-	m_buttonSaveRepairs = new wxButton( m_panel141, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSaveRepairs->SetToolTip( _("export your Repairs-data as HTML or ODT") );	
-	bSizer10113->Add( m_buttonSaveRepairs, 0, wxALL, 5 );
-	
-	m_staticline1513 = new wxStaticLine( m_panel141, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer10113->Add( m_staticline1513, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText6213 = new wxStaticText( m_panel141, wxID_ANY, _("Select Layout:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText6213->Wrap( -1 );
-	bSizer10113->Add( m_staticText6213, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString m_choiceSelectLayoutRepairsChoices;
-	m_choiceSelectLayoutRepairs = new wxChoice( m_panel141, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_choiceSelectLayoutRepairsChoices, 0 );
-	m_choiceSelectLayoutRepairs->SetToolTip( _("Select a layout which is displayed\nwith button \"View\"") );
-	m_choiceSelectLayoutRepairs->SetSelection( 0 );
-	bSizer10113->Add( m_choiceSelectLayoutRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonReloadLayoutsRepairsHTML = new wxButton( m_panel141, wxID_ANY, _("R"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonReloadLayoutsRepairsHTML->SetToolTip( _("Reload Layouts") );
-	
-	bSizer10113->Add( m_buttonReloadLayoutsRepairsHTML, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonEditLayoutODTRepairs = new wxButton( m_panel141, wxID_ANY, _("E"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonEditLayoutODTRepairs->SetToolTip( _("Edit Layout") );
-	
-	bSizer10113->Add( m_buttonEditLayoutODTRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnHTMLRepairs = new wxRadioButton( m_panel141, wxID_ANY, wxT("HTML"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnHTMLRepairs->SetValue( true ); 
-	bSizer10113->Add( m_radioBtnHTMLRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnODTRepairs = new wxRadioButton( m_panel141, wxID_ANY, wxT("ODT"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer10113->Add( m_radioBtnODTRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonViewRepairs = new wxButton( m_panel141, wxID_ANY, _("View"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonViewRepairs->SetToolTip( _("View data in browser (HTML) or Openoffice/LibreOffice (ODT)") );
-	bSizer10113->Add( m_buttonViewRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer10113->Add( 300, 0, 1, wxEXPAND, 5 );
-	
-	fgSizer1513->Add( bSizer10113, 1, wxEXPAND, 5 );
-	
-	m_staticline1413 = new wxStaticLine( m_panel141, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer1513->Add( m_staticline1413, 0, wxEXPAND | wxALL, 5 );
-	
-	wxBoxSizer* bSizer122;
-	bSizer122 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer122->SetMinSize( wxSize( -1,400 ) ); 
-	m_gridMaintanenceRepairs = new wxGrid( m_panel141, wxID_ANY, wxDefaultPosition, wxSize( 1000,400 ), 0 );
-	
-	// Grid
-	m_gridMaintanenceRepairs->CreateGrid( 0, 2 );
-	m_gridMaintanenceRepairs->EnableEditing( true );
-	m_gridMaintanenceRepairs->EnableGridLines( true );
-	m_gridMaintanenceRepairs->EnableDragGridSize( false );
-	m_gridMaintanenceRepairs->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridMaintanenceRepairs->SetColSize( 0, 50 );
-	m_gridMaintanenceRepairs->SetColSize( 1, 400 );
-	m_gridMaintanenceRepairs->EnableDragColMove( false );
-	m_gridMaintanenceRepairs->EnableDragColSize( true );
-	m_gridMaintanenceRepairs->SetColLabelSize( 30 );
-	m_gridMaintanenceRepairs->SetColLabelValue( 0, _("Priority") );
-	m_gridMaintanenceRepairs->SetColLabelValue( 1, _("RepairsTODO") );
-	m_gridMaintanenceRepairs->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridMaintanenceRepairs->AutoSizeRows();
-	m_gridMaintanenceRepairs->EnableDragRowSize( true );
-	m_gridMaintanenceRepairs->SetRowLabelSize( 30 );
-	m_gridMaintanenceRepairs->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	m_gridMaintanenceRepairs->SetLabelTextColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
-	
-	// Cell Defaults
-	m_gridMaintanenceRepairs->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
-	m_menu71 = new wxMenu();
-	wxMenuItem* m_menuItem91;
-	m_menuItem91 = new wxMenuItem( m_menu71, wxID_ANY, wxString( _("Repair done") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu71->Append( m_menuItem91 );
-	
-	wxMenuItem* m_menuItem921;
-	m_menuItem921 = new wxMenuItem( m_menu71, wxID_ANY, wxString( _("Buy parts for this repair") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu71->Append( m_menuItem921 );
-	
-	wxMenuItem* m_menuItem131;
-	m_menuItem131 = new wxMenuItem( m_menu71, wxID_ANY, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu71->Append( m_menuItem131 );
-	
-	
-	bSizer122->Add( m_gridMaintanenceRepairs, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	fgSizer1513->Add( bSizer122, 1, wxEXPAND, 5 );
-	
-	m_panel141->SetSizer( fgSizer1513 );
-	m_panel141->Layout();
-	fgSizer1513->Fit( m_panel141 );
-	m_notebook6->AddPage( m_panel141, _("Repairs"), false );
-	m_panel16 = new wxPanel( m_notebook6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer1511;
-	fgSizer1511 = new wxFlexGridSizer( 3, 1, 0, 0 );
-	fgSizer1511->AddGrowableCol( 0 );
-	fgSizer1511->AddGrowableRow( 2 );  // Zubehör kaufen ???
-	fgSizer1511->SetFlexibleDirection( wxBOTH );
-	fgSizer1511->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxBoxSizer* bSizer10111;
-	bSizer10111 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonAddLineBuyParts = new wxButton( m_panel16, wxID_ANY, _("Add Line"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonAddLineBuyParts->SetToolTip( _("Add a new line") );
-	bSizer10111->Add( m_buttonAddLineBuyParts, 0, wxALL, 5 );
-	
-	m_buttonSaveBuyParts = new wxButton( m_panel16, wxID_ANY, _("Export"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSaveBuyParts->SetToolTip( _("export your BuyParts-data as HTML or ODT") );	
-	bSizer10111->Add( m_buttonSaveBuyParts, 0, wxALL, 5 );
-	
-	m_staticline1511 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
-	bSizer10111->Add( m_staticline1511, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText6211 = new wxStaticText( m_panel16, wxID_ANY, _("Select Layout:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText6211->Wrap( -1 );
-	bSizer10111->Add( m_staticText6211, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString m_choiceSelectLayoutBuyPartsChoices;
-	m_choiceSelectLayoutBuyParts = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_choiceSelectLayoutBuyPartsChoices, 0 );
-	m_choiceSelectLayoutBuyParts->SetToolTip( _("Select a layout which is displayed\nwith button \"View\"") );
-	m_choiceSelectLayoutBuyParts->SetSelection( 0 );
-	bSizer10111->Add( m_choiceSelectLayoutBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonReloadLayoutsBuyPartsHTML = new wxButton( m_panel16, wxID_ANY, _("R"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonReloadLayoutsBuyPartsHTML->SetToolTip( _("Reload Layouts") );
-	
-	bSizer10111->Add( m_buttonReloadLayoutsBuyPartsHTML, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonEditLayoutODTBuyParts = new wxButton( m_panel16, wxID_ANY, _("E"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
-	m_buttonEditLayoutODTBuyParts->SetToolTip( _("Edit Layout") );
-	
-	bSizer10111->Add( m_buttonEditLayoutODTBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnHTMLBuyParts = new wxRadioButton( m_panel16, wxID_ANY, wxT("HTML"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnHTMLBuyParts->SetValue( true ); 
-	bSizer10111->Add( m_radioBtnHTMLBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnODTBuyParts = new wxRadioButton( m_panel16, wxID_ANY, wxT("ODT"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer10111->Add( m_radioBtnODTBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonViewBuyParts = new wxButton( m_panel16, wxID_ANY, _("View"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonViewBuyParts->SetToolTip( _("View data in browser (HTML) or Openoffice/LibreOffice (ODT)") );
-	bSizer10111->Add( m_buttonViewBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer10111->Add( 300, 0, 1, wxEXPAND, 5 );
-	
-	fgSizer1511->Add( bSizer10111, 1, wxEXPAND, 5 );
-	
-	m_staticline1411 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer1511->Add( m_staticline1411, 0, wxEXPAND | wxALL, 5 );
-	
-	wxBoxSizer* bSizer121;
-	bSizer121 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer121->SetMinSize( wxSize( -1,400 ) );
-	m_gridMaintenanceBuyParts = new wxGrid( m_panel16, wxID_ANY, wxDefaultPosition, wxSize(1000,400), 0 );
-
-	// Grid
-	m_gridMaintenanceBuyParts->CreateGrid( 0, 6 );
-	m_gridMaintenanceBuyParts->EnableEditing( true );
-	m_gridMaintenanceBuyParts->EnableGridLines( true );
-	m_gridMaintenanceBuyParts->EnableDragGridSize( false );
-	m_gridMaintenanceBuyParts->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridMaintenanceBuyParts->SetColSize( 0, 50 );
-	m_gridMaintenanceBuyParts->SetColSize( 1, 101 );
-	m_gridMaintenanceBuyParts->SetColSize( 2, 400 );
-	m_gridMaintenanceBuyParts->SetColSize( 3, 325 );
-	m_gridMaintenanceBuyParts->SetColSize( 4, 74 );
-	m_gridMaintenanceBuyParts->SetColSize( 5, 255 );
-	m_gridMaintenanceBuyParts->EnableDragColMove( false );
-	m_gridMaintenanceBuyParts->EnableDragColSize( true );
-	m_gridMaintenanceBuyParts->SetColLabelSize( 30 );
-	m_gridMaintenanceBuyParts->SetColLabelValue( 0, _("Priority") );
-	m_gridMaintenanceBuyParts->SetColLabelValue( 1, _("Category") );
-	m_gridMaintenanceBuyParts->SetColLabelValue( 2, _("Title") );
-	m_gridMaintenanceBuyParts->SetColLabelValue( 3, _("Buy Parts") );
-	m_gridMaintenanceBuyParts->SetColLabelValue( 4, _("Date") );
-	m_gridMaintenanceBuyParts->SetColLabelValue( 5, _("At") );
-	//	m_gridMaintenanceBuyParts->SetColLabelValue( 6, _("Active") ); // No column set for 6 ??
-	m_gridMaintenanceBuyParts->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridMaintenanceBuyParts->AutoSizeRows();
-	m_gridMaintenanceBuyParts->EnableDragRowSize( true );
-	m_gridMaintenanceBuyParts->SetRowLabelSize( 40 );
-	m_gridMaintenanceBuyParts->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridMaintenanceBuyParts->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	m_menu711 = new wxMenu();
-	wxMenuItem* m_menuItem1311;
-	m_menuItem1311 = new wxMenuItem( m_menu711, wxID_ANY, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu711->Append( m_menuItem1311 );
-// Menü ist GANZ unten außerhalb Fenster, warum????
-	
-	bSizer121->Add( m_gridMaintenanceBuyParts, 1, wxALL|wxEXPAND, 5 );
+    // Grid
+    m_gridGlobal->CreateGrid( 0, 14 );
+    m_gridGlobal->EnableEditing( true );
+    m_gridGlobal->EnableGridLines( true );
+    m_gridGlobal->EnableDragGridSize( false );
+    m_gridGlobal->SetMargins( 0, 0 );
 
-	fgSizer1511->Add( bSizer121, 1, wxEXPAND, 5 );
-	
-	m_panel16->SetSizer( fgSizer1511 );
-	m_panel16->Layout();
-	fgSizer1511->Fit( m_panel16 );
-	m_notebook6->AddPage( m_panel16, _("Buy Parts"), false );
-	
-	bSizer13->Add( m_notebook6, 1, wxEXPAND | wxALL, 5 );
-	
-	m_panel13->SetSizer( bSizer13 );
-	m_panel13->Layout();
-	bSizer13->Fit( m_panel13 );
-	m_logbook->AddPage( m_panel13, _("Maintenance"), false );
-
-	bSizer2->Add( m_logbook, 1, wxEXPAND | wxALL, 2 );
-
-	this->SetSizer( bSizer2 );
-	this->Layout();
-
-	this->Centre( wxHORIZONTAL );
-
-	// Connect Events
-	m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_EDITOR_HIDDEN, wxGridEventHandler( LogbookDialog::onGridEditorHidden ), NULL, this );
-	m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::onGridEditorShow ), NULL, this );
-	m_logbook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNoteBookPageChangedLogbook ), NULL, this );
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( LogbookDialog::LogbookDialogOnClose ) );
-	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookDialog::LogbookDialogOnInitDialog ) );
-	m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::m_button4OnButtonClick ), NULL, this );
-	m_gridGlobal->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickGlobal ), NULL, this );
-	m_gridWeather->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickWeather ), NULL, this );
-	m_gridMotorSails->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickMotorSails ), NULL, this );
-	m_gridOverview->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickOverview ), NULL, this );
-	m_gridCrew->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrew ), NULL, this );
-	this->Connect( m_menuItem30->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionOnboardCrew ) );
-	this->Connect( m_menuItem31->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAllEntriesCrew ) );
-	m_gridCrewWake->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrewWake ), NULL, this );
-	logSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logSaveOnButtonClick ), NULL, this );
-	logView->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logViewOnButtonClick ), NULL, this );
-	newLogbook->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::newLogbookOnButtonClick ), NULL, this );
-	selLogbook->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::selLogbookOnButtonClick ), NULL, this );
-	m_gridGlobal->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCellRightClick ), NULL, this );
-	m_gridGlobal->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCmdCellChange ), NULL, this );
-	m_gridGlobal->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridSelectCell ), NULL, this );
-	m_gridGlobal->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridGlobalOnKeyDown ), NULL, this );
-	m_gridGlobal->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickGlobal ), NULL, this );
-	m_gridWeather->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickWeather ), NULL, this );
-	m_gridMotorSails->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickMotorSails ), NULL, this );
-	this->Connect( m_menuItem1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
-	this->Connect( m_menuItem15->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumn ) );
-	this->Connect( m_menuItem16->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumnOverView ) );
-	this->Connect( m_menuItemSearch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSearch ) );
-	this->Connect( m_menuItemShutDown->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShutdown ) );
-	m_gridWeather->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCellRightClick ), NULL, this );
-	m_gridWeather->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCmdCellChange ), NULL, this );
-	m_gridWeather->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridSelectCell ), NULL, this );
-	m_gridWeather->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridWeatherOnKeyDown ), NULL, this );
-	m_gridMotorSails->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCellRightClick ), NULL, this );
-	m_gridMotorSails->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCmdCellChange ), NULL, this );
-	m_gridMotorSails->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridSelectCell ), NULL, this );
-	m_gridMotorSails->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridMotorSailsOnKeyDown ), NULL, this );
-	crewAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewAddOnButtonClick ), NULL, this );
-	crewSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewSaveOnButtonClick ), NULL, this );
-	crewView->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewViewOnButtonClick ), NULL, this );
-	m_gridCrew->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellChange ), NULL, this );
-	m_gridCrew->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellRightClick ), NULL, this );
-	this->Connect( m_menuItem2->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem2OnMenuSelection ) );
-	m_gridCrewWake->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewWakeOnGridCellChange ), NULL, this );
-
-	addEquipmentButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boataddEquipmentButtonOnButtonClick ), NULL, this );
-	boatSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatSaveOnButtonClick ), NULL, this );
-	boatView->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatViewOnButtonClick ), NULL, this );
-	m_gridEquipment->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellChange ), NULL, this );
-	m_gridEquipment->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellRightClick ), NULL, this );
-	this->Connect( m_menuItem3->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem3OnMenuSelection ) );
-	m_radioBtnHTML->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTML ), NULL, this );
-	m_radioBtnODT->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODT ), NULL, this );
-	m_buttonReloadLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutLogbook ), NULL, this );
-	m_buttonEditLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutLogbook ), NULL, this );
-	m_buttonAddLineService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineService ), NULL, this );
-	m_buttonSaveService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService), NULL, this );
-	m_buttonReloadLayoutsServiceHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
-	m_buttonEditLayoutODTService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
-	m_radioBtnHTMLService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
-	m_radioBtnODTService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
-	m_buttonViewService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
-	m_buttonReloadLayoutsBoat->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsBoat ), NULL, this );
-	m_buttonEditLayoutBoat->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutBoat ), NULL, this );
-	m_radioBtnHTMLBoat->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLBoat ), NULL, this );
-	m_radioBtnODTBoat->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTBoat ), NULL, this );
-	m_buttonReloadCrew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsCrew ), NULL, this );
-	m_buttonEditLayoutCrew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutCrew ), NULL, this );
-	m_radioBtnHTMLCrew->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLCrew ), NULL, this );
-	m_radioBtnODTCrew->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTCrew ), NULL, this );
-	m_buttonSelectLogbook->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickSelectLogbook ), NULL, this );
-	m_gridOverview->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickOverview ), NULL, this );
-	m_gridOverview->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickOverview ), NULL, this );
-	this->Connect( m_menuItemOverviewRoute->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionGotoRoute ) );
-	logSaveOverview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverviewSave ), NULL, this );
-	m_buttonReloadLayoutOview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutOverView ), NULL, this );
-	m_buttonEditLayoutOview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutOverview ), NULL, this );
-	m_radioBtnHTMLOverview->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
-	m_gridOverview->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownOverview ), NULL, this );
-	m_radioBtnODTOverview->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTOverView ), NULL, this );
-	logViewOverview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverView ), NULL, this );
-	m_radioBtnHTMLOverview->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
-	m_radioBtnAllLogbooks->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::OnRadioButtonAllLogbooks ), NULL, this );
-	m_radioBtnActuellLogbook->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::OnRadioButtonActuellLogbook ), NULL, this );
-	m_toggleBtnShowEquipment->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonShowEquip ), NULL, this );
-	this->Connect( m_menuItemNewWatch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionNewWatchWake ) );
-	this->Connect( m_menuItem32->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAsc ) );
-	this->Connect( m_menuItem33->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDesc ) );
-	m_gridGlobal->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickGlobal ), NULL, this );
-	m_gridWeather->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWeather ), NULL, this );
-	m_gridMotorSails->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickMotorSails ), NULL, this );
-	this->Connect( m_menuItemDelRows->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionDeleteRows ) );
-	this->Connect( m_menuItemFlip->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlip ) );
-	m_textCtrlStatusDistance->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDistance ), NULL, this );
-	m_textCtrlStatusCourseDeg->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourse ), NULL, this );
-	m_textCtrlStatusCourseMin->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourseMin ), NULL, this );
-	m_textCtrlWatchStartTime->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpStartTime ), NULL, this );
-	m_textCtrlWakeTrip->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDays ), NULL, this );
-	m_textCtrlWakeDay->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDay ), NULL, this );
-	this->Connect( m_menuItem36->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlipWatches ) );
-	logbookChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceGlobal ), NULL, this );
-	crewChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceCrew ), NULL, this );
-	boatChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoat ), NULL, this );
-	overviewChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoatOverview ), NULL, this );
-	m_choiceSelectLayoutService->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceService ), NULL, this );
-	m_choiceSelectLayoutRepairs->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceRepairs ), NULL, this );
-	m_choiceSelectLayoutBuyParts->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBuyParts ), NULL, this );
-    m_bpButtonShowHideLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickShowHideLayout ), NULL, this );
-    m_toggleBtnEngine1->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine1 ), NULL, this );
-    m_toggleBtnEngine2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine2 ), NULL, this );
-    m_toggleBtnGenerator->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonGenerator ), NULL, this );
+    // Columns
+    m_gridGlobal->SetColSize( 0, 144 );
+    m_gridGlobal->SetColSize( 1, 89 );
+    m_gridGlobal->SetColSize( 2, 63 );
+    m_gridGlobal->SetColSize( 3, 35 );
+    m_gridGlobal->SetColSize( 4, 157 );
+    m_gridGlobal->SetColSize( 5, 58 );
+    m_gridGlobal->SetColSize( 6, 86 );
+    m_gridGlobal->SetColSize( 7, 143 );
+    m_gridGlobal->SetColSize( 8, 54 );
+    m_gridGlobal->SetColSize( 9, 50 );
+    m_gridGlobal->SetColSize( 10, 55 );
+    m_gridGlobal->SetColSize( 11, 57 );
+    m_gridGlobal->SetColSize( 12, 62 );
+    m_gridGlobal->SetColSize( 13, 248 );
+    m_gridGlobal->EnableDragColMove( false );
+    m_gridGlobal->EnableDragColSize( true );
+    m_gridGlobal->SetColLabelSize( 30 );
+    m_gridGlobal->SetColLabelValue( 0, _( "Route" ) );
+    m_gridGlobal->SetColLabelValue( 1, _( "Date" ) );
+    m_gridGlobal->SetColLabelValue( 2, _( "Time" ) );
+    m_gridGlobal->SetColLabelValue( 3, _( "Status" ) );
+    m_gridGlobal->SetColLabelValue( 4, _( "Watch" ) );
+    m_gridGlobal->SetColLabelValue( 5, _( "Distance" ) );
+    m_gridGlobal->SetColLabelValue( 6, _( "DistanceTotal" ) );
+    m_gridGlobal->SetColLabelValue( 7, _( "Position" ) );
+    m_gridGlobal->SetColLabelValue( 8, _( "COG (T)" ) );
+    m_gridGlobal->SetColLabelValue( 9, _( "Heading" ) );
+    m_gridGlobal->SetColLabelValue( 10, _( "SOG" ) );
+    m_gridGlobal->SetColLabelValue( 11, _( "STW" ) );
+    m_gridGlobal->SetColLabelValue( 12, _( "Depth" ) );
+    m_gridGlobal->SetColLabelValue( 13, _( "Remarks" ) );
+    m_gridGlobal->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
-	m_notebook8->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNotebookPageChangedLoggrids ), NULL, this );
-	m_bpButtonShowHideStatusGlobal->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickStatusbarGlobal ), NULL, this );
-	m_bpButtonHelpGlobal->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnClickButtonHelpGlobal ), NULL, this );
-
-	m_gridCrew->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownCrew ), NULL, this );
-
-	this->Connect( m_menuItem22->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHiddenCrew ) );
-	this->Connect( m_menuItem23->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionMergeWatch ) );
-	m_gridGlobal->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickGlobal ), NULL, this );
-
-	m_gridMaintanence->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellServiceChange ), NULL, this );
-	m_gridMaintanence->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::onGridCellServiceSelected ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickWake ), NULL, this );
-	m_gridCrew->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownCrew ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownWatch ), NULL, this );
-	m_gridMaintanence->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickService ), NULL, this );
-	m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickBuyParts ), NULL, this );
-	m_gridMaintanenceRepairs->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickRepairs ), NULL, this );
-	
-	this->Connect( m_menuItem9->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceOK ) );
-	this->Connect( m_menuItem92->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceBuyParts ) );
-
-	m_gridMaintanence->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickService ), NULL, this );
-	m_gridMaintanence->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickService ), NULL, this );
-	m_buttonAddLineBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineBuyParts ), NULL, this );
-	m_buttonAddLineRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineRepairs ), NULL, this );
-	m_buttonReloadLayoutsBuyPartsHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsBuyPartsHTML ), NULL, this );
-	m_buttonEditLayoutODTBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTBuyParts ), NULL, this );
-	m_radioBtnHTMLBuyParts->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLBuyParts ), NULL, this );
-	m_radioBtnODTBuyParts->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTBuyParts ), NULL, this );
-	m_buttonViewBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellChangeBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellSelectedBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickBuyParts ), NULL, this );
-	m_buttonSaveBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveBuyParts ), NULL, this );
-
-	this->Connect( m_menuItem91->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsOK ) );
-	this->Connect( m_menuItem921->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsBuyParts ) );
-	this->Connect( m_menuItem131->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsDelete ) );
-	this->Connect( m_menuItem1311->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionBuyPartsDelete ) );
-	this->Connect( m_menuItem13->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceDelete ) );
-	this->Connect( m_menuItem132->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenCols ) );
-
-	this->Connect( m_menuItem14->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenColsOverview ) );
-	m_gridMaintanenceRepairs->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellRepairsChange ), NULL, this );
-	m_gridMaintanenceRepairs->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickRepairs ), NULL, this );
-	m_gridMaintanenceRepairs->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRepairsSelected ), NULL, this );
-	m_gridMaintanenceRepairs->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownRepairs ), NULL, this );
-	m_buttonSaveRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveRepairs ), NULL, this );
-	m_buttonReloadLayoutsRepairsHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsRepairsHTML ), NULL, this );
-	m_buttonEditLayoutODTRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTRepairs ), NULL, this );
-	m_radioBtnHTMLRepairs->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLRepairs ), NULL, this );
-	m_radioBtnODTRepairs->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTRepairs ), NULL, this );
-	m_buttonViewRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewRepairs ), NULL, this );
-
-	m_buttonSaveService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService ), NULL, this );
-	m_buttonReloadLayoutsServiceHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
-	m_buttonEditLayoutODTService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
-	m_radioBtnHTMLService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
-	m_radioBtnODTService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
-	m_buttonViewService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
-
-	m_gridGlobal->Connect(wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Connect(wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Connect(wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Connect(wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Connect(wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Connect(wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Connect(wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Connect(wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Connect(wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Connect(wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Connect(wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Connect(wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Connect(wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Connect(wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Connect(wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridCrew->Connect( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEventHandler( LogbookDialog::OnGridBeginDragCrew ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEventHandler( LogbookDialog::OnGridBeginDragWatch ), NULL, this );
-	m_gridCrew->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellLeftClick ), NULL, this );
-	m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickWakeClear ), NULL, this );
-	m_buttonCalculate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickCalculate ), NULL, this );
-	m_buttonReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickReset ), NULL, this );
-	m_buttonDayPlus->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayPlus ), NULL, this );
-	m_buttonNow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickNow ), NULL, this );
-	m_buttonDayMinus->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayMinus ), NULL, this );
-	m_textCtrlWatchStartDate->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( LogbookDialog::OnLeftDownWatchStartDate ), NULL, this );
-
-	m_textCtrlWatchStartTime->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterWatchTime ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickWatch ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_GRID_EDITOR_HIDDEN, wxGridEventHandler( LogbookDialog::OnGridEditorHiddenWatch ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEventHandler( LogbookDialog::OnGridEditorCreatedWatch ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownWatch ), NULL, this );
-	m_textCtrlWakeDay->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterDayWake ), NULL, this );
-	this->Connect( m_menuItem35->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDeleteMembers ) );
-	this->Connect( m_menuItem19->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSplitWatch ) );
-	m_gridCrewWake->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWake ), NULL, this );
-	m_gridCrewWake->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickWake ), NULL, this );
-
-	m_splitterWatch->Connect( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEventHandler( LogbookDialog::OnSplitterSashPositionChangedWake ), NULL, this );
-	m_buttonSetTimer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusTimer ), NULL, this );
-	m_bpButtonTimer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletTimer ), NULL, this );
-	m_bpButtonWatch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWatch ), NULL, this );
-	m_bpButton8Waypoint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWaypoint ), NULL, this );
-	m_bpButtonDistance->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletDistance ), NULL, this );
-	m_bpButtonCourse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletCourse ), NULL, this );
-	m_buttonStartStop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusStartStop ), NULL, this );
-	m_textCtrlStatusDistance->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusDistance ), NULL, this );
-	m_textCtrlStatusCourseDeg->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusCourseDeg ), NULL, this );
-	m_textCtrlStatusCourseMin->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusMinutes ), NULL, this );
+    // Rows
+    m_gridGlobal->AutoSizeRows();
+    m_gridGlobal->EnableDragRowSize( true );
+    m_gridGlobal->SetRowLabelSize( 30 );
+    m_gridGlobal->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
-	this->Connect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::OnIdleMainDialog ) );
+    // Label Appearance
 
-}
+    // Cell Defaults
+    m_gridGlobal->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
+    m_menu1 = new wxMenu();
+    wxMenuItem* m_menuItem1;
+    m_menuItem1 = new wxMenuItem( m_menu1, 500, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu1->Append( m_menuItem1 );
 
+    m_menu1->AppendSeparator();
 
+    wxMenuItem* m_menuItem132;
+    m_menuItem132 = new wxMenuItem( m_menu1, 503, wxString( _( "Show hidden columns" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu1->Append( m_menuItem132 );
 
-LogbookDialog::~LogbookDialog()
-{
-	setIniValues();
+    wxMenuItem* m_menuItem15;
+    m_menuItem15 = new wxMenuItem( m_menu1, 506, wxString( _( "Hide column" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu1->Append( m_menuItem15 );
 
-	if(GPSTimer->IsRunning())
-		GPSTimer->Stop();
+    wxMenuItem* m_menuItemSearch;
+    m_menuItemSearch = new wxMenuItem( m_menu1, wxID_ANY, wxString( _( "Search in Logbook" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu1->Append( m_menuItemSearch );
 
-	this->Disconnect( wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnTimerGPS ));
-    delete GPSTimer;
-	GPSTimer = NULL;
+    m_menu1->AppendSeparator();
 
-	if(logbookTimer->IsRunning())
-		logbookTimer->Stop();
+    wxMenuItem* m_menuItemShutDown;
+    m_menuItemShutDown = new wxMenuItem( m_menu1, wxID_ANY, wxString( _( "Shutdown Logbook" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu1->Append( m_menuItemShutDown );
 
-	this->Disconnect( wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnLogTimer ));
-    delete logbookTimer;
-	logbookTimer = NULL;
+    m_gridGlobal->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( LogbookDialog::m_gridGlobalOnContextMenu ), NULL, this );
 
-	// Disconnect Events
-    this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::OnIdleMainDialog ) );
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( LogbookDialog::LogbookDialogOnClose ) );
-	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookDialog::LogbookDialogOnInitDialog ) );
-	m_logbook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNoteBookPageChangedLogbook ), NULL, this );
-	m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::m_button4OnButtonClick ), NULL, this );
-	logView->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logViewOnButtonClick ), NULL, this );
-	logSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logSaveOnButtonClick ), NULL, this );
-	newLogbook->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::newLogbookOnButtonClick ), NULL, this );
-	selLogbook->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::selLogbookOnButtonClick ), NULL, this );
-	m_gridGlobal->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCellRightClick ), NULL, this );
-	m_gridGlobal->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCmdCellChange ), NULL, this );
-	m_gridGlobal->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridSelectCell ), NULL, this );
-	m_gridGlobal->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridGlobalOnKeyDown ), NULL, this );
-	m_gridGlobal->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickGlobal ), NULL, this );
-	m_gridWeather->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickWeather ), NULL, this );
-	m_gridMotorSails->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickMotorSails ), NULL, this );
-	m_gridOverview->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickOverview ), NULL, this );
-	m_gridCrew->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrew ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionOnboardCrew ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAllEntriesCrew ) );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrewWake ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShutdown ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumn ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumnOverView ) );
-	m_gridGlobal->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickGlobal ), NULL, this );
-	m_gridWeather->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickWeather ), NULL, this );
-	m_gridMotorSails->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickMotorSails ), NULL, this );
-
-	m_gridWeather->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCellRightClick ), NULL, this );
-	m_gridWeather->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCmdCellChange ), NULL, this );
-	m_gridWeather->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridSelectCell ), NULL, this );
-	m_gridWeather->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridWeatherOnKeyDown ), NULL, this );
-	m_gridMotorSails->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCellRightClick ), NULL, this );
-	m_gridMotorSails->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCmdCellChange ), NULL, this );
-	m_gridMotorSails->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridSelectCell ), NULL, this );
-	m_gridMotorSails->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridMotorSailsOnKeyDown ), NULL, this );
-	crewAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewAddOnButtonClick ), NULL, this );
-	crewSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewSaveOnButtonClick ), NULL, this );
-	crewView->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewViewOnButtonClick ), NULL, this );
-	m_gridCrew->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellChange ), NULL, this );
-	m_gridCrew->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellRightClick ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem2OnMenuSelection ) );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewWakeOnGridCellChange ), NULL, this );
-	addEquipmentButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boataddEquipmentButtonOnButtonClick ), NULL, this );
-	boatSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatSaveOnButtonClick ), NULL, this );
-	boatView->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatViewOnButtonClick ), NULL, this );
-	m_gridEquipment->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellChange ), NULL, this );
-	m_gridEquipment->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellRightClick ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem3OnMenuSelection ) );
-	m_radioBtnHTML->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTML ), NULL, this );
-	m_radioBtnODT->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODT ), NULL, this );
-	m_buttonReloadLayout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutLogbook ), NULL, this );
-	m_buttonEditLayout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutLogbook ), NULL, this );
-	m_buttonAddLineService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineService ), NULL, this );
-	m_buttonSaveService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService ), NULL, this );
-	m_buttonReloadLayoutsServiceHTML->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
-	m_buttonEditLayoutODTService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
-	m_radioBtnHTMLService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
-	m_radioBtnODTService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
-	m_buttonViewService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
-	m_buttonReloadLayoutsBoat->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsBoat ), NULL, this );
-	m_buttonEditLayoutBoat->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutBoat ), NULL, this );
-	m_radioBtnHTMLBoat->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLBoat ), NULL, this );
-	m_radioBtnODTBoat->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTBoat ), NULL, this );
-	m_buttonReloadCrew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsCrew ), NULL, this );
-	m_buttonEditLayoutCrew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutCrew ), NULL, this );
-	m_radioBtnHTMLCrew->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLCrew ), NULL, this );
-	m_radioBtnODTCrew->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTCrew ), NULL, this );
-	m_buttonSelectLogbook->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickSelectLogbook ), NULL, this );	
-	m_gridOverview->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickOverview ), NULL, this );
-	m_gridOverview->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickOverview ), NULL, this );
-	m_gridOverview->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownOverview ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSearch ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionGotoRoute ) );
-	logSaveOverview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverviewSave ), NULL, this );
-	m_buttonReloadLayoutOview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutOverView ), NULL, this );
-	m_buttonEditLayoutOview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutOverview ), NULL, this );
-	m_radioBtnHTMLOverview->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
-	m_radioBtnODTOverview->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTOverView ), NULL, this );
-	logViewOverview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverView ), NULL, this );
-	m_radioBtnHTMLOverview->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
-	m_radioBtnAllLogbooks->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::OnRadioButtonAllLogbooks ), NULL, this );
-	m_gridMaintanence->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellServiceChange ), NULL, this );
-	m_gridMaintanence->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::onGridCellServiceSelected ), NULL, this );
-	m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickBuyParts ), NULL, this );
-	m_buttonSaveBuyParts->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveBuyParts ), NULL, this );
-	m_toggleBtnShowEquipment->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonShowEquip ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionNewWatchWake ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAsc ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDesc ) );
-	m_gridGlobal->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickGlobal ), NULL, this );
-	m_gridWeather->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWeather ), NULL, this );
-	m_gridMotorSails->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickMotorSails ), NULL, this );
-	this->Disconnect( 518, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionDeleteRows ) );
-	this->Disconnect( 519, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlip ) );
-	m_textCtrlStatusDistance->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDistance ), NULL, this );
-	m_textCtrlStatusCourseDeg->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourse ), NULL, this );
-	m_textCtrlStatusCourseMin->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourseMin ), NULL, this );
-	m_textCtrlWakeTrip->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDays ), NULL, this );
-	m_textCtrlWakeDay->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDay ), NULL, this );
-	m_textCtrlWatchStartTime->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpStartTime ), NULL, this );
-	m_notebook8->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNotebookPageChangedLoggrids ), NULL, this );
-	m_bpButtonShowHideStatusGlobal->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickStatusbarGlobal ), NULL, this );
-	m_bpButtonHelpGlobal->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnClickButtonHelpGlobal ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlipWatches ) );
-	logbookChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceGlobal ), NULL, this );
-	crewChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceCrew ), NULL, this );
-	boatChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoat ), NULL, this );
-	overviewChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoatOverview ), NULL, this );
-	m_choiceSelectLayoutService->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceService ), NULL, this );
-	m_choiceSelectLayoutRepairs->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceRepairs ), NULL, this );
-	m_choiceSelectLayoutBuyParts->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBuyParts ), NULL, this );
-    m_bpButtonShowHideLayout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickShowHideLayout ), NULL, this );
-    m_toggleBtnEngine1->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine1 ), NULL, this );
-    m_toggleBtnEngine2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine2 ), NULL, this );
-    m_toggleBtnGenerator->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonGenerator ), NULL, this );
-    m_buttonSailsReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickResetSails ), NULL, this );
-	m_gridMaintanence->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickService ), NULL, this );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickWake ), NULL, this );
-	m_buttonClear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickWakeClear ), NULL, this );
-
-
-	m_gridCrew->Disconnect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownCrew ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHiddenCrew ) );
-	m_gridCrew->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownCrew ), NULL, this );
-	m_gridCrewWake->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownWatch ), NULL, this );
-
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionMergeWatch ) );
-	m_gridGlobal->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickGlobal ), NULL, this );
-
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceOK ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceBuyParts ) );
-	this->Disconnect( 503, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenCols ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenColsOverview ) );
-	m_gridMaintanence->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickService ), NULL, this );
-	m_gridMaintanence->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickService ), NULL, this );
-	m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickBuyParts ), NULL, this );
-	m_gridMaintanenceRepairs->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickRepairs ), NULL, this );
-
-	m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellChangeBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::onGridCellSelectedBuyParts ), NULL, this );
-	m_buttonAddLineBuyParts->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineBuyParts ), NULL, this );
-	m_gridMaintenanceBuyParts->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownBuyParts ), NULL, this );
-
-	m_buttonAddLineRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineRepairs ), NULL, this );
-	m_buttonSaveRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveRepairs ), NULL, this );
-	m_buttonReloadLayoutsRepairsHTML->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsRepairsHTML ), NULL, this );
-	m_buttonEditLayoutODTRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTRepairs ), NULL, this );
-	m_radioBtnHTMLRepairs->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLRepairs ), NULL, this );
-	m_radioBtnODTRepairs->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTRepairs ), NULL, this );
-	m_buttonViewRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewRepairs ), NULL, this );
-
-	m_buttonAddLineService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineService ), NULL, this );
-	m_buttonSaveService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService ), NULL, this );
-	m_buttonReloadLayoutsServiceHTML->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
-	m_buttonEditLayoutODTService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
-	m_radioBtnHTMLService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
-	m_radioBtnODTService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
-	m_buttonViewService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsOK ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsBuyParts ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsDelete ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionBuyPartsDelete ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceDelete ) );
-	m_buttonAddLineRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineRepairs ), NULL, this );
-	m_gridGlobal->Disconnect(wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Disconnect(wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Disconnect(wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Disconnect(wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Disconnect(wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Disconnect(wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Disconnect(wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Disconnect(wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Disconnect(wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Disconnect(wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Disconnect(wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Disconnect(wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridGlobal->Disconnect(wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler(LogbookDialog::gridGlobalScrolled), NULL, this);
-	m_gridWeather->Disconnect(wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler(LogbookDialog::gridWeatherScrolled), NULL, this);
-	m_gridMotorSails->Disconnect(wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler(LogbookDialog::gridMotorSailsScrolled), NULL, this);
-
-	m_gridCrew->Disconnect( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEventHandler( LogbookDialog::OnGridBeginDragCrew ), NULL, this );
-	m_gridCrew->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellLeftClick ), NULL, this );
-	m_buttonCalculate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickCalculate ), NULL, this );
-	m_buttonReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickReset ), NULL, this );
-	m_buttonDayPlus->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayPlus ), NULL, this );
-	m_buttonNow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickNow ), NULL, this );
-	m_buttonDayMinus->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayMinus ), NULL, this );
-	m_textCtrlWatchStartDate->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( LogbookDialog::OnLeftDownWatchStartDate ), NULL, this );
-
-	m_textCtrlWatchStartTime->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterWatchTime ), NULL, this );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickWatch ), NULL, this );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_EDITOR_HIDDEN, wxGridEventHandler( LogbookDialog::OnGridEditorHiddenWatch ), NULL, this );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownWatch ), NULL, this );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEventHandler( LogbookDialog::OnGridEditorCreatedWatch ), NULL, this );
-	m_textCtrlWakeDay->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterDayWake ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSplitWatch ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionMergeWatch ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDeleteMembers ) );
-	m_gridCrewWake->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWake ), NULL, this );
-
-	m_splitterWatch->Disconnect( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEventHandler( LogbookDialog::OnSplitterSashPositionChangedWake ), NULL, this );
-	m_buttonSetTimer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusTimer ), NULL, this );
-	m_bpButtonTimer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletTimer ), NULL, this );
-	m_bpButtonWatch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWatch ), NULL, this );
-	m_bpButton8Waypoint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWaypoint ), NULL, this );
-	m_bpButtonDistance->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletDistance ), NULL, this );
-	m_bpButtonCourse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletCourse ), NULL, this );
-	m_buttonStartStop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusStartStop ), NULL, this );
-	m_textCtrlStatusDistance->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusDistance ), NULL, this );
-	m_textCtrlStatusCourseDeg->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusCourseDeg ), NULL, this );
-	m_textCtrlStatusCourseMin->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusMinutes ), NULL, this );
+    bSizer391->Add( m_gridGlobal, 1, wxALL|wxEXPAND, 5 );
 
-	for(int i = 0; i < 14; i++)
-        checkboxSails[i]->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookDialog::OnCheckboxSails ), NULL, this );
+    m_panel6->SetSizer( bSizer391 );
+    m_panel6->Layout();
+    bSizer391->Fit( m_panel6 );
 
+    m_menu10 = new wxMenu();
+    wxMenuItem* m_menuItemDelRows;
+    m_menuItemDelRows = new wxMenuItem( m_menu10, 518, wxString( _( "Delete Rows" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu10->Append( m_menuItemDelRows );
 
-	delete m_menu1; 
-	delete m_menu2; 
-	delete m_menu7; 
-	delete m_menu71; 
-	delete m_menu711;
-
-	delete maintenance;  //still a warning with Mac OS C Xcode here: "Delete called on 'Maintenance' that has virtual functions but non-virtual destructor"
-	delete crewList;
-	delete boat;
-	delete logbook;
-	delete coldfinger;
+    wxMenuItem* m_menuItemFlip;
+    m_menuItemFlip = new wxMenuItem( m_menu10, 519, wxString( _( "Flip Day<->Month" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu10->Append( m_menuItemFlip );
 
-	clearDataDir();
-}
+    m_notebook8->AddPage( m_panel6, _( "Navigation" ), true );
+    m_panel7 = new wxPanel( m_notebook8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer11;
+    bSizer11 = new wxBoxSizer( wxVERTICAL );
 
-void LogbookDialog::OnIdleMainDialog( wxIdleEvent& event )
-{
-	static wxDateTime dt;
-	static unsigned int hour, min = 61;
+    m_gridWeather = new wxGrid( m_panel7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
 
-	if(logbook->sDate != wxEmptyString)
-		dt = logbook->mCorrectedDateTime;
-	else
-		dt = wxDateTime::Now();
-
-	if(min != dt.GetMinute())
-	{
-		min  = dt.GetMinute();
-		hour = dt.GetHour();
-
-		if(statusGPS != logbook->gpsStatus)
-		{
-			statusGPS = logbook->gpsStatus;
-			crewList->dayNow(false);
-		}
-		if(logbookPlugIn->opt->timer && !logbookPlugIn->eventsEnabled)
-		{
-			if(logbookPlugIn->opt->timerType == 1)
-			{
-				static unsigned int h = hour;
-				if(fullHourModified)
-				{
-					h = hour;
-					fullHourModified = false;
-				}
-
-				for(unsigned int i = 0; i < TimerFull.Count(); i++)
-					if(min == TimerFull[i] && h == hour)
-					{
-						logbookTimerWindow->timerEvent();
-						if(i == TimerFull.Count()-1)
-						{
-							h += fullHourPlus;
-
-							if(h >= 24)
-								h -= 24;
-						}
-						break;
-					}
-			}
-			else if(logbookPlugIn->opt->timerType == 2 && !logbookPlugIn->eventsEnabled)
-			{
-				for(unsigned int i = 0; i < TimerIndividualH.Count(); i++)
-				{
-					if(logbookPlugIn->opt->timeformat == 1 && hour > 12)
-						hour -= 12;
-					if(hour == TimerIndividualH[i] && min == TimerIndividualM[i])
-					{
-						logbookTimerWindow->timerEvent();
-						break;
-					}
-				}
-			}
-		}
-
-		if(ActuellWatch::active && dt >= ActuellWatch::end)
-		{
-			static unsigned int wmin = 61;
-
-			if(wmin != min)
-			{
-				wmin = min;
-				crewList->dayNow(false);
-				if(logbookPlugIn->opt->guardChange && !logbookPlugIn->eventsEnabled)
-				{
-					logbookTimerWindow->popUp();
-					logbook->guardChange = true;
-					logbook->appendRow(true, true);
-					logbook->guardChange = false;
-				}
-			}
-		}
-		else if(dt >= ActuellWatch::end)
-			crewList->dayNow(false);
-	}
-}
+    // Grid
+    m_gridWeather->CreateGrid( 0, 15 );
+    m_gridWeather->EnableEditing( true );
+    m_gridWeather->EnableGridLines( true );
+    m_gridWeather->EnableDragGridSize( false );
+    m_gridWeather->SetMargins( 0, 0 );
 
-void LogbookDialog::OnToggleButtonEngine1( wxCommandEvent& event )
-{
-    if(event.IsChecked())
-    {
-        SendPluginMessage(_T("LOGBOOK_ENGINEBUTTON1"), _T("ON"));
-        if(logbookPlugIn->opt->engineMessageSails && logbookPlugIn->opt->engineAllwaysSailsDown)
-            resetSails();
-        startEngine1(true, true, true);
+    // Columns
+    m_gridWeather->SetColSize( 0, 69 );
+    m_gridWeather->SetColSize( 1, 78 );
+    m_gridWeather->SetColSize( 2, 74 );
+    m_gridWeather->SetColSize( 3, 66 );
+    m_gridWeather->SetColSize( 4, 81 );
+    m_gridWeather->SetColSize( 5, 76 );
+    m_gridWeather->SetColSize( 6, 81 );
+    m_gridWeather->SetColSize( 7, 76 );
+    m_gridWeather->SetColSize( 8, 63 );
+    m_gridWeather->SetColSize( 9, 76 );
+    m_gridWeather->SetColSize( 10, 92 );
+    m_gridWeather->SetColSize( 11, 89 );
+    m_gridWeather->SetColSize( 12, 80 );
+    m_gridWeather->SetColSize( 13, 80 );
+    m_gridWeather->SetColSize( 14, 80 );
+    m_gridWeather->EnableDragColMove( false );
+    m_gridWeather->EnableDragColSize( true );
+    m_gridWeather->SetColLabelSize( 30 );
+    m_gridWeather->SetColLabelValue( 0, _( "Barometer" ) );
+    m_gridWeather->SetColLabelValue( 1, _( "Hygrometer" ) );
+    m_gridWeather->SetColLabelValue( 2, _( "Air" ) );
+    m_gridWeather->SetColLabelValue( 3, _( "Water" ) );
+    m_gridWeather->SetColLabelValue( 4, _( "TWA" ) );
+
+    if ( logbookPlugIn->opt->windspeeds )
+    {
+        m_gridWeather->SetColLabelValue( 5, _( "TWS\nMin|Avg|Max" ) );
+        m_gridWeather->SetColLabelValue( 6, _( "AWA" ) );
+        m_gridWeather->SetColLabelValue( 7, _( "AWS\nMin|Avg|Max" ) );
     }
     else
     {
-        SendPluginMessage(_T("LOGBOOK_ENGINEBUTTON1"), _T("OFF"));
-        stopEngine1(true, true);
-    }
-}
+        m_gridWeather->SetColLabelValue( 5, _( "TWS" ) );
+        m_gridWeather->SetColLabelValue( 6, _( "AWA" ) );
+        m_gridWeather->SetColLabelValue( 7, _( "AWS" ) );
+    }
+    m_gridWeather->SetColLabelValue( 8, _( "Current" ) );
+    m_gridWeather->SetColLabelValue( 9, _( "C/Strength" ) );
+    m_gridWeather->SetColLabelValue( 10, _( "Wave" ) );
+    m_gridWeather->SetColLabelValue( 11, _( "Swell" ) );
+    m_gridWeather->SetColLabelValue( 12, _( "Weather" ) );
+    m_gridWeather->SetColLabelValue( 13, _( "Clouds" ) );
+    m_gridWeather->SetColLabelValue( 14, _( "Visibility" ) );
+    m_gridWeather->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
-void LogbookDialog::OnToggleButtonEngine2( wxCommandEvent& event )
-{
-    if(event.IsChecked())
-    {
-        SendPluginMessage(_T("LOGBOOK_ENGINEBUTTON2"), _T("ON"));
-        if(logbookPlugIn->opt->engineMessageSails && logbookPlugIn->opt->engineAllwaysSailsDown)
-            resetSails();
-        startEngine2(true, true, true);
-    }
-    else
-    {
-        SendPluginMessage(_T("LOGBOOK_ENGINEBUTTON2"), _T("OFF"));
-        stopEngine2(true, true, true);
-    }
-}
+    // Rows
+    m_gridWeather->EnableDragRowSize( true );
+    m_gridWeather->SetRowLabelSize( 30 );
+    m_gridWeather->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
-void LogbookDialog::OnToggleButtonGenerator( wxCommandEvent& event )
-{
-    if(event.IsChecked())
-    {
-        SendPluginMessage(_T("LOGBOOK_GENERATORBUTTON"), _T("ON"));
-        startGenerator(true, true, true);
-    }
-    else
-    {
-        SendPluginMessage(_T("LOGBOOK_GENERATORBUTTON"), _T("OFF"));
-        stopGenerator(true, true, true);
-    }
-}
+    // Label Appearance
 
-void LogbookDialog::setAbbreviations()
-{
-    m_gridMotorSails->SetLabelValue(wxHORIZONTAL,_T("#1 ")+logbookPlugIn->opt->rpm,LogbookHTML::RPM1);
-    m_gridMotorSails->SetLabelValue(wxHORIZONTAL,_T("#2 ")+logbookPlugIn->opt->rpm,LogbookHTML::RPM2);
-}
+    // Cell Defaults
+    m_gridWeather->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
+    bSizer11->Add( m_gridWeather, 1, wxEXPAND|wxALL, 5 );
 
-void LogbookDialog::OnButtonClickResetSails( wxCommandEvent& event )
-{
-    resetSails();
-}
+    m_panel7->SetSizer( bSizer11 );
+    m_panel7->Layout();
+    bSizer11->Fit( m_panel7 );
+    m_notebook8->AddPage( m_panel7, _( "Meteo" ), false );
+    m_panel71 = new wxPanel( m_notebook8, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer111;
+    bSizer111 = new wxBoxSizer( wxVERTICAL );
 
-void LogbookDialog::resetSails()
-{
-    for(int i = 0; i < 14; i++)
-    {
-        checkboxSails[i]->SetValue(false);
-        logbookPlugIn->opt->bSailIsChecked[i] = false;
-    }
+    m_gridMotorSails = new wxGrid( m_panel71, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
 
-    stateSails();
-    SailsTimer->Start(4000,true);
-}
+    // Grid
+    m_gridMotorSails->CreateGrid( 0, 24 );
+    m_gridMotorSails->EnableEditing( true );
+    m_gridMotorSails->EnableGridLines( true );
+    m_gridMotorSails->EnableDragGridSize( false );
+    m_gridMotorSails->SetMargins( 0, 0 );
 
-void LogbookDialog::OnButtomClickShowHideLayout(wxCommandEvent& event)
-{
-    if(!logbookPlugIn->opt->layoutShow)
-    {
-        m_panelLayout->Show();
-        m_panelEngine->Hide();
-        logbookPlugIn->opt->layoutShow = true;
-        m_bpButtonShowHideLayout->SetBitmapLabel(back_xpm);
-    }
-    else
+    // Columns
+    m_gridMotorSails->SetColSize( 0, 62 );
+    m_gridMotorSails->SetColSize( 1, 96 );
+    m_gridMotorSails->SetColSize( 2, 63 );
+    m_gridMotorSails->SetColSize( 3, 101 );
+    m_gridMotorSails->SetColSize( 4, 87 );
+    m_gridMotorSails->SetColSize( 5, 70 );
+    m_gridMotorSails->SetColSize( 6, 82 );
+    m_gridMotorSails->SetColSize( 7, 75 );
+    m_gridMotorSails->SetColSize( 8, 63 );
+    m_gridMotorSails->SetColSize( 9, 66 );
+    m_gridMotorSails->SetColSize( 10, 66 );
+    m_gridMotorSails->SetColSize( 11, 75 );
+    m_gridMotorSails->SetColSize( 12, 116 );
+    m_gridMotorSails->SetColSize( 13, 76 );
+    m_gridMotorSails->SetColSize( 14, 97 );
+    m_gridMotorSails->SetColSize( 15, 75 );
+    m_gridMotorSails->SetColSize( 16, 77 );
+    m_gridMotorSails->SetColSize( 17, 62 );
+    m_gridMotorSails->SetColSize( 18, 80 );
+    m_gridMotorSails->SetColSize( 19, 124 );
+    m_gridMotorSails->SetColSize( 20, 80 );
+    m_gridMotorSails->SetColSize( 21, 250 );
+    m_gridMotorSails->SetColSize( 22, 219 );
+    m_gridMotorSails->SetColSize( 23, 219 );
+    m_gridMotorSails->EnableDragColMove( false );
+    m_gridMotorSails->EnableDragColSize( true );
+    m_gridMotorSails->SetColLabelSize( 30 );
+    m_gridMotorSails->SetColLabelValue( 0, _( "Engine #1" ) );
+    m_gridMotorSails->SetColLabelValue( 1, _( "#1 Total" ) );
+    m_gridMotorSails->SetColLabelValue( 2, _T( "#1 " ) );
+    m_gridMotorSails->SetColLabelValue( 3, _( "Engine #2" ) );
+    m_gridMotorSails->SetColLabelValue( 4, _( "#2 Total" ) );
+    m_gridMotorSails->SetColLabelValue( 5, _T( "#2 " ) );
+    m_gridMotorSails->SetColLabelValue( 6, _( "Fuel" ) );
+    m_gridMotorSails->SetColLabelValue( 7, _( "FuelTotal" ) );
+    m_gridMotorSails->SetColLabelValue( 8, _( "Sails" ) );
+    m_gridMotorSails->SetColLabelValue( 9, _( "Reef" ) );
+    m_gridMotorSails->SetColLabelValue( 10, _( "Generator" ) );
+    m_gridMotorSails->SetColLabelValue( 11, _( "Gen. total" ) );
+    m_gridMotorSails->SetColLabelValue( 12, _( "Bank #1" ) );
+    m_gridMotorSails->SetColLabelValue( 13, _( "AH #1 Total" ) );
+    m_gridMotorSails->SetColLabelValue( 14, _( "Bank #2" ) );
+    m_gridMotorSails->SetColLabelValue( 15, _( "AH #2 Total" ) );
+    m_gridMotorSails->SetColLabelValue( 16, _( "Watermaker" ) );
+    m_gridMotorSails->SetColLabelValue( 17, _( "W-Total" ) );
+    m_gridMotorSails->SetColLabelValue( 18, _( "W-Output" ) );
+    m_gridMotorSails->SetColLabelValue( 19, _( "Water" ) );
+    m_gridMotorSails->SetColLabelValue( 20, _( "WaterTotal" ) );
+    m_gridMotorSails->SetColLabelValue( 21, _( "Remarks" ) );
+    m_gridMotorSails->SetColLabelValue( 22, _( "RouteID" ) );
+    m_gridMotorSails->SetColLabelValue( 23, _( "TrackID" ) );
+    m_gridMotorSails->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridMotorSails->EnableDragRowSize( true );
+    m_gridMotorSails->SetRowLabelSize( 30 );
+    m_gridMotorSails->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridMotorSails->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
+    bSizer111->Add( m_gridMotorSails, 1, wxEXPAND|wxALL, 5 );
+
+    m_panel71->SetSizer( bSizer111 );
+    m_panel71->Layout();
+    bSizer111->Fit( m_panel71 );
+    m_notebook8->AddPage( m_panel71, _( "Motor/Sails" ), false );
+
+    bSizer361->Add( m_notebook8, 1, wxALL|wxEXPAND, 0 );
+
+    if ( logbookPlugIn->opt->statusbar )
     {
-        m_panelEngine->Show();
-        m_panelLayout->Hide();
-        logbookPlugIn->opt->layoutShow = false;
-        m_bpButtonShowHideLayout->SetBitmapLabel(forward_xpm);
+        Statusbar->SetSizer( bSizer39 );
+        Statusbar->Layout();
+        bSizer39->Fit( Statusbar );
+        bSizer361->Add( Statusbar, 0, wxEXPAND, 5 );
     }
-    m_bpButtonShowHideLayout->SetToolTip(panelOnOff[!logbookPlugIn->opt->layoutShow]);
+
+    m_panel2->SetSizer( bSizer361 );
     m_panel2->Layout();
-    bSizer6->Layout();
-    m_panel2->Refresh();
-}
+    bSizer361->Fit( m_panel2 );
+    m_logbook->AddPage( m_panel2, _( "Logbook" ), true );
+    m_panel142 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer251;
+#ifdef __WXOSX__
+    fgSizer251 = new wxFlexGridSizer( 3, 1, 0, 0 );
+    fgSizer251->AddGrowableCol( 0 );
+    fgSizer251->AddGrowableRow( 2 );  // Übersicht???
+    fgSizer251->SetFlexibleDirection( wxBOTH );
+    fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+#else
+    fgSizer251 = new wxFlexGridSizer( 3, 1, 0, 0 );
+    fgSizer251->AddGrowableCol( 0 );
+    fgSizer251->AddGrowableRow( 2 );
+    fgSizer251->SetFlexibleDirection( wxBOTH );
+    fgSizer251->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+#endif
+    fgSizer251->SetMinSize( wxSize( -1,400 ) );
+    wxBoxSizer* bSizer51;
+    bSizer51 = new wxBoxSizer( wxVERTICAL );
 
-void LogbookDialog::OnButtomClickStatusbarGlobal( wxCommandEvent& event )
-{
-	if(logbookPlugIn->opt->statusbarGlobal == true)
-	{
-		Statusbar->Hide();
-		logbookPlugIn->opt->statusbarGlobal = false;
-		m_bpButtonShowHideStatusGlobal->SetBitmapLabel(down_xpm);
-	}
-	else
-	{
-		Statusbar->Show();
-		logbookPlugIn->opt->statusbarGlobal = true;
-		m_bpButtonShowHideStatusGlobal->SetBitmapLabel(up_xpm);
-	}
-	m_panel2->Layout();
-}
+    wxBoxSizer* bSizer61;
+    bSizer61 = new wxBoxSizer( wxHORIZONTAL );
 
-void LogbookDialog::OnClickButtonHelpGlobal( wxCommandEvent& event )
-{
-	startBrowser(help_locn+_T("Help.html"));
-}
+    logSaveOverview = new wxButton( m_panel142, wxID_ANY, _( "Export" ), wxDefaultPosition, wxDefaultSize, 0 );
+    logSaveOverview->SetToolTip( _( "export your Overview-data as HTML or ODT" ) );
+    bSizer61->Add( logSaveOverview, 0, wxALL, 5 );
 
-void LogbookDialog::OnChoiceGlobal( wxCommandEvent& event )
-{
-	if(m_radioBtnHTML->GetValue())
-		logbookPlugIn->opt->navGridLayoutChoice = event.GetSelection();
-	else
-		logbookPlugIn->opt->navGridLayoutChoiceODT = event.GetSelection();
-}
+    m_staticline81 = new wxStaticLine( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer61->Add( m_staticline81, 0, wxEXPAND | wxALL, 5 );
 
-void LogbookDialog::deselectAllLogbookGrids()
-{
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		logGrids[i]->ClearSelection();
-	}	
-}
+    m_staticText323 = new wxStaticText( m_panel142, wxID_ANY, _( "Select Layout: " ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText323->Wrap( -1 );
+    bSizer61->Add( m_staticText323, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::OnLeftUpDistance( wxMouseEvent& event )
-{
-	m_textCtrlStatusDistance->SetSelection(-1,-1);
-	event.Skip();
-}
+    wxArrayString overviewChoiceChoices;
+    overviewChoice = new wxChoice( m_panel142, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), overviewChoiceChoices, 0 );
+    overviewChoice->SetToolTip( _( "Select a layout which is displayed\nwith button \"View\"" ) );
+    overviewChoice->SetSelection( 0 );
 
-void LogbookDialog::OnLeftUpCourse( wxMouseEvent& event )
-{
-	m_textCtrlStatusCourseDeg->SetSelection(-1,-1);
-	event.Skip();
-}
+    bSizer61->Add( overviewChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::OnLeftUpCourseMin( wxMouseEvent& event )
-{
-	m_textCtrlStatusCourseMin->SetSelection(-1,-1);
-	event.Skip();
-}
+    m_buttonReloadLayoutOview = new wxButton( m_panel142, wxID_ANY, _( "R" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonReloadLayoutOview->SetToolTip( _( "Reload Layouts" ) );
 
-void LogbookDialog::OnNotebookPageChangedLoggrids( wxNotebookEvent& event )
-{
-	event.Skip();
+    bSizer61->Add( m_buttonReloadLayoutOview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	wxArrayInt ar;
-	for(int i = 0; i < LOGGRIDS; i++)
-		if(logGrids[i]->IsSelection())
-		{
-			ar = logGrids[i]->GetSelectedRows();
-			break;
-		}
-
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		for(unsigned int n = 0; n < ar.Count(); n++)
-			logGrids[i]->SelectRow(ar[n],true);
-	}
-}
+    m_buttonEditLayoutOview = new wxButton( m_panel142, wxID_ANY, _( "E" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonEditLayoutOview->SetToolTip( _( "Edit Layout" ) );
 
-void LogbookDialog::OnGridLabelLeftClickGlobal( wxGridEvent& event )
-{	
-	labelLeftClick(event,m_gridGlobal);
-}
+    bSizer61->Add( m_buttonEditLayoutOview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::OnGridLabelLeftClickWeather( wxGridEvent& event )
-{	
-	labelLeftClick(event,m_gridWeather);
-}
+    m_radioBtnHTMLOverview = new wxRadioButton( m_panel142, wxID_ANY, _T( "HTML" ), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnHTMLOverview->SetValue( true );
+    bSizer61->Add( m_radioBtnHTMLOverview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::OnGridLabelLeftClickMotorSails( wxGridEvent& event )
-{	
-	labelLeftClick(event,m_gridMotorSails);
-}
+    m_radioBtnODTOverview = new wxRadioButton( m_panel142, wxID_ANY, wxT( "ODT" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer61->Add( m_radioBtnODTOverview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::labelLeftClick(wxGridEvent& event, wxGrid* grid)
-{
-	if((!event.ShiftDown() && !event.ControlDown()) && event.GetRow() > 0)
-		grid->SetGridCursor(event.GetRow(),0);
+    logViewOverview = new wxButton( m_panel142, wxID_ANY, _( "View" ), wxDefaultPosition, wxDefaultSize, 0 );
+    logViewOverview->SetToolTip( _( "View data in browser (HTML) or Openoffice/LibreOffice (ODT)" ) );
 
-	grid->HideCellEditControl();
-	grid->SetFocus();
-	event.Skip();
-}
+    bSizer61->Add( logViewOverview, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::OnGridLabelRightClickGlobal( wxGridEvent& event )
-{
-	m_gridGlobal->HideCellEditControl();
-	m_gridGlobal->SetFocus();
-	m_menu10->Enable(MENUFLIP,true);
-	if(event.GetCol() == -1 && this->m_gridGlobal->IsSelection())
-		m_gridGlobal->PopupMenu(m_menu10,event.GetPosition());
-}
+    m_staticline71 = new wxStaticLine( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer61->Add( m_staticline71, 0, wxEXPAND | wxALL, 5 );
 
-void LogbookDialog::OnGridLabelRightClickWeather( wxGridEvent& event )
-{
-	m_menu10->Enable(MENUFLIP,false);
-	if(event.GetCol() == -1 && this->m_gridWeather->IsSelection())
-		m_gridWeather->PopupMenu(m_menu10,event.GetPosition());
-}
+    m_radioBtnActualLogbook = new wxRadioButton( m_panel142, wxID_ANY, _( "Actual Logbook" ), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnActualLogbook->SetValue( true );
+    bSizer61->Add( m_radioBtnActualLogbook, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::OnGridLabelRightClickMotorSails( wxGridEvent& event )
-{
-	m_menu10->Enable(MENUFLIP,false);
-	if(event.GetCol() == -1 && this->m_gridMotorSails->IsSelection())
-		m_gridMotorSails->PopupMenu(m_menu10,event.GetPosition());
-}
+    m_radioBtnAllLogbooks = new wxRadioButton( m_panel142, wxID_ANY, _( "All Logbooks" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer61->Add( m_radioBtnAllLogbooks, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void LogbookDialog::onMenuSelectionDeleteRows( wxCommandEvent& event )
-{
-	logbook->deleteRows();
-}
+    m_radioBtnSelectLogbook = new wxRadioButton( m_panel142, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer61->Add( m_radioBtnSelectLogbook, 0, wxALL|wxEXPAND, 5 );
 
-void LogbookDialog::OnMenuSelectionFlip( wxCommandEvent& event )
-{
-	wxArrayInt rows = m_gridGlobal->GetSelectedRows();
+    m_buttonSelectLogbook = new wxButton( m_panel142, wxID_ANY, _( "Select Logbook" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectLogbook->SetToolTip( _( "Select one of the old logbooks" ) );
+    bSizer61->Add( m_buttonSelectLogbook, 0, wxALL, 5 );
 
-	for(unsigned int i = 0; i < rows.Count(); i++)
-	{
-		wxDateTime dt;
-		myParseDate(m_gridGlobal->GetCellValue(rows[i],LogbookHTML::RDATE),dt);
-		int a = dt.GetDay()-1;
-		int b = dt.GetMonth()+1;
-		int c = dt.GetYear();
-
-		if(a > 11) 
-		{
-			wxMessageBox(_T("Cannot flip, month would be > 12"));
-			return;
-		}
-
-		dt.Set(b,(wxDateTime::Month) a,c);
-		m_gridGlobal->SetCellValue(rows[i],LogbookHTML::RDATE,dt.Format(logbookPlugIn->opt->sdateformat));
-		logbook->modified = true;
-	}
-}
+    bSizer51->Add( bSizer61, 1, wxEXPAND, 5 );
 
-void LogbookDialog::OnTextEnterStatusDistance( wxCommandEvent& event )
-{
-	wxString s = event.GetString();
-	s.Replace(_T(","),_T("."));
-	double i = wxAtof(s);
-	if(i < 0.01)
-		i = 0.01;
-
-	logbookPlugIn->opt->dEverySM = i;
-	wxString tmp = wxString::Format(_T("%0.2f"),i);
-	tmp.Replace(_T("."),decimalPoint);
-	logbookPlugIn->opt->everySMAmount = tmp;
-	m_textCtrlStatusDistance->SetValue(wxString::Format(_T("%0.2f %s"),i,logbookPlugIn->opt->distance.c_str()));
-}
+    fgSizer251->Add( bSizer51, 1, wxEXPAND, 5 );
+
+    m_staticline11 = new wxStaticLine( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer251->Add( m_staticline11, 0, wxEXPAND | wxALL, 5 );
+
+    m_gridOverview = new wxGrid( m_panel142, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridOverview->CreateGrid( 1, 33 );
+    m_gridOverview->EnableEditing( false );
+    m_gridOverview->EnableGridLines( true );
+    m_gridOverview->EnableDragGridSize( false );
+    m_gridOverview->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridOverview->SetColSize( 0, 153 );
+    m_gridOverview->SetColSize( 1, 144 );
+    m_gridOverview->SetColSize( 2, 60 );
+    m_gridOverview->SetColSize( 3, 60 );
+    m_gridOverview->SetColSize( 4, 100 );
+    m_gridOverview->SetColSize( 5, 73 );
+    m_gridOverview->SetColSize( 6, 93 );
+    m_gridOverview->SetColSize( 7, 96 );
+    m_gridOverview->SetColSize( 8, 70 );
+    m_gridOverview->SetColSize( 9, 80 );
+    m_gridOverview->SetColSize( 10, 80 );
+    m_gridOverview->SetColSize( 11, 80 );
+    m_gridOverview->SetColSize( 12, 80 );
+    m_gridOverview->SetColSize( 13, 114 );
+    m_gridOverview->SetColSize( 14, 108 );
+    m_gridOverview->SetColSize( 15, 93 );
+    m_gridOverview->SetColSize( 16, 129 );
+    m_gridOverview->SetColSize( 17, 80 );
+    m_gridOverview->SetColSize( 18, 80 );
+    m_gridOverview->SetColSize( 19, 100 );
+    m_gridOverview->SetColSize( 20, 80 );
+    m_gridOverview->SetColSize( 21, 80 );
+    m_gridOverview->SetColSize( 22, 80 );
+    m_gridOverview->SetColSize( 23, 80 );
+    m_gridOverview->SetColSize( 24, 123 );
+    m_gridOverview->SetColSize( 25, 80 );
+    m_gridOverview->SetColSize( 26, 80 );
+    m_gridOverview->SetColSize( 27, 80 );
+    m_gridOverview->SetColSize( 28, 80 );
+    m_gridOverview->SetColSize( 29, 80 );
+    m_gridOverview->SetColSize( 30, 80 );
+    m_gridOverview->SetColSize( 31, 110 );
+    m_gridOverview->SetColSize( 32, 80 );
+    m_gridOverview->EnableDragColMove( false );
+    m_gridOverview->EnableDragColSize( true );
+    m_gridOverview->SetColLabelSize( 30 );
+    m_gridOverview->SetColLabelValue( 0, _( "Logbook" ) );
+    m_gridOverview->SetColLabelValue( 1, _( "Route" ) );
+    m_gridOverview->SetColLabelValue( 2, _( "Start" ) );
+    m_gridOverview->SetColLabelValue( 3, _( "End" ) );
+    m_gridOverview->SetColLabelValue( 4, _( "Total Time" ) );
+    m_gridOverview->SetColLabelValue( 5, _( "Distance" ) );
+    m_gridOverview->SetColLabelValue( 6, _( "Distance p. Day" ) );
+    m_gridOverview->SetColLabelValue( 7, _( "Best Dist. p. Day" ) );
+    m_gridOverview->SetColLabelValue( 8, _( "Speed Avg." ) );
+    m_gridOverview->SetColLabelValue( 9, _( "Speed Max." ) );
+    m_gridOverview->SetColLabelValue( 10, _( "Engine #1" ) );
+    m_gridOverview->SetColLabelValue( 11, _( "Engine #2" ) );
+    m_gridOverview->SetColLabelValue( 12, _( "Fuel" ) );
+    m_gridOverview->SetColLabelValue( 13, _( "Generator" ) );
+    m_gridOverview->SetColLabelValue( 14, _( "Bank #1 gen." ) );
+    m_gridOverview->SetColLabelValue( 15, _( "Bank #1 used" ) );
+    m_gridOverview->SetColLabelValue( 16, _( "Bank #2 gen." ) );
+    m_gridOverview->SetColLabelValue( 17, _( "Bank #2 used" ) );
+    m_gridOverview->SetColLabelValue( 18, _( "Watermaker" ) );
+    m_gridOverview->SetColLabelValue( 19, _( "Waterm. Outp" ) );
+    m_gridOverview->SetColLabelValue( 20, _( "Water used" ) );
+    m_gridOverview->SetColLabelValue( 21, _( "TWA Avg." ) );
+    m_gridOverview->SetColLabelValue( 22, _( "TWS Avg." ) );
+    m_gridOverview->SetColLabelValue( 23, _( "TWS Max." ) );
+    m_gridOverview->SetColLabelValue( 24, _( "Currentdirection Avg." ) );
+    m_gridOverview->SetColLabelValue( 25, _( "Current Avg." ) );
+    m_gridOverview->SetColLabelValue( 26, _( "Current Max." ) );
+    m_gridOverview->SetColLabelValue( 27, _( "Wave Avg." ) );
+    m_gridOverview->SetColLabelValue( 28, _( "Wave Max." ) );
+    m_gridOverview->SetColLabelValue( 29, _( "Swell Avg." ) );
+    m_gridOverview->SetColLabelValue( 30, _( "Swell Max." ) );
+    m_gridOverview->SetColLabelValue( 31, _( "Sails used mostly" ) );
+    m_gridOverview->SetColLabelValue( 32, _( "Path" ) );
+    m_gridOverview->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridOverview->EnableDragRowSize( true );
+    m_gridOverview->SetRowLabelSize( 30 );
+    m_gridOverview->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridOverview->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
+    m_gridOverview->SetMinSize( wxSize( -1,400 ) );
+
+    m_menuOverView = new wxMenu();
+    wxMenuItem* m_menuItemOverviewRoute;
+    m_menuItemOverviewRoute = new wxMenuItem( m_menuOverView, wxID_ANY, wxString( _( "Goto Route" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuOverView->Append( m_menuItemOverviewRoute );
+
+    wxMenuItem* m_menuItem14;
+    m_menuItem14 = new wxMenuItem( m_menuOverView, wxID_ANY, wxString( _( "Show hidden columns" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuOverView->Append( m_menuItem14 );
+
+    wxMenuItem* m_menuItem16;
+    m_menuItem16 = new wxMenuItem( m_menuOverView, wxID_ANY, wxString( _( "Hide column" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuOverView->Append( m_menuItem16 );
+
+    fgSizer251->Add( m_gridOverview, 1, wxALL|wxEXPAND, 5 );
+
+    m_panel142->SetSizer( fgSizer251 );
+    m_panel142->Layout();
+    fgSizer251->Fit( m_panel142 );
+    m_logbook->AddPage( m_panel142, _( "Overview" ), true );
+    m_panel21 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer381;
+    bSizer381 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer38;
+    bSizer38 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer3;
+    bSizer3 = new wxBoxSizer( wxHORIZONTAL );
+
+    crewAdd = new wxButton( m_panel21, wxID_ANY, _( "Add Crew" ), wxDefaultPosition, wxDefaultSize, 0 );
+    crewAdd->SetToolTip( _( "Add a new Crewmember" ) );
+
+    bSizer3->Add( crewAdd, 0, wxALL, 5 );
+
+    crewSave = new wxButton( m_panel21, wxID_ANY, _( "Export" ), wxDefaultPosition, wxDefaultSize, 0 );
+    crewSave->SetToolTip( _( "export your crew-data as:\nHTML, ODT,  ODS, XML, CSV" ) );
+
+    bSizer3->Add( crewSave, 0, wxALL, 5 );
+
+    m_staticline5 = new wxStaticLine( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer3->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 );
+
+    m_staticText321 = new wxStaticText( m_panel21, wxID_ANY, _( "Select Layout: " ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText321->Wrap( -1 );
+    bSizer3->Add( m_staticText321, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString crewChoiceChoices;
+    crewChoice = new wxChoice( m_panel21, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), crewChoiceChoices, 0 );
+    crewChoice->SetSelection( 0 );
+    crewChoice->SetToolTip( _( "Select a layout which is displayed\nwith button \"View\"" ) );
+
+    bSizer3->Add( crewChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonReloadCrew = new wxButton( m_panel21, wxID_ANY, _( "R" ), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT );
+    m_buttonReloadCrew->SetToolTip( _( "Reload Layouts" ) );
+
+    bSizer3->Add( m_buttonReloadCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonEditLayoutCrew = new wxButton( m_panel21, wxID_ANY, _( "E" ), wxDefaultPosition, wxSize( -1,-1 ), wxBU_EXACTFIT );
+    m_buttonEditLayoutCrew->SetToolTip( _( "Edit Layout" ) );
+
+    bSizer3->Add( m_buttonEditLayoutCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnHTMLCrew = new wxRadioButton( m_panel21, wxID_ANY, _( "HTML" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnHTMLCrew->SetValue( true );
+    bSizer3->Add( m_radioBtnHTMLCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnODTCrew = new wxRadioButton( m_panel21, wxID_ANY, _( "ODT" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer3->Add( m_radioBtnODTCrew, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    crewView = new wxButton( m_panel21, wxID_ANY, _( "View" ), wxDefaultPosition, wxDefaultSize, 0 );
+    crewView->SetToolTip( _( "View data in browser (HTML) or Openoffice/LibreOffice (ODT)" ) );
+
+    bSizer3->Add( crewView, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline36 = new wxStaticLine( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer3->Add( m_staticline36, 0, wxEXPAND | wxALL, 5 );
+
+    m_staticText1171 = new wxStaticText( m_panel21, wxID_ANY, _( "Copy to watch" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1171->Wrap( -1 );
+    bSizer3->Add( m_staticText1171, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxString m_choiceCrewNamesChoices[] = { _( "Name in full" ), _( "Firstname only" ), _( "Lastname only" ) };
+    int m_choiceCrewNamesNChoices = sizeof( m_choiceCrewNamesChoices ) / sizeof( wxString );
+    m_choiceCrewNames = new wxChoice( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceCrewNamesNChoices, m_choiceCrewNamesChoices, 0 );
+    m_choiceCrewNames->SetSelection( 0 );
+    bSizer3->Add( m_choiceCrewNames, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer38->Add( bSizer3, 0, wxEXPAND, 5 );
+
+    m_staticline2 = new wxStaticLine( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer38->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
+
+    m_splitterWatch = new wxSplitterWindow( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+    m_splitterWatch->SetSashGravity( 1 );
+
+    m_panel211 = new wxPanel( m_splitterWatch, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer36;
+    bSizer36 = new wxBoxSizer( wxVERTICAL );
+
+    m_gridCrew = new wxGrid( m_panel211, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxALWAYS_SHOW_SB );
+
+    // Grid
+    m_gridCrew->CreateGrid( 0, 15 );
+    m_gridCrew->EnableEditing( true );
+    m_gridCrew->EnableGridLines( true );
+    m_gridCrew->EnableDragGridSize( false );
+    m_gridCrew->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridCrew->SetColSize( 0, 60 );
+    m_gridCrew->SetColSize( 1, 154 );
+    m_gridCrew->SetColSize( 2, 139 );
+    m_gridCrew->SetColSize( 3, 140 );
+    m_gridCrew->SetColSize( 4, 50 );
+    m_gridCrew->SetColSize( 5, 78 );
+    m_gridCrew->SetColSize( 6, 127 );
+    m_gridCrew->SetColSize( 7, 116 );
+    m_gridCrew->SetColSize( 8, 118 );
+    m_gridCrew->SetColSize( 9, 147 );
+    m_gridCrew->SetColSize( 10, 110 );
+    m_gridCrew->SetColSize( 11, 82 );
+    m_gridCrew->SetColSize( 12, 155 );
+    m_gridCrew->SetColSize( 13, 261 );
+    m_gridCrew->SetColSize( 14, 243 );
+    m_gridCrew->EnableDragColMove( false );
+    m_gridCrew->EnableDragColSize( true );
+    m_gridCrew->SetColLabelSize( 30 );
+    m_gridCrew->SetColLabelValue( 0, _( "Onboard" ) );
+    m_gridCrew->SetColLabelValue( 1, _( "Name" ) );
+    m_gridCrew->SetColLabelValue( 2, _( "Birthname" ) );
+    m_gridCrew->SetColLabelValue( 3, _( "Firstname" ) );
+    m_gridCrew->SetColLabelValue( 4, _( "Title" ) );
+    m_gridCrew->SetColLabelValue( 5, _( "Date of Birth" ) );
+    m_gridCrew->SetColLabelValue( 6, _( "Place of Birth" ) );
+    m_gridCrew->SetColLabelValue( 7, _( "Nationality" ) );
+    m_gridCrew->SetColLabelValue( 8, _( "Passport-Nr" ) );
+    m_gridCrew->SetColLabelValue( 9, _( "Issued in" ) );
+    m_gridCrew->SetColLabelValue( 10, _( "Date of Issue" ) );
+    m_gridCrew->SetColLabelValue( 11, _( "Zip" ) );
+    m_gridCrew->SetColLabelValue( 12, _( "Country" ) );
+    m_gridCrew->SetColLabelValue( 13, _( "Town" ) );
+    m_gridCrew->SetColLabelValue( 14, _( "Street" ) );
+    m_gridCrew->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridCrew->EnableDragRowSize( true );
+    m_gridCrew->SetRowLabelSize( 30 );
+    m_gridCrew->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridCrew->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    m_menu2 = new wxMenu();
+    wxMenuItem* m_menuItem2;
+    m_menuItem2 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu2->Append( m_menuItem2 );
+
+    wxMenuItem* m_menuItem22;
+    m_menuItem22 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _( "Show hidden columns" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu2->Append( m_menuItem22 );
+
+    m_menu2->AppendSeparator();
+
+    wxMenuItem* m_menuItem30;
+    m_menuItem30 = new wxMenuItem( m_menu2, MENUCREWONBOARD, wxString( _( "Show onboard only" ) ) , wxEmptyString, wxITEM_CHECK );
+    m_menu2->Append( m_menuItem30 );
+    m_menuItem30->Check( true );
+
+    wxMenuItem* m_menuItem31;
+    m_menuItem31 = new wxMenuItem( m_menu2, MENUCREWALL, wxString( _( "Show all entries" ) ) , wxEmptyString, wxITEM_CHECK );
+    m_menu2->Append( m_menuItem31 );
+
+    m_menu2->AppendSeparator();
+
+    wxMenuItem* m_menuItem32;
+    m_menuItem32 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _( "Sort ascending" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu2->Append( m_menuItem32 );
+
+    wxMenuItem* m_menuItem33;
+    m_menuItem33 = new wxMenuItem( m_menu2, wxID_ANY, wxString( _( "Sort descending" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu2->Append( m_menuItem33 );
+
+
+    bSizer36->Add( m_gridCrew, 1, wxALL|wxEXPAND, 5 );
+
+    m_panel211->SetSizer( bSizer36 );
+    m_panel211->Layout();
+    bSizer36->Fit( m_panel211 );
+    m_panel22 = new wxPanel( m_splitterWatch, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer37;
+    bSizer37 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer1;
+    sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( m_panel22, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    sbSizer61 = new wxStaticBoxSizer( new wxStaticBox( m_panel22, wxID_ANY, _( "Set Watchtimes" ) ), wxHORIZONTAL );
+
+    m_staticText1141 = new wxStaticText( m_panel22, wxID_ANY, _( "Start" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1141->Wrap( -1 );
+    sbSizer61->Add( m_staticText1141, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlWatchStartDate = new wxTextCtrl( m_panel22, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 95,-1 ), wxTE_CENTRE|wxTE_READONLY );
+    m_textCtrlWatchStartDate->SetToolTip( _( "Set the startdate of the sailing trip" ) );
+
+    sbSizer61->Add( m_textCtrlWatchStartDate, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlWatchStartTime = new wxTextCtrl( m_panel22, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 45,-1 ), wxTE_CENTRE|wxTE_PROCESS_ENTER );
+    m_textCtrlWatchStartTime->SetMaxLength( 5 );
+    m_textCtrlWatchStartTime->SetToolTip( _( "Set the starttime of your sailing trip" ) );
+
+    sbSizer61->Add( m_textCtrlWatchStartTime, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText1161 = new wxStaticText( m_panel22, wxID_ANY, _( "Days" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1161->Wrap( -1 );
+    sbSizer61->Add( m_staticText1161, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlWakeTrip = new wxTextCtrl( m_panel22, wxID_ANY, _T( "10" ), wxDefaultPosition, wxSize( 30,-1 ), 0 );
+    m_textCtrlWakeTrip->SetToolTip( _( "Length of your sailing trip" ) );
+
+    sbSizer61->Add( m_textCtrlWakeTrip, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonCalculate = new wxButton( m_panel22, wxID_ANY, _( "Calculate" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonCalculate->SetToolTip( _( "Calculate the watches with the members entered in the columns" ) );
+
+    sbSizer61->Add( m_buttonCalculate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonReset = new wxButton( m_panel22, wxID_ANY, _( "Reset" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonReset->Enable( false );
+    m_buttonReset->SetToolTip( _( "Reset data to edit-level" ) );
+
+    sbSizer61->Add( m_buttonReset, 0, wxALL, 5 );
+
+    m_buttonClear = new wxButton( m_panel22, wxID_ANY, _( "Clear" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonClear->SetToolTip( _( "Clear all data" ) );
+
+    sbSizer61->Add( m_buttonClear, 0, wxALL, 5 );
+
+    m_staticline35 = new wxStaticLine( m_panel22, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    sbSizer61->Add( m_staticline35, 0, wxEXPAND | wxALL, 5 );
+
+    m_buttonDayMinus = new wxButton( m_panel22, wxID_ANY, _T( "<" ), wxDefaultPosition, wxSize( 30,-1 ), 0 );
+    m_buttonDayMinus->Enable( false );
+    m_buttonDayMinus->SetToolTip( _( "Day backward" ) );
+
+    sbSizer61->Add( m_buttonDayMinus, 0, wxALL, 5 );
+
+    m_buttonNow = new wxButton( m_panel22, wxID_ANY, _( "Now" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonNow->Enable( false );
+    m_buttonNow->SetToolTip( _( "Go to date/time now" ) );
+
+    sbSizer61->Add( m_buttonNow, 0, wxALL, 5 );
+
+    m_buttonDayPlus = new wxButton( m_panel22, wxID_ANY, _T( ">" ), wxDefaultPosition, wxSize( 30,-1 ), 0 );
+    m_buttonDayPlus->Enable( false );
+    m_buttonDayPlus->SetToolTip( _( "Day forward" ) );
+
+    sbSizer61->Add( m_buttonDayPlus, 0, wxALL, 5 );
+
+    m_staticTextWakeDay = new wxStaticText( m_panel22, wxID_ANY, _( "Day:" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextWakeDay->Wrap( -1 );
+    sbSizer61->Add( m_staticTextWakeDay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlWakeDay = new wxTextCtrl( m_panel22, wxID_ANY, _T( "0" ), wxDefaultPosition, wxSize( 30,-1 ), wxTE_CENTRE|wxTE_PROCESS_ENTER );
+    m_textCtrlWakeDay->SetToolTip( _( "Shows/Sets the day\nDisplays the data in your ODT/Browser-program from this day to end" ) );
+
+    sbSizer61->Add( m_textCtrlWakeDay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText1181 = new wxStaticText( m_panel22, wxID_ANY, _( "Display" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1181->Wrap( -1 );
+    sbSizer61->Add( m_staticText1181, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxString m_choiceWakeDisplayChoices[] = { _( "all" ), _( "this day" ), _T( "+1" ), _T( "+2" ), _T( "+3" ), _T( "+4" ), _T( "+5" ), _T( "+6" ), _T( "+7" ), _T( "+8" ), _T( "+9" ), _T( "+10" ) };
+    int m_choiceWakeDisplayNChoices = sizeof( m_choiceWakeDisplayChoices ) / sizeof( wxString );
+    m_choiceWakeDisplay = new wxChoice( m_panel22, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceWakeDisplayNChoices, m_choiceWakeDisplayChoices, 0 );
+    m_choiceWakeDisplay->SetSelection( 0 );
+    m_choiceWakeDisplay->SetToolTip( _( "Used for ODT/Browser-program\nOne Row for the day + selected days = Days displayed" ) );
+
+    sbSizer61->Add( m_choiceWakeDisplay, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer1->Add( sbSizer61, 0, wxEXPAND, 5 );
+
+    bSizer37->Add( sbSizer1, 0, wxEXPAND, 5 );
+
+    m_gridCrewWake = new wxGrid( m_panel22, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridCrewWake->CreateGrid( 4, 1 );
+    m_gridCrewWake->EnableEditing( true );
+    m_gridCrewWake->EnableGridLines( true );
+    m_gridCrewWake->EnableDragGridSize( true );
+    m_gridCrewWake->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridCrewWake->SetColSize( 0, 160 );
+    m_gridCrewWake->AutoSizeColumns();
+    m_gridCrewWake->EnableDragColMove( false );
+    m_gridCrewWake->EnableDragColSize( true );
+    m_gridCrewWake->SetColLabelSize( 30 );
+    m_gridCrewWake->SetColLabelValue( 0, _( "1. Watch" ) );
+    m_gridCrewWake->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridCrewWake->SetRowSize( 0, 19 );
+    m_gridCrewWake->SetRowSize( 1, 19 );
+    m_gridCrewWake->SetRowSize( 2, 19 );
+    m_gridCrewWake->SetRowSize( 3, 19 );
+    m_gridCrewWake->AutoSizeRows();
+    m_gridCrewWake->EnableDragRowSize( true );
+    m_gridCrewWake->SetRowLabelSize( 80 );
+    m_gridCrewWake->SetRowLabelValue( 0, _( "Watchtime" ) );
+    m_gridCrewWake->SetRowLabelValue( 1, _( "Date" ) );
+    m_gridCrewWake->SetRowLabelValue( 2, _( "Time" ) );
+    m_gridCrewWake->SetRowLabelValue( 3, _( "Member" ) );
+    m_gridCrewWake->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridCrewWake->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP );
+
+    m_menu21 = new wxMenu();
+    wxMenuItem* m_menuItemNewWatch;
+    m_menuItemNewWatch = new wxMenuItem( m_menu21, wxID_ANY, wxString( _( "Set as Watchbase" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu21->Append( m_menuItemNewWatch );
+
+    wxMenuItem* m_menuItem19;
+    m_menuItem19 = new wxMenuItem( m_menu21, 514, wxString( _( "Split Watch" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu21->Append( m_menuItem19 );
+
+    wxMenuItem* m_menuItem23;
+    m_menuItem23 = new wxMenuItem( m_menu21, 515, wxString( _( "Merge Watches" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu21->Append( m_menuItem23 );
+
+    wxMenuItem* m_menuItem36;
+    m_menuItem36 = new wxMenuItem( m_menu21, 520, wxString( _( "Swap two Watches" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu21->Append( m_menuItem36 );
+
+    wxMenuItem* m_menuItem35;
+    m_menuItem35 = new wxMenuItem( m_menu21, 516, wxString( _( "Delete Crewmembers" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu21->Append( m_menuItem35 );
+
+    bSizer37->Add( m_gridCrewWake, 1, wxALL|wxEXPAND, 5 );
+
+    m_panel22->SetSizer( bSizer37 );
+    m_panel22->Layout();
+    bSizer37->Fit( m_panel22 );
+    m_splitterWatch->SplitHorizontally( m_panel211, m_panel22, -1 );
+    bSizer38->Add( m_splitterWatch, 1, wxEXPAND, 5 );
+
+    m_panel24 = new wxPanel( m_panel21, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel24->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer371;
+    bSizer371 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextStatusWatch = new wxStaticText( m_panel24, wxID_ANY, _T( "" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusWatch->Wrap( -1 );
+    bSizer371->Add( m_staticTextStatusWatch, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel24->SetSizer( bSizer371 );
+    m_panel24->Layout();
+    bSizer371->Fit( m_panel24 );
+    bSizer38->Add( m_panel24, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    bSizer381->Add( bSizer38, 1, wxEXPAND, 5 );
+
+    m_panel21->SetSizer( bSizer381 );
+    m_panel21->Layout();
+    bSizer381->Fit( m_panel21 );
+    m_logbook->AddPage( m_panel21, _( "Crewlist" ), true );
+
+    m_panel3 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer1;
+
+    fgSizer1 = new wxFlexGridSizer( 2, 1, 0, 0 );
+    fgSizer1->AddGrowableCol( 0 );
+    fgSizer1->AddGrowableRow( 1 );   // Wachen ???
+
+    fgSizer1->SetFlexibleDirection( wxBOTH );
+    fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxBoxSizer* bSizer9;
+    bSizer9 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer10;
+    bSizer10 = new wxBoxSizer( wxHORIZONTAL );
+
+    addEquipmentButton = new wxButton( m_panel3, wxID_ANY, _( "Add Equipment" ), wxDefaultPosition, wxDefaultSize, 0 );
+    addEquipmentButton->SetToolTip( _( "add the equipment of your boat" ) );
+    bSizer10->Add( addEquipmentButton, 0, wxALL, 5 );
+
+    m_toggleBtnShowEquipment = new wxToggleButton( m_panel3, wxID_ANY, _( "Show Equipment" ), wxDefaultPosition, wxSize( 120,-1 ), 0 );
+    m_toggleBtnShowEquipment->SetToolTip( _( "Show/Hide Equipmentgrid" ) );
+    bSizer10->Add( m_toggleBtnShowEquipment, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline27 = new wxStaticLine( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer10->Add( m_staticline27, 0, wxEXPAND | wxALL, 5 );
+
+    boatSave = new wxButton( m_panel3, wxID_ANY, _( "Export" ), wxDefaultPosition, wxDefaultSize, 0 );
+    boatSave->SetToolTip( _( "export your boat/equipment-data as:\n      HTML, ODT,  ODS, XML, CSV" ) );
+
+    bSizer10->Add( boatSave, 0, wxALL, 5 );
+
+    m_staticline4 = new wxStaticLine( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer10->Add( m_staticline4, 0, wxEXPAND | wxALL, 5 );
+
+    m_staticText322 = new wxStaticText( m_panel3, wxID_ANY, _( "Select Layout: " ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText322->Wrap( -1 );
+    bSizer10->Add( m_staticText322, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString boatChoiceChoices;
+    boatChoice = new wxChoice( m_panel3, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), boatChoiceChoices, 0 );
+    boatChoice->SetToolTip( _( "Select a layout which is displayed\nwith button \"View\"" ) );
+    boatChoice->SetSelection( 0 );
+    bSizer10->Add( boatChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonReloadLayoutsBoat = new wxButton( m_panel3, wxID_ANY, _( "R" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonReloadLayoutsBoat->SetToolTip( _( "Reload Layouts" ) );
+
+    bSizer10->Add( m_buttonReloadLayoutsBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonEditLayoutBoat = new wxButton( m_panel3, wxID_ANY, _( "E" ), wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT );
+    m_buttonEditLayoutBoat->SetToolTip( _( "Edit Layouts" ) );
+
+    bSizer10->Add( m_buttonEditLayoutBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnHTMLBoat = new wxRadioButton( m_panel3, wxID_ANY, wxT( "HTML" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnHTMLBoat->SetValue( true );
+    bSizer10->Add( m_radioBtnHTMLBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnODTBoat = new wxRadioButton( m_panel3, wxID_ANY, wxT( "ODT" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer10->Add( m_radioBtnODTBoat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    boatView = new wxButton( m_panel3, wxID_ANY, _( "View" ), wxDefaultPosition, wxDefaultSize, 0 );
+    boatView->SetToolTip( _( "View data in browser (HTML) or Openoffice/LibreOffice (ODT)" ) );
+
+    bSizer10->Add( boatView, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer9->Add( bSizer10, 1, wxEXPAND, 5 );
+
+    m_staticline3 = new wxStaticLine( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer9->Add( m_staticline3, 0, wxEXPAND | wxALL, 5 );
+
+    fgSizer1->Add( bSizer9, 1, wxEXPAND, 5 );
+
+    m_splitter1 = new wxSplitterWindow( m_panel3, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+    m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::m_splitter1OnIdle ), NULL, this );
+    m_splitter1->SetMinimumPaneSize( 15 );
+
+    m_panel72 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer34;
+    fgSizer34 = new wxFlexGridSizer( 3, 1, 0, 0 );
+    fgSizer34->SetFlexibleDirection( wxBOTH );
+    fgSizer34->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxStaticBoxSizer* sbSizer11;
+    sbSizer11 = new wxStaticBoxSizer( new wxStaticBox( m_panel72, wxID_ANY, _( "Boat" ) ), wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer38;
+
+    fgSizer38 = new wxFlexGridSizer( 2, 12, 0, 0 );
+    fgSizer38->SetFlexibleDirection( wxBOTH );
+    fgSizer38->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    bname = new wxStaticText( m_panel72, wxID_ANY, _( "Name" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bname->Wrap( -1 );
+    fgSizer38->Add( bname, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    boatName = new wxTextCtrl( m_panel72, 1, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
+    fgSizer38->Add( boatName, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText114 = new wxStaticText( m_panel72, wxID_ANY, _( "Homeport" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText114->Wrap( -1 );
+    fgSizer38->Add( m_staticText114, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    homeport = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer38->Add( homeport, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText115 = new wxStaticText( m_panel72, wxID_ANY, _( "Callsign" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText115->Wrap( -1 );
+    fgSizer38->Add( m_staticText115, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    callsign = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer38->Add( callsign, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText116 = new wxStaticText( m_panel72, wxID_ANY, _( "HIN-Nr." ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText116->Wrap( -1 );
+    fgSizer38->Add( m_staticText116, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    hin = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    hin->SetToolTip( _( "Hull Identification No." ) );
+    fgSizer38->Add( hin, 0, wxALL, 5 );
+
+    m_staticText117 = new wxStaticText( m_panel72, wxID_ANY, _( "Sail-Nr." ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText117->Wrap( -1 );
+    fgSizer38->Add( m_staticText117, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sailno = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer38->Add( sailno, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    fgSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer38->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText119 = new wxStaticText( m_panel72, wxID_ANY, _( "Insurance" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText119->Wrap( -1 );
+    fgSizer38->Add( m_staticText119, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    insurance = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
+    fgSizer38->Add( insurance, 0, wxALL, 5 );
+
+    m_staticText118 = new wxStaticText( m_panel72, wxID_ANY, _( "Registration" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText118->Wrap( -1 );
+    fgSizer38->Add( m_staticText118, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    registration = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer38->Add( registration, 0, wxALL, 5 );
+
+    m_staticText120 = new wxStaticText( m_panel72, wxID_ANY, _( "Policy" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText120->Wrap( -1 );
+    fgSizer38->Add( m_staticText120, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    policy = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer38->Add( policy, 0, wxALL, 5 );
+
+    m_staticText53 = new wxStaticText( m_panel72, wxID_ANY, _( "MMSI" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText53->Wrap( -1 );
+    fgSizer38->Add( m_staticText53, 0, wxALL, 5 );
+
+    mmsi = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer38->Add( mmsi, 0, wxALL, 5 );
+
+    sbSizer11->Add( fgSizer38, 1, wxEXPAND, 5 );
+
+    fgSizer34->Add( sbSizer11, 1, wxEXPAND, 5 );
+
+    sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( m_panel72, wxID_ANY, _( "Owner" ) ), wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer39;
+    fgSizer39 = new wxFlexGridSizer( 2, 10, 0, 0 );
+    fgSizer39->SetFlexibleDirection( wxBOTH );
+    fgSizer39->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText90 = new wxStaticText( m_panel72, wxID_ANY, _( "Name      " ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText90->Wrap( -1 );
+    fgSizer39->Add( m_staticText90, 0, wxALL, 5 );
+
+    ownerName = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
+    fgSizer39->Add( ownerName, 0, wxALL, 5 );
+
+    m_staticText91 = new wxStaticText( m_panel72, wxID_ANY, _( "Firstname" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText91->Wrap( -1 );
+    fgSizer39->Add( m_staticText91, 0, wxALL, 5 );
+
+    ownerFirstname = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer39->Add( ownerFirstname, 0, wxALL, 5 );
+
+    m_staticText95 = new wxStaticText( m_panel72, wxID_ANY, _( "Telephone" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText95->Wrap( -1 );
+    fgSizer39->Add( m_staticText95, 0, wxALL, 5 );
+
+    ownerPhone = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
+    fgSizer39->Add( ownerPhone, 0, wxALL, 5 );
+
+
+    fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer39->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText92 = new wxStaticText( m_panel72, wxID_ANY, _( "Street" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText92->Wrap( -1 );
+    fgSizer39->Add( m_staticText92, 0, wxALL, 5 );
+
+    ownerStreet = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
+    fgSizer39->Add( ownerStreet, 0, wxALL, 5 );
+
+    m_staticText93 = new wxStaticText( m_panel72, wxID_ANY, _( "Zip" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText93->Wrap( -1 );
+    fgSizer39->Add( m_staticText93, 0, wxALL, 5 );
+
+    owenerZip = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer39->Add( owenerZip, 0, wxALL, 5 );
+
+    m_staticText94 = new wxStaticText( m_panel72, wxID_ANY, _( "Town" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText94->Wrap( -1 );
+    fgSizer39->Add( m_staticText94, 0, wxALL, 5 );
+
+    ownerTown = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 );
+    fgSizer39->Add( ownerTown, 0, wxALL, 5 );
+
+    sbSizer6->Add( fgSizer39, 1, wxEXPAND, 5 );
+
+    fgSizer34->Add( sbSizer6, 1, wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer8;
+    sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_panel72, wxID_ANY, _( "Details" ) ), wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer33;
+
+    fgSizer33 = new wxFlexGridSizer( 4, 10, 0, 0 );
+    fgSizer33->SetFlexibleDirection( wxBOTH );
+    fgSizer33->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText128 = new wxStaticText( m_panel72, wxID_ANY, _( "Type" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText128->Wrap( -1 );
+    fgSizer33->Add( m_staticText128, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    boatType = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer33->Add( boatType, 0, wxALL, 5 );
+
+    m_staticText125 = new wxStaticText( m_panel72, wxID_ANY, _( "Builder" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText125->Wrap( -1 );
+    fgSizer33->Add( m_staticText125, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    builder = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer33->Add( builder, 0, wxALL, 5 );
+
+    m_staticText124 = new wxStaticText( m_panel72, wxID_ANY, _( "Hull" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText124->Wrap( -1 );
+    fgSizer33->Add( m_staticText124, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    hull = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer33->Add( hull, 0, wxALL, 5 );
+
+    m_staticText126 = new wxStaticText( m_panel72, wxID_ANY, _( "Date Launched" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText126->Wrap( -1 );
+    fgSizer33->Add( m_staticText126, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    dateLaunched = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer33->Add( dateLaunched, 0, wxALL, 5 );
+
+    m_staticText127 = new wxStaticText( m_panel72, wxID_ANY, _( "Yard-Nr." ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText127->Wrap( -1 );
+    fgSizer33->Add( m_staticText127, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    yardNr = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer33->Add( yardNr, 0, wxALL, 5 );
+
+    m_staticText123 = new wxStaticText( m_panel72, wxID_ANY, _( "Designer" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText123->Wrap( -1 );
+    fgSizer33->Add( m_staticText123, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    designer = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer33->Add( designer, 0, wxALL, 5 );
+
+    m_staticText129 = new wxStaticText( m_panel72, wxID_ANY, _( "Construction" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText129->Wrap( -1 );
+    fgSizer33->Add( m_staticText129, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    construction = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 150,-1 ), 0 );
+    fgSizer33->Add( construction, 0, wxALL, 5 );
+
+
+    fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer33->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText106 = new wxStaticText( m_panel72, wxID_ANY, _( "LOA" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText106->Wrap( -1 );
+    fgSizer33->Add( m_staticText106, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    LOA = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    LOA->SetToolTip( _( "Length over all" ) );
+
+    fgSizer33->Add( LOA, 0, wxALL, 5 );
+
+    m_staticText107 = new wxStaticText( m_panel72, wxID_ANY, _( "LOD" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText107->Wrap( -1 );
+    fgSizer33->Add( m_staticText107, 0, wxALL, 5 );
+
+    LOD = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    LOD->SetToolTip( _( "Length over Deck" ) );
+
+    fgSizer33->Add( LOD, 0, wxALL, 5 );
+
+    m_staticText108 = new wxStaticText( m_panel72, wxID_ANY, _( "LWL" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText108->Wrap( -1 );
+    fgSizer33->Add( m_staticText108, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    LWL = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    LWL->SetToolTip( _( "Length in Waterline" ) );
+
+    fgSizer33->Add( LWL, 0, wxALL, 5 );
+
+    m_staticText109 = new wxStaticText( m_panel72, wxID_ANY, _( "Beam" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText109->Wrap( -1 );
+    fgSizer33->Add( m_staticText109, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    beam = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    beam->SetToolTip( _( "Greatest Width of Hull" ) );
+
+    fgSizer33->Add( beam, 0, wxALL, 5 );
+
+    m_staticText110 = new wxStaticText( m_panel72, wxID_ANY, _( "Draft" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText110->Wrap( -1 );
+    fgSizer33->Add( m_staticText110, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    draft = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    fgSizer33->Add( draft, 0, wxALL, 5 );
+
+    UserLabel1 = new wxTextCtrl( m_panel72, wxID_ANY, _( "UserLabel" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    UserLabel1->SetToolTip( _( "write your own label" ) );
+
+    fgSizer33->Add( UserLabel1, 0, wxALL, 5 );
+
+    Userfield1 = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer33->Add( Userfield1, 0, wxALL, 5 );
+
+    UserLabel2 = new wxTextCtrl( m_panel72, wxID_ANY, _( "UserLabel" ), wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    UserLabel2->SetToolTip( _( "write your own label" ) );
+
+    fgSizer33->Add( UserLabel2, 0, wxALL, 5 );
+
+    Userfield2 = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer33->Add( Userfield2, 0, wxALL, 5 );
+
+    UserLabel3 = new wxTextCtrl( m_panel72, wxID_ANY, _( "UserLabel" ), wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    UserLabel3->SetToolTip( _( "write your own label" ) );
+    UserLabel3->SetMaxSize( wxSize( 30,-1 ) );
+
+    fgSizer33->Add( UserLabel3, 0, wxALL, 5 );
+
+    Userfield3 = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    fgSizer33->Add( Userfield3, 0, wxALL, 5 );
+
+    m_staticText122 = new wxStaticText( m_panel72, wxID_ANY, _( "Displacement" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText122->Wrap( -1 );
+    fgSizer33->Add( m_staticText122, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    displacement = new wxTextCtrl( m_panel72, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    fgSizer33->Add( displacement, 0, wxALL, 5 );
+
+    sbSizer8->Add( fgSizer33, 1, wxEXPAND, 5 );
+
+    fgSizer34->Add( sbSizer8, 1, wxEXPAND, 5 );
+
+    m_panel72->SetSizer( fgSizer34 );
+    m_panel72->Layout();
+    fgSizer34->Fit( m_panel72 );
+    m_panel8 = new wxPanel( m_splitter1, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxTAB_TRAVERSAL );
+
+    sbSizer12 = new wxStaticBoxSizer( new wxStaticBox( m_panel8, wxID_ANY, _( "Equipment" ) ), wxVERTICAL );
+
+    sbSizer12->SetMinSize( wxSize( -1,-1 ) );
+
+    m_gridEquipment = new wxGrid( m_panel8, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridEquipment->CreateGrid( 0, 4 );
+    m_gridEquipment->EnableEditing( true );
+    m_gridEquipment->EnableGridLines( true );
+    m_gridEquipment->EnableDragGridSize( false );
+    m_gridEquipment->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridEquipment->SetColSize( 0, 120 );
+    m_gridEquipment->SetColSize( 1, 296 );
+    m_gridEquipment->SetColSize( 2, 151 );
+    m_gridEquipment->SetColSize( 3, 297 );
+    m_gridEquipment->EnableDragColMove( false );
+    m_gridEquipment->EnableDragColSize( true );
+    m_gridEquipment->SetColLabelSize( 30 );
+    m_gridEquipment->SetColLabelValue( 0, _( "Type" ) );
+    m_gridEquipment->SetColLabelValue( 1, _( "Description" ) );
+    m_gridEquipment->SetColLabelValue( 2, _( "Serial-Nr." ) );
+    m_gridEquipment->SetColLabelValue( 3, _( "Remarks" ) );
+    m_gridEquipment->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridEquipment->EnableDragRowSize( true );
+    m_gridEquipment->SetRowLabelSize( 30 );
+    m_gridEquipment->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridEquipment->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    m_menu3 = new wxMenu();
+    wxMenuItem* m_menuItem3;
+    m_menuItem3 = new wxMenuItem( m_menu3, wxID_ANY, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu3->Append( m_menuItem3 );
+
+
+    sbSizer12->Add( m_gridEquipment, 1, wxALL|wxEXPAND, 5 );
+
+    m_panel8->SetSizer( sbSizer12 );
+    m_panel8->Layout();
+    sbSizer12->Fit( m_panel8 );
+
+    m_splitter1->SplitHorizontally( m_panel72, m_panel8, 315 );
+
+    fgSizer1->Add( m_splitter1, 1, wxEXPAND, 5 );
+
+    m_panel3->SetSizer( fgSizer1 );
+    m_panel3->Layout();
+    fgSizer1->Fit( m_panel3 );
+    m_logbook->AddPage( m_panel3, _( "Boat" ), false );
+    m_panel13 = new wxPanel( m_logbook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer13;
+    bSizer13 = new wxBoxSizer( wxVERTICAL );
+// -------------------------------------------Maintenance-------------------------------------
+    m_notebook6 = new wxNotebook( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panel14 = new wxPanel( m_notebook6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer151;
+    fgSizer151 = new wxFlexGridSizer( 4, 1, 0, 0 );
+    fgSizer151->AddGrowableCol( 0 );
+
+    fgSizer151->AddGrowableRow( 3 );
+    fgSizer151->SetFlexibleDirection( wxBOTH );
+    fgSizer151->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxBoxSizer* bSizer1011;
+    bSizer1011 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonAddLineService = new wxButton( m_panel14, wxID_ANY, _( "Add Line" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonAddLineService->SetToolTip( _( "Add a new line" ) );
+    bSizer1011->Add( m_buttonAddLineService, 0, wxALL, 5 );
+
+    m_buttonSaveService = new wxButton( m_panel14, wxID_ANY, _( "Export" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSaveService->SetToolTip( _( "export your Service-data as HTML or ODT" ) );
+    bSizer1011->Add( m_buttonSaveService, 0, wxALL, 5 );
+
+    m_staticline151 = new wxStaticLine( m_panel14, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer1011->Add( m_staticline151, 0, wxEXPAND | wxALL, 5 );
+
+    m_staticText621 = new wxStaticText( m_panel14, wxID_ANY, _( "Select Layout:" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText621->Wrap( -1 );
+    bSizer1011->Add( m_staticText621, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString m_choiceSelectLayoutServiceChoices;
+    m_choiceSelectLayoutService = new wxChoice( m_panel14, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_choiceSelectLayoutServiceChoices, 0 );
+    m_choiceSelectLayoutService->SetToolTip( _( "Select a layout which is displayed\nwith button \"View\"" ) );
+    m_choiceSelectLayoutService->SetSelection( 0 );
+    bSizer1011->Add( m_choiceSelectLayoutService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonReloadLayoutsServiceHTML = new wxButton( m_panel14, wxID_ANY, _( "R" ),wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonReloadLayoutsServiceHTML->SetToolTip( _( "Reload Layouts" ) );
+
+    bSizer1011->Add( m_buttonReloadLayoutsServiceHTML, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonEditLayoutODTService = new wxButton( m_panel14, wxID_ANY, _( "E" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonEditLayoutODTService->SetToolTip( _( "Edit Layout" ) );
+
+    bSizer1011->Add( m_buttonEditLayoutODTService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnHTMLService = new wxRadioButton( m_panel14, wxID_ANY, wxT( "HTML" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnHTMLService->SetValue( true );
+    bSizer1011->Add( m_radioBtnHTMLService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnODTService = new wxRadioButton( m_panel14, wxID_ANY, wxT( "ODT" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer1011->Add( m_radioBtnODTService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonViewService = new wxButton( m_panel14, wxID_ANY, _( "View" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonViewService->SetToolTip( _( "View data in browser (HTML) or Openoffice/LibreOffice (ODT)" ) );
+    bSizer1011->Add( m_buttonViewService, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1011->Add( 300, 0, 1, wxEXPAND, 5 );
+
+    fgSizer151->Add( bSizer1011, 1, wxEXPAND, 5 );
+
+    m_staticline141 = new wxStaticLine( m_panel14, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer151->Add( m_staticline141, 0, wxEXPAND | wxALL, 5 );
+
+    wxBoxSizer* bSizer12;
+    bSizer12 = new wxBoxSizer( wxVERTICAL );
+
+    bSizer12->SetMinSize( wxSize( -1,400 ) );
+    m_gridMaintanence = new wxGrid( m_panel14, wxID_ANY, wxDefaultPosition, wxSize( 1000,400 ), 0 );
+
+    // Grid
+    m_gridMaintanence->CreateGrid( 0, 7 );
+    m_gridMaintanence->EnableEditing( true );
+    m_gridMaintanence->EnableGridLines( true );
+    m_gridMaintanence->EnableDragGridSize( false );
+    m_gridMaintanence->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridMaintanence->SetColSize( 0, 50 );
+    m_gridMaintanence->SetColSize( 1, 400 );
+    m_gridMaintanence->SetColSize( 2, 100 );
+    m_gridMaintanence->SetColSize( 3, 100 );
+    m_gridMaintanence->SetColSize( 4, 80 );
+    m_gridMaintanence->SetColSize( 5, 80 );
+    m_gridMaintanence->EnableDragColMove( false );
+    m_gridMaintanence->EnableDragColSize( true );
+    m_gridMaintanence->SetColLabelSize( 30 );
+    m_gridMaintanence->SetColLabelValue( 0, _( "Priority" ) );
+    m_gridMaintanence->SetColLabelValue( 1, _( "Service TODO" ) );
+    m_gridMaintanence->SetColLabelValue( 2, _( "If" ) );
+    m_gridMaintanence->SetColLabelValue( 3, _( "Warnvalue" ) );
+    m_gridMaintanence->SetColLabelValue( 4, _( "Urgentvalue" ) );
+    m_gridMaintanence->SetColLabelValue( 5, _( "Startvalue" ) );
+    m_gridMaintanence->SetColLabelValue( 6, _( "Active" ) );
+    m_gridMaintanence->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridMaintanence->AutoSizeRows();
+    m_gridMaintanence->EnableDragRowSize( true );
+    m_gridMaintanence->SetRowLabelSize( 30 );
+    m_gridMaintanence->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+    m_gridMaintanence->SetLabelTextColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
+
+    // Cell Defaults
+    m_gridMaintanence->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
+    m_menu7 = new wxMenu();
+    wxMenuItem* m_menuItem9;
+    m_menuItem9 = new wxMenuItem( m_menu7, wxID_ANY, wxString( _( "Service done" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu7->Append( m_menuItem9 );
+
+    wxMenuItem* m_menuItem92;
+    m_menuItem92 = new wxMenuItem( m_menu7, wxID_ANY, wxString( _( "Buy parts for this service" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu7->Append( m_menuItem92 );
+
+    wxMenuItem* m_menuItem13;
+    m_menuItem13 = new wxMenuItem( m_menu7, wxID_ANY, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu7->Append( m_menuItem13 );
+
+
+    bSizer12->Add( m_gridMaintanence, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    fgSizer151->Add( bSizer12, 1, wxEXPAND, 5 );
+
+    m_panel14->SetSizer( fgSizer151 );
+    m_panel14->Layout();
+    fgSizer151->Fit( m_panel14 );
+    m_notebook6->AddPage( m_panel14, _( "Service" ), true );
+    m_panel141 = new wxPanel( m_notebook6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer1513;
+    fgSizer1513 = new wxFlexGridSizer( 3, 1, 0, 0 );
+    fgSizer1513->AddGrowableCol( 0 );
+    fgSizer1513->AddGrowableRow( 2 );  // Reparaturen???
+    fgSizer1513->SetFlexibleDirection( wxBOTH );
+    fgSizer1513->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxBoxSizer* bSizer10113;
+    bSizer10113 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonAddLineRepairs = new wxButton( m_panel141, wxID_ANY, _( "Add Line" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonAddLineRepairs->SetToolTip( _( "Add a new line" ) );
+    bSizer10113->Add( m_buttonAddLineRepairs, 0, wxALL, 5 );
+
+    m_buttonSaveRepairs = new wxButton( m_panel141, wxID_ANY, _( "Export" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSaveRepairs->SetToolTip( _( "export your Repairs-data as HTML or ODT" ) );
+    bSizer10113->Add( m_buttonSaveRepairs, 0, wxALL, 5 );
+
+    m_staticline1513 = new wxStaticLine( m_panel141, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer10113->Add( m_staticline1513, 0, wxEXPAND | wxALL, 5 );
+
+    m_staticText6213 = new wxStaticText( m_panel141, wxID_ANY, _( "Select Layout:" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText6213->Wrap( -1 );
+    bSizer10113->Add( m_staticText6213, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString m_choiceSelectLayoutRepairsChoices;
+    m_choiceSelectLayoutRepairs = new wxChoice( m_panel141, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_choiceSelectLayoutRepairsChoices, 0 );
+    m_choiceSelectLayoutRepairs->SetToolTip( _( "Select a layout which is displayed\nwith button \"View\"" ) );
+    m_choiceSelectLayoutRepairs->SetSelection( 0 );
+    bSizer10113->Add( m_choiceSelectLayoutRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonReloadLayoutsRepairsHTML = new wxButton( m_panel141, wxID_ANY, _( "R" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonReloadLayoutsRepairsHTML->SetToolTip( _( "Reload Layouts" ) );
+
+    bSizer10113->Add( m_buttonReloadLayoutsRepairsHTML, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonEditLayoutODTRepairs = new wxButton( m_panel141, wxID_ANY, _( "E" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonEditLayoutODTRepairs->SetToolTip( _( "Edit Layout" ) );
+
+    bSizer10113->Add( m_buttonEditLayoutODTRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnHTMLRepairs = new wxRadioButton( m_panel141, wxID_ANY, wxT( "HTML" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnHTMLRepairs->SetValue( true );
+    bSizer10113->Add( m_radioBtnHTMLRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnODTRepairs = new wxRadioButton( m_panel141, wxID_ANY, wxT( "ODT" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer10113->Add( m_radioBtnODTRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonViewRepairs = new wxButton( m_panel141, wxID_ANY, _( "View" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonViewRepairs->SetToolTip( _( "View data in browser (HTML) or Openoffice/LibreOffice (ODT)" ) );
+    bSizer10113->Add( m_buttonViewRepairs, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer10113->Add( 300, 0, 1, wxEXPAND, 5 );
+
+    fgSizer1513->Add( bSizer10113, 1, wxEXPAND, 5 );
+
+    m_staticline1413 = new wxStaticLine( m_panel141, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer1513->Add( m_staticline1413, 0, wxEXPAND | wxALL, 5 );
+
+    wxBoxSizer* bSizer122;
+    bSizer122 = new wxBoxSizer( wxVERTICAL );
+
+    bSizer122->SetMinSize( wxSize( -1,400 ) );
+    m_gridMaintanenceRepairs = new wxGrid( m_panel141, wxID_ANY, wxDefaultPosition, wxSize( 1000,400 ), 0 );
+
+    // Grid
+    m_gridMaintanenceRepairs->CreateGrid( 0, 2 );
+    m_gridMaintanenceRepairs->EnableEditing( true );
+    m_gridMaintanenceRepairs->EnableGridLines( true );
+    m_gridMaintanenceRepairs->EnableDragGridSize( false );
+    m_gridMaintanenceRepairs->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridMaintanenceRepairs->SetColSize( 0, 50 );
+    m_gridMaintanenceRepairs->SetColSize( 1, 400 );
+    m_gridMaintanenceRepairs->EnableDragColMove( false );
+    m_gridMaintanenceRepairs->EnableDragColSize( true );
+    m_gridMaintanenceRepairs->SetColLabelSize( 30 );
+    m_gridMaintanenceRepairs->SetColLabelValue( 0, _( "Priority" ) );
+    m_gridMaintanenceRepairs->SetColLabelValue( 1, _( "RepairsTODO" ) );
+    m_gridMaintanenceRepairs->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridMaintanenceRepairs->AutoSizeRows();
+    m_gridMaintanenceRepairs->EnableDragRowSize( true );
+    m_gridMaintanenceRepairs->SetRowLabelSize( 30 );
+    m_gridMaintanenceRepairs->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+    m_gridMaintanenceRepairs->SetLabelTextColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
+
+    // Cell Defaults
+    m_gridMaintanenceRepairs->SetDefaultCellAlignment( wxALIGN_RIGHT, wxALIGN_TOP );
+    m_menu71 = new wxMenu();
+    wxMenuItem* m_menuItem91;
+    m_menuItem91 = new wxMenuItem( m_menu71, wxID_ANY, wxString( _( "Repair done" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu71->Append( m_menuItem91 );
+
+    wxMenuItem* m_menuItem921;
+    m_menuItem921 = new wxMenuItem( m_menu71, wxID_ANY, wxString( _( "Buy parts for this repair" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu71->Append( m_menuItem921 );
+
+    wxMenuItem* m_menuItem131;
+    m_menuItem131 = new wxMenuItem( m_menu71, wxID_ANY, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu71->Append( m_menuItem131 );
+
+
+    bSizer122->Add( m_gridMaintanenceRepairs, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    fgSizer1513->Add( bSizer122, 1, wxEXPAND, 5 );
+
+    m_panel141->SetSizer( fgSizer1513 );
+    m_panel141->Layout();
+    fgSizer1513->Fit( m_panel141 );
+    m_notebook6->AddPage( m_panel141, _( "Repairs" ), false );
+    m_panel16 = new wxPanel( m_notebook6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer1511;
+    fgSizer1511 = new wxFlexGridSizer( 3, 1, 0, 0 );
+    fgSizer1511->AddGrowableCol( 0 );
+    fgSizer1511->AddGrowableRow( 2 );  // Zubehör kaufen ???
+    fgSizer1511->SetFlexibleDirection( wxBOTH );
+    fgSizer1511->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxBoxSizer* bSizer10111;
+    bSizer10111 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonAddLineBuyParts = new wxButton( m_panel16, wxID_ANY, _( "Add Line" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonAddLineBuyParts->SetToolTip( _( "Add a new line" ) );
+    bSizer10111->Add( m_buttonAddLineBuyParts, 0, wxALL, 5 );
+
+    m_buttonSaveBuyParts = new wxButton( m_panel16, wxID_ANY, _( "Export" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSaveBuyParts->SetToolTip( _( "export your BuyParts-data as HTML or ODT" ) );
+    bSizer10111->Add( m_buttonSaveBuyParts, 0, wxALL, 5 );
+
+    m_staticline1511 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL|wxLI_VERTICAL );
+    bSizer10111->Add( m_staticline1511, 0, wxEXPAND | wxALL, 5 );
+
+    m_staticText6211 = new wxStaticText( m_panel16, wxID_ANY, _( "Select Layout:" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText6211->Wrap( -1 );
+    bSizer10111->Add( m_staticText6211, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString m_choiceSelectLayoutBuyPartsChoices;
+    m_choiceSelectLayoutBuyParts = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_choiceSelectLayoutBuyPartsChoices, 0 );
+    m_choiceSelectLayoutBuyParts->SetToolTip( _( "Select a layout which is displayed\nwith button \"View\"" ) );
+    m_choiceSelectLayoutBuyParts->SetSelection( 0 );
+    bSizer10111->Add( m_choiceSelectLayoutBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonReloadLayoutsBuyPartsHTML = new wxButton( m_panel16, wxID_ANY, _( "R" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonReloadLayoutsBuyPartsHTML->SetToolTip( _( "Reload Layouts" ) );
+
+    bSizer10111->Add( m_buttonReloadLayoutsBuyPartsHTML, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonEditLayoutODTBuyParts = new wxButton( m_panel16, wxID_ANY, _( "E" ), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
+    m_buttonEditLayoutODTBuyParts->SetToolTip( _( "Edit Layout" ) );
+
+    bSizer10111->Add( m_buttonEditLayoutODTBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnHTMLBuyParts = new wxRadioButton( m_panel16, wxID_ANY, wxT( "HTML" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnHTMLBuyParts->SetValue( true );
+    bSizer10111->Add( m_radioBtnHTMLBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnODTBuyParts = new wxRadioButton( m_panel16, wxID_ANY, wxT( "ODT" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer10111->Add( m_radioBtnODTBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonViewBuyParts = new wxButton( m_panel16, wxID_ANY, _( "View" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonViewBuyParts->SetToolTip( _( "View data in browser (HTML) or Openoffice/LibreOffice (ODT)" ) );
+    bSizer10111->Add( m_buttonViewBuyParts, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer10111->Add( 300, 0, 1, wxEXPAND, 5 );
+
+    fgSizer1511->Add( bSizer10111, 1, wxEXPAND, 5 );
+
+    m_staticline1411 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer1511->Add( m_staticline1411, 0, wxEXPAND | wxALL, 5 );
+
+    wxBoxSizer* bSizer121;
+    bSizer121 = new wxBoxSizer( wxVERTICAL );
+
+    bSizer121->SetMinSize( wxSize( -1,400 ) );
+    m_gridMaintenanceBuyParts = new wxGrid( m_panel16, wxID_ANY, wxDefaultPosition, wxSize( 1000,400 ), 0 );
+
+    // Grid
+    m_gridMaintenanceBuyParts->CreateGrid( 0, 6 );
+    m_gridMaintenanceBuyParts->EnableEditing( true );
+    m_gridMaintenanceBuyParts->EnableGridLines( true );
+    m_gridMaintenanceBuyParts->EnableDragGridSize( false );
+    m_gridMaintenanceBuyParts->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridMaintenanceBuyParts->SetColSize( 0, 50 );
+    m_gridMaintenanceBuyParts->SetColSize( 1, 101 );
+    m_gridMaintenanceBuyParts->SetColSize( 2, 400 );
+    m_gridMaintenanceBuyParts->SetColSize( 3, 325 );
+    m_gridMaintenanceBuyParts->SetColSize( 4, 74 );
+    m_gridMaintenanceBuyParts->SetColSize( 5, 255 );
+    m_gridMaintenanceBuyParts->EnableDragColMove( false );
+    m_gridMaintenanceBuyParts->EnableDragColSize( true );
+    m_gridMaintenanceBuyParts->SetColLabelSize( 30 );
+    m_gridMaintenanceBuyParts->SetColLabelValue( 0, _( "Priority" ) );
+    m_gridMaintenanceBuyParts->SetColLabelValue( 1, _( "Category" ) );
+    m_gridMaintenanceBuyParts->SetColLabelValue( 2, _( "Title" ) );
+    m_gridMaintenanceBuyParts->SetColLabelValue( 3, _( "Buy Parts" ) );
+    m_gridMaintenanceBuyParts->SetColLabelValue( 4, _( "Date" ) );
+    m_gridMaintenanceBuyParts->SetColLabelValue( 5, _( "At" ) );
+    //	m_gridMaintenanceBuyParts->SetColLabelValue( 6, _("Active") ); // No column set for 6 ??
+    m_gridMaintenanceBuyParts->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridMaintenanceBuyParts->AutoSizeRows();
+    m_gridMaintenanceBuyParts->EnableDragRowSize( true );
+    m_gridMaintenanceBuyParts->SetRowLabelSize( 40 );
+    m_gridMaintenanceBuyParts->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridMaintenanceBuyParts->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    m_menu711 = new wxMenu();
+    wxMenuItem* m_menuItem1311;
+    m_menuItem1311 = new wxMenuItem( m_menu711, wxID_ANY, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu711->Append( m_menuItem1311 );
+// Menü ist GANZ unten außerhalb Fenster, warum????
+
+    bSizer121->Add( m_gridMaintenanceBuyParts, 1, wxALL|wxEXPAND, 5 );
+
+    fgSizer1511->Add( bSizer121, 1, wxEXPAND, 5 );
+
+    m_panel16->SetSizer( fgSizer1511 );
+    m_panel16->Layout();
+    fgSizer1511->Fit( m_panel16 );
+    m_notebook6->AddPage( m_panel16, _( "Buy Parts" ), false );
+
+    bSizer13->Add( m_notebook6, 1, wxEXPAND | wxALL, 5 );
+
+    m_panel13->SetSizer( bSizer13 );
+    m_panel13->Layout();
+    bSizer13->Fit( m_panel13 );
+    m_logbook->AddPage( m_panel13, _( "Maintenance" ), false );
+
+    bSizer2->Add( m_logbook, 1, wxEXPAND | wxALL, 2 );
+
+    this->SetSizer( bSizer2 );
+    this->Layout();
+
+    this->Centre( wxHORIZONTAL );
+
+    // Connect Events
+    m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_EDITOR_HIDDEN, wxGridEventHandler( LogbookDialog::onGridEditorHidden ), NULL, this );
+    m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::onGridEditorShow ), NULL, this );
+    m_logbook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNoteBookPageChangedLogbook ), NULL, this );
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( LogbookDialog::LogbookDialogOnClose ) );
+    this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookDialog::LogbookDialogOnInitDialog ) );
+    m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::m_button4OnButtonClick ), NULL, this );
+    m_gridGlobal->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickGlobal ), NULL, this );
+    m_gridWeather->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickWeather ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickMotorSails ), NULL, this );
+    m_gridOverview->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickOverview ), NULL, this );
+    m_gridCrew->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrew ), NULL, this );
+    this->Connect( m_menuItem30->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionOnboardCrew ) );
+    this->Connect( m_menuItem31->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAllEntriesCrew ) );
+    m_gridCrewWake->Connect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrewWake ), NULL, this );
+    logSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logSaveOnButtonClick ), NULL, this );
+    logView->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logViewOnButtonClick ), NULL, this );
+    newLogbook->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::newLogbookOnButtonClick ), NULL, this );
+    selLogbook->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::selLogbookOnButtonClick ), NULL, this );
+    m_gridGlobal->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCellRightClick ), NULL, this );
+    m_gridGlobal->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCmdCellChange ), NULL, this );
+    m_gridGlobal->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridSelectCell ), NULL, this );
+    m_gridGlobal->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridGlobalOnKeyDown ), NULL, this );
+    m_gridGlobal->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickGlobal ), NULL, this );
+    m_gridWeather->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickWeather ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickMotorSails ), NULL, this );
+    this->Connect( m_menuItem1->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+    this->Connect( m_menuItem15->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumn ) );
+    this->Connect( m_menuItem16->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumnOverView ) );
+    this->Connect( m_menuItemSearch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSearch ) );
+    this->Connect( m_menuItemShutDown->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShutdown ) );
+    m_gridWeather->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCellRightClick ), NULL, this );
+    m_gridWeather->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCmdCellChange ), NULL, this );
+    m_gridWeather->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridSelectCell ), NULL, this );
+    m_gridWeather->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridWeatherOnKeyDown ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCellRightClick ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCmdCellChange ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridSelectCell ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridMotorSailsOnKeyDown ), NULL, this );
+    crewAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewAddOnButtonClick ), NULL, this );
+    crewSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewSaveOnButtonClick ), NULL, this );
+    crewView->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewViewOnButtonClick ), NULL, this );
+    m_gridCrew->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellChange ), NULL, this );
+    m_gridCrew->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellRightClick ), NULL, this );
+    this->Connect( m_menuItem2->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem2OnMenuSelection ) );
+    m_gridCrewWake->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewWakeOnGridCellChange ), NULL, this );
+
+    addEquipmentButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boataddEquipmentButtonOnButtonClick ), NULL, this );
+    boatSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatSaveOnButtonClick ), NULL, this );
+    boatView->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatViewOnButtonClick ), NULL, this );
+    m_gridEquipment->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellChange ), NULL, this );
+    m_gridEquipment->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellRightClick ), NULL, this );
+    this->Connect( m_menuItem3->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem3OnMenuSelection ) );
+    m_radioBtnHTML->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTML ), NULL, this );
+    m_radioBtnODT->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODT ), NULL, this );
+    m_buttonReloadLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutLogbook ), NULL, this );
+    m_buttonEditLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutLogbook ), NULL, this );
+    m_buttonAddLineService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineService ), NULL, this );
+    m_buttonSaveService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService ), NULL, this );
+    m_buttonReloadLayoutsServiceHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
+    m_buttonEditLayoutODTService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
+    m_radioBtnHTMLService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
+    m_radioBtnODTService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
+    m_buttonViewService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
+    m_buttonReloadLayoutsBoat->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsBoat ), NULL, this );
+    m_buttonEditLayoutBoat->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutBoat ), NULL, this );
+    m_radioBtnHTMLBoat->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLBoat ), NULL, this );
+    m_radioBtnODTBoat->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTBoat ), NULL, this );
+    m_buttonReloadCrew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsCrew ), NULL, this );
+    m_buttonEditLayoutCrew->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutCrew ), NULL, this );
+    m_radioBtnHTMLCrew->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLCrew ), NULL, this );
+    m_radioBtnODTCrew->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTCrew ), NULL, this );
+    m_buttonSelectLogbook->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickSelectLogbook ), NULL, this );
+    m_gridOverview->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickOverview ), NULL, this );
+    m_gridOverview->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickOverview ), NULL, this );
+    this->Connect( m_menuItemOverviewRoute->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionGotoRoute ) );
+    logSaveOverview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverviewSave ), NULL, this );
+    m_buttonReloadLayoutOview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutOverView ), NULL, this );
+    m_buttonEditLayoutOview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutOverview ), NULL, this );
+    m_radioBtnHTMLOverview->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
+    m_gridOverview->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownOverview ), NULL, this );
+    m_radioBtnODTOverview->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTOverView ), NULL, this );
+    logViewOverview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverView ), NULL, this );
+    m_radioBtnHTMLOverview->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
+    m_radioBtnAllLogbooks->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::OnRadioButtonAllLogbooks ), NULL, this );
+    m_radioBtnActualLogbook->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::OnRadioButtonActualLogbook ), NULL, this );
+    m_toggleBtnShowEquipment->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonShowEquip ), NULL, this );
+    this->Connect( m_menuItemNewWatch->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionNewWatchWake ) );
+    this->Connect( m_menuItem32->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAsc ) );
+    this->Connect( m_menuItem33->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDesc ) );
+    m_gridGlobal->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickGlobal ), NULL, this );
+    m_gridWeather->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWeather ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickMotorSails ), NULL, this );
+    this->Connect( m_menuItemDelRows->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionDeleteRows ) );
+    this->Connect( m_menuItemFlip->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlip ) );
+    m_textCtrlStatusDistance->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDistance ), NULL, this );
+    m_textCtrlStatusCourseDeg->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourse ), NULL, this );
+    m_textCtrlStatusCourseMin->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourseMin ), NULL, this );
+    m_textCtrlWatchStartTime->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpStartTime ), NULL, this );
+    m_textCtrlWakeTrip->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDays ), NULL, this );
+    m_textCtrlWakeDay->Connect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDay ), NULL, this );
+    this->Connect( m_menuItem36->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlipWatches ) );
+    logbookChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceGlobal ), NULL, this );
+    crewChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceCrew ), NULL, this );
+    boatChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoat ), NULL, this );
+    overviewChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoatOverview ), NULL, this );
+    m_choiceSelectLayoutService->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceService ), NULL, this );
+    m_choiceSelectLayoutRepairs->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceRepairs ), NULL, this );
+    m_choiceSelectLayoutBuyParts->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBuyParts ), NULL, this );
+    m_bpButtonShowHideLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickShowHideLayout ), NULL, this );
+    m_toggleBtnEngine1->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine1 ), NULL, this );
+    m_toggleBtnEngine2->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine2 ), NULL, this );
+    m_toggleBtnGenerator->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonGenerator ), NULL, this );
+
+    m_notebook8->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNotebookPageChangedLoggrids ), NULL, this );
+    m_bpButtonShowHideStatusGlobal->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickStatusbarGlobal ), NULL, this );
+    m_bpButtonHelpGlobal->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnClickButtonHelpGlobal ), NULL, this );
+
+    m_gridCrew->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownCrew ), NULL, this );
+
+    this->Connect( m_menuItem22->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHiddenCrew ) );
+    this->Connect( m_menuItem23->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionMergeWatch ) );
+    m_gridGlobal->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickGlobal ), NULL, this );
+
+    m_gridMaintanence->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellServiceChange ), NULL, this );
+    m_gridMaintanence->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::onGridCellServiceSelected ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickWake ), NULL, this );
+    m_gridCrew->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownCrew ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownWatch ), NULL, this );
+    m_gridMaintanence->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickService ), NULL, this );
+    m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickBuyParts ), NULL, this );
+    m_gridMaintanenceRepairs->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickRepairs ), NULL, this );
+
+    this->Connect( m_menuItem9->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceOK ) );
+    this->Connect( m_menuItem92->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceBuyParts ) );
+
+    m_gridMaintanence->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickService ), NULL, this );
+    m_gridMaintanence->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickService ), NULL, this );
+    m_buttonAddLineBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineBuyParts ), NULL, this );
+    m_buttonAddLineRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineRepairs ), NULL, this );
+    m_buttonReloadLayoutsBuyPartsHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsBuyPartsHTML ), NULL, this );
+    m_buttonEditLayoutODTBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTBuyParts ), NULL, this );
+    m_radioBtnHTMLBuyParts->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLBuyParts ), NULL, this );
+    m_radioBtnODTBuyParts->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTBuyParts ), NULL, this );
+    m_buttonViewBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellChangeBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellSelectedBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickBuyParts ), NULL, this );
+    m_buttonSaveBuyParts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveBuyParts ), NULL, this );
+
+    this->Connect( m_menuItem91->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsOK ) );
+    this->Connect( m_menuItem921->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsBuyParts ) );
+    this->Connect( m_menuItem131->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsDelete ) );
+    this->Connect( m_menuItem1311->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionBuyPartsDelete ) );
+    this->Connect( m_menuItem13->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceDelete ) );
+    this->Connect( m_menuItem132->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenCols ) );
+
+    this->Connect( m_menuItem14->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenColsOverview ) );
+    m_gridMaintanenceRepairs->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellRepairsChange ), NULL, this );
+    m_gridMaintanenceRepairs->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickRepairs ), NULL, this );
+    m_gridMaintanenceRepairs->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRepairsSelected ), NULL, this );
+    m_gridMaintanenceRepairs->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownRepairs ), NULL, this );
+    m_buttonSaveRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveRepairs ), NULL, this );
+    m_buttonReloadLayoutsRepairsHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsRepairsHTML ), NULL, this );
+    m_buttonEditLayoutODTRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTRepairs ), NULL, this );
+    m_radioBtnHTMLRepairs->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLRepairs ), NULL, this );
+    m_radioBtnODTRepairs->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTRepairs ), NULL, this );
+    m_buttonViewRepairs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewRepairs ), NULL, this );
+
+    m_buttonSaveService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService ), NULL, this );
+    m_buttonReloadLayoutsServiceHTML->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
+    m_buttonEditLayoutODTService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
+    m_radioBtnHTMLService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
+    m_radioBtnODTService->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
+    m_buttonViewService->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
+
+    m_gridGlobal->Connect( wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Connect( wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Connect( wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Connect( wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Connect( wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Connect( wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Connect( wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Connect( wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Connect( wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Connect( wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Connect( wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridCrew->Connect( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEventHandler( LogbookDialog::OnGridBeginDragCrew ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEventHandler( LogbookDialog::OnGridBeginDragWatch ), NULL, this );
+    m_gridCrew->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellLeftClick ), NULL, this );
+    m_buttonClear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickWakeClear ), NULL, this );
+    m_buttonCalculate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickCalculate ), NULL, this );
+    m_buttonReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickReset ), NULL, this );
+    m_buttonDayPlus->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayPlus ), NULL, this );
+    m_buttonNow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickNow ), NULL, this );
+    m_buttonDayMinus->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayMinus ), NULL, this );
+    m_textCtrlWatchStartDate->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( LogbookDialog::OnLeftDownWatchStartDate ), NULL, this );
+
+    m_textCtrlWatchStartTime->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterWatchTime ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickWatch ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_GRID_EDITOR_HIDDEN, wxGridEventHandler( LogbookDialog::OnGridEditorHiddenWatch ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEventHandler( LogbookDialog::OnGridEditorCreatedWatch ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownWatch ), NULL, this );
+    m_textCtrlWakeDay->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterDayWake ), NULL, this );
+    this->Connect( m_menuItem35->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDeleteMembers ) );
+    this->Connect( m_menuItem19->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSplitWatch ) );
+    m_gridCrewWake->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWake ), NULL, this );
+    m_gridCrewWake->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickWake ), NULL, this );
+
+    m_splitterWatch->Connect( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEventHandler( LogbookDialog::OnSplitterSashPositionChangedWake ), NULL, this );
+    m_buttonSetTimer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusTimer ), NULL, this );
+    m_bpButtonTimer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletTimer ), NULL, this );
+    m_bpButtonWatch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWatch ), NULL, this );
+    m_bpButton8Waypoint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWaypoint ), NULL, this );
+    m_bpButtonDistance->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletDistance ), NULL, this );
+    m_bpButtonCourse->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletCourse ), NULL, this );
+    m_buttonStartStop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusStartStop ), NULL, this );
+    m_textCtrlStatusDistance->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusDistance ), NULL, this );
+    m_textCtrlStatusCourseDeg->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusCourseDeg ), NULL, this );
+    m_textCtrlStatusCourseMin->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusMinutes ), NULL, this );
+
+    this->Connect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::OnIdleMainDialog ) );
+
+}
+
+
+
+LogbookDialog::~LogbookDialog()
+{
+    setIniValues();
+
+    if ( GPSTimer->IsRunning() )
+        GPSTimer->Stop();
+
+    this->Disconnect( wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnTimerGPS ) );
+    delete GPSTimer;
+    GPSTimer = NULL;
+
+    if ( logbookTimer->IsRunning() )
+        logbookTimer->Stop();
+
+    this->Disconnect( wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnLogTimer ) );
+    delete logbookTimer;
+    logbookTimer = NULL;
+
+    // Disconnect Events
+    this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::OnIdleMainDialog ) );
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( LogbookDialog::LogbookDialogOnClose ) );
+    this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( LogbookDialog::LogbookDialogOnInitDialog ) );
+    m_logbook->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNoteBookPageChangedLogbook ), NULL, this );
+    m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::m_button4OnButtonClick ), NULL, this );
+    logView->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logViewOnButtonClick ), NULL, this );
+    logSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::logSaveOnButtonClick ), NULL, this );
+    newLogbook->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::newLogbookOnButtonClick ), NULL, this );
+    selLogbook->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::selLogbookOnButtonClick ), NULL, this );
+    m_gridGlobal->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCellRightClick ), NULL, this );
+    m_gridGlobal->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridCmdCellChange ), NULL, this );
+    m_gridGlobal->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridGlobalOnGridSelectCell ), NULL, this );
+    m_gridGlobal->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridGlobalOnKeyDown ), NULL, this );
+    m_gridGlobal->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickGlobal ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickWeather ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickMotorSails ), NULL, this );
+    m_gridOverview->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickOverview ), NULL, this );
+    m_gridCrew->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrew ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionOnboardCrew ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAllEntriesCrew ) );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftDClickCrewWake ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShutdown ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumn ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHideColumnOverView ) );
+    m_gridGlobal->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickGlobal ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickWeather ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickMotorSails ), NULL, this );
+
+    m_gridWeather->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCellRightClick ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridCmdCellChange ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridWeatherOnGridSelectCell ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridWeatherOnKeyDown ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCellRightClick ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridCmdCellChange ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::m_gridMotorSailsOnGridSelectCell ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::m_gridMotorSailsOnKeyDown ), NULL, this );
+    crewAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewAddOnButtonClick ), NULL, this );
+    crewSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewSaveOnButtonClick ), NULL, this );
+    crewView->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::crewViewOnButtonClick ), NULL, this );
+    m_gridCrew->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellChange ), NULL, this );
+    m_gridCrew->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellRightClick ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem2OnMenuSelection ) );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridCrewWakeOnGridCellChange ), NULL, this );
+    addEquipmentButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boataddEquipmentButtonOnButtonClick ), NULL, this );
+    boatSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatSaveOnButtonClick ), NULL, this );
+    boatView->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::boatViewOnButtonClick ), NULL, this );
+    m_gridEquipment->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellChange ), NULL, this );
+    m_gridEquipment->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::m_gridEquipmentOnGridCellRightClick ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::m_menuItem3OnMenuSelection ) );
+    m_radioBtnHTML->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTML ), NULL, this );
+    m_radioBtnODT->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODT ), NULL, this );
+    m_buttonReloadLayout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutLogbook ), NULL, this );
+    m_buttonEditLayout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutLogbook ), NULL, this );
+    m_buttonAddLineService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineService ), NULL, this );
+    m_buttonSaveService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService ), NULL, this );
+    m_buttonReloadLayoutsServiceHTML->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
+    m_buttonEditLayoutODTService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
+    m_radioBtnHTMLService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
+    m_radioBtnODTService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
+    m_buttonViewService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
+    m_buttonReloadLayoutsBoat->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsBoat ), NULL, this );
+    m_buttonEditLayoutBoat->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutBoat ), NULL, this );
+    m_radioBtnHTMLBoat->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLBoat ), NULL, this );
+    m_radioBtnODTBoat->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTBoat ), NULL, this );
+    m_buttonReloadCrew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsCrew ), NULL, this );
+    m_buttonEditLayoutCrew->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutCrew ), NULL, this );
+    m_radioBtnHTMLCrew->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLCrew ), NULL, this );
+    m_radioBtnODTCrew->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTCrew ), NULL, this );
+    m_buttonSelectLogbook->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickSelectLogbook ), NULL, this );
+    m_gridOverview->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickOverview ), NULL, this );
+    m_gridOverview->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickOverview ), NULL, this );
+    m_gridOverview->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownOverview ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSearch ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionGotoRoute ) );
+    logSaveOverview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverviewSave ), NULL, this );
+    m_buttonReloadLayoutOview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonReloadLayoutOverView ), NULL, this );
+    m_buttonEditLayoutOview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutOverview ), NULL, this );
+    m_radioBtnHTMLOverview->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
+    m_radioBtnODTOverview->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTOverView ), NULL, this );
+    logViewOverview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickOverView ), NULL, this );
+    m_radioBtnHTMLOverview->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLOverview ), NULL, this );
+    m_radioBtnAllLogbooks->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::OnRadioButtonAllLogbooks ), NULL, this );
+    m_gridMaintanence->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellServiceChange ), NULL, this );
+    m_gridMaintanence->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::onGridCellServiceSelected ), NULL, this );
+    m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickBuyParts ), NULL, this );
+    m_buttonSaveBuyParts->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveBuyParts ), NULL, this );
+    m_toggleBtnShowEquipment->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonShowEquip ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionNewWatchWake ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionAsc ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDesc ) );
+    m_gridGlobal->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickGlobal ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWeather ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickMotorSails ), NULL, this );
+    this->Disconnect( 518, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionDeleteRows ) );
+    this->Disconnect( 519, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlip ) );
+    m_textCtrlStatusDistance->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDistance ), NULL, this );
+    m_textCtrlStatusCourseDeg->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourse ), NULL, this );
+    m_textCtrlStatusCourseMin->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpCourseMin ), NULL, this );
+    m_textCtrlWakeTrip->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDays ), NULL, this );
+    m_textCtrlWakeDay->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpDay ), NULL, this );
+    m_textCtrlWatchStartTime->Disconnect( wxEVT_LEFT_UP, wxMouseEventHandler( LogbookDialog::OnLeftUpStartTime ), NULL, this );
+    m_notebook8->Disconnect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( LogbookDialog::OnNotebookPageChangedLoggrids ), NULL, this );
+    m_bpButtonShowHideStatusGlobal->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickStatusbarGlobal ), NULL, this );
+    m_bpButtonHelpGlobal->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnClickButtonHelpGlobal ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionFlipWatches ) );
+    logbookChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceGlobal ), NULL, this );
+    crewChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceCrew ), NULL, this );
+    boatChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoat ), NULL, this );
+    overviewChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBoatOverview ), NULL, this );
+    m_choiceSelectLayoutService->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceService ), NULL, this );
+    m_choiceSelectLayoutRepairs->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceRepairs ), NULL, this );
+    m_choiceSelectLayoutBuyParts->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookDialog::OnChoiceBuyParts ), NULL, this );
+    m_bpButtonShowHideLayout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtomClickShowHideLayout ), NULL, this );
+    m_toggleBtnEngine1->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine1 ), NULL, this );
+    m_toggleBtnEngine2->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonEngine2 ), NULL, this );
+    m_toggleBtnGenerator->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnToggleButtonGenerator ), NULL, this );
+    m_buttonSailsReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickResetSails ), NULL, this );
+    m_gridMaintanence->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellLeftClickService ), NULL, this );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellRightClickWake ), NULL, this );
+    m_buttonClear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickWakeClear ), NULL, this );
+
+
+    m_gridCrew->Disconnect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownCrew ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionHiddenCrew ) );
+    m_gridCrew->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownCrew ), NULL, this );
+    m_gridCrewWake->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownWatch ), NULL, this );
+
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionMergeWatch ) );
+    m_gridGlobal->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickGlobal ), NULL, this );
+
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceOK ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceBuyParts ) );
+    this->Disconnect( 503, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenCols ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionShowHiddenColsOverview ) );
+    m_gridMaintanence->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickService ), NULL, this );
+    m_gridMaintanence->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickService ), NULL, this );
+    m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickBuyParts ), NULL, this );
+    m_gridMaintanenceRepairs->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelLeftClickRepairs ), NULL, this );
+
+    m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( LogbookDialog::onGridCellChangeBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::onGridCellRightClickBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( LogbookDialog::onGridCellSelectedBuyParts ), NULL, this );
+    m_buttonAddLineBuyParts->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineBuyParts ), NULL, this );
+    m_gridMaintenanceBuyParts->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( LogbookDialog::OnKeyDownBuyParts ), NULL, this );
+
+    m_buttonAddLineRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineRepairs ), NULL, this );
+    m_buttonSaveRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveRepairs ), NULL, this );
+    m_buttonReloadLayoutsRepairsHTML->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsRepairsHTML ), NULL, this );
+    m_buttonEditLayoutODTRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTRepairs ), NULL, this );
+    m_radioBtnHTMLRepairs->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLRepairs ), NULL, this );
+    m_radioBtnODTRepairs->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTRepairs ), NULL, this );
+    m_buttonViewRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewRepairs ), NULL, this );
+
+    m_buttonAddLineService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineService ), NULL, this );
+    m_buttonSaveService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickSaveService ), NULL, this );
+    m_buttonReloadLayoutsServiceHTML->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickReloadLayoutsServiceHTML ), NULL, this );
+    m_buttonEditLayoutODTService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickEditLayoutODTService ), NULL, this );
+    m_radioBtnHTMLService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonHTMLService ), NULL, this );
+    m_radioBtnODTService->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookDialog::onRadioButtonODTService ), NULL, this );
+    m_buttonViewService->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtonClickViewService ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsOK ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsBuyParts ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionRepairsDelete ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionBuyPartsDelete ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::onMenuSelectionServiceDelete ) );
+    m_buttonAddLineRepairs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::onButtobClickAddLineRepairs ), NULL, this );
+    m_gridGlobal->Disconnect( wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_SCROLLWIN_THUMBTRACK,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Disconnect( wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_SCROLLWIN_PAGEUP,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Disconnect( wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_SCROLLWIN_PAGEDOWN,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Disconnect( wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_SCROLLWIN_LINEUP,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridGlobal->Disconnect( wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler( LogbookDialog::gridGlobalScrolled ), NULL, this );
+    m_gridWeather->Disconnect( wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler( LogbookDialog::gridWeatherScrolled ), NULL, this );
+    m_gridMotorSails->Disconnect( wxEVT_SCROLLWIN_LINEDOWN,wxScrollWinEventHandler( LogbookDialog::gridMotorSailsScrolled ), NULL, this );
+
+    m_gridCrew->Disconnect( wxEVT_GRID_CELL_BEGIN_DRAG, wxGridEventHandler( LogbookDialog::OnGridBeginDragCrew ), NULL, this );
+    m_gridCrew->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::m_gridCrewOnGridCellLeftClick ), NULL, this );
+    m_buttonCalculate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickCalculate ), NULL, this );
+    m_buttonReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickReset ), NULL, this );
+    m_buttonDayPlus->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayPlus ), NULL, this );
+    m_buttonNow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickNow ), NULL, this );
+    m_buttonDayMinus->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickDayMinus ), NULL, this );
+    m_textCtrlWatchStartDate->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( LogbookDialog::OnLeftDownWatchStartDate ), NULL, this );
+
+    m_textCtrlWatchStartTime->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterWatchTime ), NULL, this );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( LogbookDialog::OnGridCellLeftClickWatch ), NULL, this );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_EDITOR_HIDDEN, wxGridEventHandler( LogbookDialog::OnGridEditorHiddenWatch ), NULL, this );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_EDITOR_SHOWN, wxGridEventHandler( LogbookDialog::OnGridEditorShownWatch ), NULL, this );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_EDITOR_CREATED, wxGridEditorCreatedEventHandler( LogbookDialog::OnGridEditorCreatedWatch ), NULL, this );
+    m_textCtrlWakeDay->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterDayWake ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionSplitWatch ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionMergeWatch ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( LogbookDialog::OnMenuSelectionDeleteMembers ) );
+    m_gridCrewWake->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( LogbookDialog::OnGridLabelRightClickWake ), NULL, this );
+
+    m_splitterWatch->Disconnect( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxSplitterEventHandler( LogbookDialog::OnSplitterSashPositionChangedWake ), NULL, this );
+    m_buttonSetTimer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusTimer ), NULL, this );
+    m_bpButtonTimer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletTimer ), NULL, this );
+    m_bpButtonWatch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWatch ), NULL, this );
+    m_bpButton8Waypoint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletWaypoint ), NULL, this );
+    m_bpButtonDistance->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletDistance ), NULL, this );
+    m_bpButtonCourse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnStatusBulletCourse ), NULL, this );
+    m_buttonStartStop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickStatusStartStop ), NULL, this );
+    m_textCtrlStatusDistance->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusDistance ), NULL, this );
+    m_textCtrlStatusCourseDeg->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusCourseDeg ), NULL, this );
+    m_textCtrlStatusCourseMin->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookDialog::OnTextEnterStatusMinutes ), NULL, this );
+
+    for ( int i = 0; i < 14; i++ )
+        checkboxSails[i]->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookDialog::OnCheckboxSails ), NULL, this );
+
+
+    delete m_menu1;
+    delete m_menu2;
+    delete m_menu7;
+    delete m_menu71;
+    delete m_menu711;
+
+    delete maintenance;  //still a warning with Mac OS C Xcode here: "Delete called on 'Maintenance' that has virtual functions but non-virtual destructor"
+    delete crewList;
+    delete boat;
+    delete logbook;
+    delete coldfinger;
+
+    clearDataDir();
+}
+
+void LogbookDialog::OnIdleMainDialog( wxIdleEvent& event )
+{
+    static wxDateTime dt;
+    static unsigned int hour, min = 61;
+
+    if ( logbook->sDate != wxEmptyString )
+        dt = logbook->mCorrectedDateTime;
+    else
+        dt = wxDateTime::Now();
+
+    if ( min != dt.GetMinute() )
+    {
+        min  = dt.GetMinute();
+        hour = dt.GetHour();
+
+        if ( statusGPS != logbook->gpsStatus )
+        {
+            statusGPS = logbook->gpsStatus;
+            crewList->dayNow( false );
+        }
+        if ( logbookPlugIn->opt->timer && !logbookPlugIn->eventsEnabled )
+        {
+            if ( logbookPlugIn->opt->timerType == 1 )
+            {
+                static unsigned int h = hour;
+                if ( fullHourModified )
+                {
+                    h = hour;
+                    fullHourModified = false;
+                }
+
+                for ( unsigned int i = 0; i < TimerFull.Count(); i++ )
+                    if ( min == TimerFull[i] && h == hour )
+                    {
+                        logbookTimerWindow->timerEvent();
+                        if ( i == TimerFull.Count()-1 )
+                        {
+                            h += fullHourPlus;
+
+                            if ( h >= 24 )
+                                h -= 24;
+                        }
+                        break;
+                    }
+            }
+            else if ( logbookPlugIn->opt->timerType == 2 && !logbookPlugIn->eventsEnabled )
+            {
+                for ( unsigned int i = 0; i < TimerIndividualH.Count(); i++ )
+                {
+                    if ( logbookPlugIn->opt->timeformat == 1 && hour > 12 )
+                        hour -= 12;
+                    if ( hour == TimerIndividualH[i] && min == TimerIndividualM[i] )
+                    {
+                        logbookTimerWindow->timerEvent();
+                        break;
+                    }
+                }
+            }
+        }
+
+        if ( ActualWatch::active && dt >= ActualWatch::end )
+        {
+            static unsigned int wmin = 61;
+
+            if ( wmin != min )
+            {
+                wmin = min;
+                crewList->dayNow( false );
+                if ( logbookPlugIn->opt->guardChange && !logbookPlugIn->eventsEnabled )
+                {
+                    logbookTimerWindow->popUp();
+                    logbook->guardChange = true;
+                    logbook->appendRow( true, true );
+                    logbook->guardChange = false;
+                }
+            }
+        }
+        else if ( dt >= ActualWatch::end )
+            crewList->dayNow( false );
+    }
+}
+
+void LogbookDialog::OnToggleButtonEngine1( wxCommandEvent& event )
+{
+    if ( event.IsChecked() )
+    {
+        SendPluginMessage( _T( "LOGBOOK_ENGINEBUTTON1" ), _T( "ON" ) );
+        if ( logbookPlugIn->opt->engineMessageSails && logbookPlugIn->opt->engineAllwaysSailsDown )
+            resetSails();
+        startEngine1( true, true, true );
+    }
+    else
+    {
+        SendPluginMessage( _T( "LOGBOOK_ENGINEBUTTON1" ), _T( "OFF" ) );
+        stopEngine1( true, true );
+    }
+}
+
+void LogbookDialog::OnToggleButtonEngine2( wxCommandEvent& event )
+{
+    if ( event.IsChecked() )
+    {
+        SendPluginMessage( _T( "LOGBOOK_ENGINEBUTTON2" ), _T( "ON" ) );
+        if ( logbookPlugIn->opt->engineMessageSails && logbookPlugIn->opt->engineAllwaysSailsDown )
+            resetSails();
+        startEngine2( true, true, true );
+    }
+    else
+    {
+        SendPluginMessage( _T( "LOGBOOK_ENGINEBUTTON2" ), _T( "OFF" ) );
+        stopEngine2( true, true, true );
+    }
+}
+
+void LogbookDialog::OnToggleButtonGenerator( wxCommandEvent& event )
+{
+    if ( event.IsChecked() )
+    {
+        SendPluginMessage( _T( "LOGBOOK_GENERATORBUTTON" ), _T( "ON" ) );
+        startGenerator( true, true, true );
+    }
+    else
+    {
+        SendPluginMessage( _T( "LOGBOOK_GENERATORBUTTON" ), _T( "OFF" ) );
+        stopGenerator( true, true, true );
+    }
+}
+
+void LogbookDialog::setAbbreviations()
+{
+    m_gridMotorSails->SetLabelValue( wxHORIZONTAL,_T( "#1 " )+logbookPlugIn->opt->rpm,LogbookHTML::RPM1 );
+    m_gridMotorSails->SetLabelValue( wxHORIZONTAL,_T( "#2 " )+logbookPlugIn->opt->rpm,LogbookHTML::RPM2 );
+}
+
+void LogbookDialog::OnButtonClickResetSails( wxCommandEvent& event )
+{
+    resetSails();
+}
+
+void LogbookDialog::resetSails()
+{
+    for ( int i = 0; i < 14; i++ )
+    {
+        checkboxSails[i]->SetValue( false );
+        logbookPlugIn->opt->bSailIsChecked[i] = false;
+    }
+
+    stateSails();
+    SailsTimer->Start( 4000,true );
+}
+
+void LogbookDialog::OnButtomClickShowHideLayout( wxCommandEvent& event )
+{
+    if ( !logbookPlugIn->opt->layoutShow )
+    {
+        m_panelLayout->Show();
+        m_panelEngine->Hide();
+        logbookPlugIn->opt->layoutShow = true;
+        m_bpButtonShowHideLayout->SetBitmapLabel( back_xpm );
+    }
+    else
+    {
+        m_panelEngine->Show();
+        m_panelLayout->Hide();
+        logbookPlugIn->opt->layoutShow = false;
+        m_bpButtonShowHideLayout->SetBitmapLabel( forward_xpm );
+    }
+    m_bpButtonShowHideLayout->SetToolTip( panelOnOff[!logbookPlugIn->opt->layoutShow] );
+    m_panel2->Layout();
+    bSizer6->Layout();
+    m_panel2->Refresh();
+}
+
+void LogbookDialog::OnButtomClickStatusbarGlobal( wxCommandEvent& event )
+{
+    if ( logbookPlugIn->opt->statusbarGlobal == true )
+    {
+        Statusbar->Hide();
+        logbookPlugIn->opt->statusbarGlobal = false;
+        m_bpButtonShowHideStatusGlobal->SetBitmapLabel( down_xpm );
+    }
+    else
+    {
+        Statusbar->Show();
+        logbookPlugIn->opt->statusbarGlobal = true;
+        m_bpButtonShowHideStatusGlobal->SetBitmapLabel( up_xpm );
+    }
+    m_panel2->Layout();
+}
+
+void LogbookDialog::OnClickButtonHelpGlobal( wxCommandEvent& event )
+{
+    startBrowser( help_locn+_T( "Help.html" ) );
+}
+
+void LogbookDialog::OnChoiceGlobal( wxCommandEvent& event )
+{
+    if ( m_radioBtnHTML->GetValue() )
+        logbookPlugIn->opt->navGridLayoutChoice = event.GetSelection();
+    else
+        logbookPlugIn->opt->navGridLayoutChoiceODT = event.GetSelection();
+}
+
+void LogbookDialog::deselectAllLogbookGrids()
+{
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        logGrids[i]->ClearSelection();
+    }
+}
+
+void LogbookDialog::OnLeftUpDistance( wxMouseEvent& event )
+{
+    m_textCtrlStatusDistance->SetSelection( -1,-1 );
+    event.Skip();
+}
+
+void LogbookDialog::OnLeftUpCourse( wxMouseEvent& event )
+{
+    m_textCtrlStatusCourseDeg->SetSelection( -1,-1 );
+    event.Skip();
+}
+
+void LogbookDialog::OnLeftUpCourseMin( wxMouseEvent& event )
+{
+    m_textCtrlStatusCourseMin->SetSelection( -1,-1 );
+    event.Skip();
+}
+
+void LogbookDialog::OnNotebookPageChangedLoggrids( wxNotebookEvent& event )
+{
+    event.Skip();
+
+    wxArrayInt ar;
+    for ( int i = 0; i < LOGGRIDS; i++ )
+        if ( logGrids[i]->IsSelection() )
+        {
+            ar = logGrids[i]->GetSelectedRows();
+            break;
+        }
+
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        for ( unsigned int n = 0; n < ar.Count(); n++ )
+            logGrids[i]->SelectRow( ar[n],true );
+    }
+}
+
+void LogbookDialog::OnGridLabelLeftClickGlobal( wxGridEvent& event )
+{
+    labelLeftClick( event,m_gridGlobal );
+}
+
+void LogbookDialog::OnGridLabelLeftClickWeather( wxGridEvent& event )
+{
+    labelLeftClick( event,m_gridWeather );
+}
+
+void LogbookDialog::OnGridLabelLeftClickMotorSails( wxGridEvent& event )
+{
+    labelLeftClick( event,m_gridMotorSails );
+}
+
+void LogbookDialog::labelLeftClick( wxGridEvent& event, wxGrid* grid )
+{
+    if ( ( !event.ShiftDown() && !event.ControlDown() ) && event.GetRow() > 0 )
+        grid->SetGridCursor( event.GetRow(),0 );
+
+    grid->HideCellEditControl();
+    grid->SetFocus();
+    event.Skip();
+}
+
+void LogbookDialog::OnGridLabelRightClickGlobal( wxGridEvent& event )
+{
+    m_gridGlobal->HideCellEditControl();
+    m_gridGlobal->SetFocus();
+    m_menu10->Enable( MENUFLIP,true );
+    if ( event.GetCol() == -1 && this->m_gridGlobal->IsSelection() )
+        m_gridGlobal->PopupMenu( m_menu10,event.GetPosition() );
+}
+
+void LogbookDialog::OnGridLabelRightClickWeather( wxGridEvent& event )
+{
+    m_menu10->Enable( MENUFLIP,false );
+    if ( event.GetCol() == -1 && this->m_gridWeather->IsSelection() )
+        m_gridWeather->PopupMenu( m_menu10,event.GetPosition() );
+}
+
+void LogbookDialog::OnGridLabelRightClickMotorSails( wxGridEvent& event )
+{
+    m_menu10->Enable( MENUFLIP,false );
+    if ( event.GetCol() == -1 && this->m_gridMotorSails->IsSelection() )
+        m_gridMotorSails->PopupMenu( m_menu10,event.GetPosition() );
+}
+
+void LogbookDialog::onMenuSelectionDeleteRows( wxCommandEvent& event )
+{
+    logbook->deleteRows();
+}
+
+void LogbookDialog::OnMenuSelectionFlip( wxCommandEvent& event )
+{
+    wxArrayInt rows = m_gridGlobal->GetSelectedRows();
+
+    for ( unsigned int i = 0; i < rows.Count(); i++ )
+    {
+        wxDateTime dt;
+        myParseDate( m_gridGlobal->GetCellValue( rows[i],LogbookHTML::RDATE ),dt );
+        int a = dt.GetDay()-1;
+        int b = dt.GetMonth()+1;
+        int c = dt.GetYear();
+
+        if ( a > 11 )
+        {
+            wxMessageBox( _T( "Cannot flip, month would be > 12" ) );
+            return;
+        }
+
+        dt.Set( b,( wxDateTime::Month ) a,c );
+        m_gridGlobal->SetCellValue( rows[i],LogbookHTML::RDATE,dt.Format( logbookPlugIn->opt->sdateformat ) );
+        logbook->modified = true;
+    }
+}
+
+void LogbookDialog::OnTextEnterStatusDistance( wxCommandEvent& event )
+{
+    wxString s = event.GetString();
+    s.Replace( _T( "," ),_T( "." ) );
+    double i = wxAtof( s );
+    if ( i < 0.01 )
+        i = 0.01;
+
+    logbookPlugIn->opt->dEverySM = i;
+    wxString tmp = wxString::Format( _T( "%0.2f" ),i );
+    tmp.Replace( _T( "." ),decimalPoint );
+    logbookPlugIn->opt->everySMAmount = tmp;
+    m_textCtrlStatusDistance->SetValue( wxString::Format( _T( "%0.2f %s" ),i,logbookPlugIn->opt->distance.c_str() ) );
+}
 
 void LogbookDialog::OnTextEnterStatusCourseDeg( wxCommandEvent& event )
 {
-	wxString s = event.GetString();
-	s.Replace(_T(","),_T("."));
-	int i = wxAtoi(s);
-	if(i < 1 || i > 180)
-		i = 1;
-
-	logbookPlugIn->opt->courseChangeDegrees = wxString::Format(_T("%i"),i);
-	logbookPlugIn->opt->dCourseChangeDegrees = wxAtof(logbookPlugIn->opt->courseChangeDegrees);
-	m_textCtrlStatusCourseDeg->SetValue(wxString::Format(_T("%i %s"),i,logbookPlugIn->opt->Deg.c_str()));
+    wxString s = event.GetString();
+    s.Replace( _T( "," ),_T( "." ) );
+    int i = wxAtoi( s );
+    if ( i < 1 || i > 180 )
+        i = 1;
+
+    logbookPlugIn->opt->courseChangeDegrees = wxString::Format( _T( "%i" ),i );
+    logbookPlugIn->opt->dCourseChangeDegrees = wxAtof( logbookPlugIn->opt->courseChangeDegrees );
+    m_textCtrlStatusCourseDeg->SetValue( wxString::Format( _T( "%i %s" ),i,logbookPlugIn->opt->Deg.c_str() ) );
 }
 
 void LogbookDialog::OnTextEnterStatusMinutes( wxCommandEvent& event )
 {
-	wxString s = event.GetString();
-	s.Replace(_T(","),_T("."));
-	int i = wxAtoi(s);
-	if(i < 0 || i > 59)
-		i = 0;
-	logbookPlugIn->opt->courseTextAfterMinutes = wxString::Format(_T("%i"),i);
-	m_textCtrlStatusCourseMin->SetValue(wxString::Format(_T("%i m"),i));
+    wxString s = event.GetString();
+    s.Replace( _T( "," ),_T( "." ) );
+    int i = wxAtoi( s );
+    if ( i < 0 || i > 59 )
+        i = 0;
+    logbookPlugIn->opt->courseTextAfterMinutes = wxString::Format( _T( "%i" ),i );
+    m_textCtrlStatusCourseMin->SetValue( wxString::Format( _T( "%i m" ),i ) );
 }
 
 void LogbookDialog::OnButtonClickStatusTimer( wxCommandEvent& event )
 {
-	TimerInterval* ti = new TimerInterval(this,logbookPlugIn->opt);
-	ti->ShowModal();
-	delete ti;
-        this->Raise();
+    TimerInterval* ti = new TimerInterval( this,logbookPlugIn->opt );
+    ti->ShowModal();
+    delete ti;
+    this->Raise();
 }
 
 void LogbookDialog::OnStatusBulletTimer( wxCommandEvent& event )
 {
-	static int on = 0;
+    static int on = 0;
+
+    on = setBulletColor( m_bpButtonTimer,&logbookPlugIn->opt->timer,on );
+    if ( logbookPlugIn->opt->timerType == 0 )
+        startNormalTimer();
 
-	on = setBulletColor(m_bpButtonTimer,&logbookPlugIn->opt->timer,on);
-	if(logbookPlugIn->opt->timerType == 0)
-		startNormalTimer();
-
-	if(!logbookPlugIn->opt->timer)
-		SetTitle(logbook->title);
-	else
-		SetTitle(logbook->title+titleExt);
+    if ( !logbookPlugIn->opt->timer )
+        SetTitle( logbook->title );
+    else
+        SetTitle( logbook->title+titleExt );
 }
 
 void LogbookDialog::OnStatusBulletWatch( wxCommandEvent& event )
 {
-	static int on = 0;
+    static int on = 0;
 
-	on = setBulletColor(m_bpButtonWatch,&logbookPlugIn->opt->guardChange,on);
+    on = setBulletColor( m_bpButtonWatch,&logbookPlugIn->opt->guardChange,on );
 }
 
 void LogbookDialog::OnStatusBulletWaypoint( wxCommandEvent& event )
 {
-	static int on = 0;
+    static int on = 0;
 
-	on = setBulletColor(m_bpButton8Waypoint,&logbookPlugIn->opt->waypointArrived,on);
+    on = setBulletColor( m_bpButton8Waypoint,&logbookPlugIn->opt->waypointArrived,on );
 }
 
 void LogbookDialog::OnStatusBulletDistance( wxCommandEvent& event )
 {
-	static int on = 0;
+    static int on = 0;
 
-	on = setBulletColor(m_bpButtonDistance,&logbookPlugIn->opt->everySM,on);
+    on = setBulletColor( m_bpButtonDistance,&logbookPlugIn->opt->everySM,on );
 }
 
 void LogbookDialog::OnStatusBulletCourse( wxCommandEvent& event )
 {
-	static int on = 0;
+    static int on = 0;
 
-	on = setBulletColor(m_bpButtonCourse,&logbookPlugIn->opt->courseChange,on);
+    on = setBulletColor( m_bpButtonCourse,&logbookPlugIn->opt->courseChange,on );
 }
 
 void LogbookDialog::OnButtonClickStatusStartStop( wxCommandEvent& event )
 {
-	if(checkBitmaps() == 2)
-		logbookPlugIn->eventsEnabled = false;
-	else if(checkBitmaps() == 1)
-		logbookPlugIn->eventsEnabled = true;
-	else
-		return;
-
-	if(logbookPlugIn->eventsEnabled)
-	{
-		m_buttonStartStop->SetLabel(_("Stop"));
-		logbookPlugIn->eventsEnabled = false;
-		m_staticTextStatusText->SetLabel(statusText[RUN]);
-#ifdef __WXMAC__
-
-    // on Mac, if a string contains "\n" then the size is not computed correctly in SetLabel(). This fixes it.
-    wxClientDC aDC(this);
-    wxSize aSize=aDC.GetMultiLineTextExtent(statusText[RUN]);
-    m_staticTextStatusText->SetClientSize(aSize);
-
-#endif 
-	}
-	else
-	{
-		m_buttonStartStop->SetLabel(_("Start"));
-		logbookPlugIn->eventsEnabled = true;
-		m_staticTextStatusText->SetLabel(statusText[SUSPEND]);
-#ifdef __WXMAC__
-
-    // on Mac, if a string contains "\n" then the size is not computed correctly in SetLabel(). This fixes it.
-    wxClientDC aDC(this);
-    wxSize aSize=aDC.GetMultiLineTextExtent(statusText[SUSPEND]);
-    m_staticTextStatusText->SetClientSize(aSize);
-
-#endif 
-	}
-	m_buttonStartStop->Refresh();
-	refreshBullets();
-	if(logbookPlugIn->opt->timer && logbookPlugIn->opt->timerType == 0)
-		startNormalTimer();
+    if ( checkBitmaps() == 2 )
+        logbookPlugIn->eventsEnabled = false;
+    else if ( checkBitmaps() == 1 )
+        logbookPlugIn->eventsEnabled = true;
+    else
+        return;
+
+    if ( logbookPlugIn->eventsEnabled )
+    {
+        m_buttonStartStop->SetLabel( _( "Stop" ) );
+        logbookPlugIn->eventsEnabled = false;
+        m_staticTextStatusText->SetLabel( statusText[RUN] );
+    }
+    else
+    {
+        m_buttonStartStop->SetLabel( _( "Start" ) );
+        logbookPlugIn->eventsEnabled = true;
+        m_staticTextStatusText->SetLabel( statusText[SUSPEND] );
+    }
+    m_buttonStartStop->Refresh();
+    refreshBullets();
+    if ( logbookPlugIn->opt->timer && logbookPlugIn->opt->timerType == 0 )
+        startNormalTimer();
 }
 
 void LogbookDialog::refreshBullets()
 {
-	Options* opt = logbookPlugIn->opt;
+    Options* opt = logbookPlugIn->opt;
 
-	if(!logbookPlugIn->eventsEnabled)
-	{
-		if(opt->timer)				{ setBulletColorAllStates(m_bpButtonTimer,*_img_Bullet_green); m_bpButtonTimer->state = 2; }
-		if(opt->guardChange)		{ setBulletColorAllStates(m_bpButtonWatch,*_img_Bullet_green); m_bpButtonWatch->state = 2; }
-		if(opt->waypointArrived)	{ setBulletColorAllStates(m_bpButton8Waypoint,*_img_Bullet_green); m_bpButton8Waypoint->state = 2; }
-		if(opt->everySM)			{ setBulletColorAllStates(m_bpButtonDistance,*_img_Bullet_green); m_bpButtonDistance->state = 2; }
-		if(opt->courseChange)		{ setBulletColorAllStates(m_bpButtonCourse,*_img_Bullet_green); m_bpButtonCourse->state = 2; }
-	}
-	else
-	{
-		if(opt->timer)				{ setBulletColorAllStates(m_bpButtonTimer,*_img_Bullet_yellow); m_bpButtonTimer->state = 1; }
-		if(opt->guardChange)		{ setBulletColorAllStates(m_bpButtonWatch,*_img_Bullet_yellow); m_bpButtonWatch->state = 1; }
-		if(opt->waypointArrived)	{ setBulletColorAllStates(m_bpButton8Waypoint,*_img_Bullet_yellow); m_bpButton8Waypoint->state = 1; }
-		if(opt->everySM)			{ setBulletColorAllStates(m_bpButtonDistance,*_img_Bullet_yellow); m_bpButtonDistance->state = 1; }
-		if(opt->courseChange)		{ setBulletColorAllStates(m_bpButtonCourse,*_img_Bullet_yellow); m_bpButtonCourse->state = 1; }
-	}
+    if ( !logbookPlugIn->eventsEnabled )
+    {
+        if ( opt->timer )
+        {
+            setBulletColorAllStates( m_bpButtonTimer,*_img_Bullet_green );
+            m_bpButtonTimer->state = 2;
+        }
+        if ( opt->guardChange )
+        {
+            setBulletColorAllStates( m_bpButtonWatch,*_img_Bullet_green );
+            m_bpButtonWatch->state = 2;
+        }
+        if ( opt->waypointArrived )
+        {
+            setBulletColorAllStates( m_bpButton8Waypoint,*_img_Bullet_green );
+            m_bpButton8Waypoint->state = 2;
+        }
+        if ( opt->everySM )
+        {
+            setBulletColorAllStates( m_bpButtonDistance,*_img_Bullet_green );
+            m_bpButtonDistance->state = 2;
+        }
+        if ( opt->courseChange )
+        {
+            setBulletColorAllStates( m_bpButtonCourse,*_img_Bullet_green );
+            m_bpButtonCourse->state = 2;
+        }
+    }
+    else
+    {
+        if ( opt->timer )
+        {
+            setBulletColorAllStates( m_bpButtonTimer,*_img_Bullet_yellow );
+            m_bpButtonTimer->state = 1;
+        }
+        if ( opt->guardChange )
+        {
+            setBulletColorAllStates( m_bpButtonWatch,*_img_Bullet_yellow );
+            m_bpButtonWatch->state = 1;
+        }
+        if ( opt->waypointArrived )
+        {
+            setBulletColorAllStates( m_bpButton8Waypoint,*_img_Bullet_yellow );
+            m_bpButton8Waypoint->state = 1;
+        }
+        if ( opt->everySM )
+        {
+            setBulletColorAllStates( m_bpButtonDistance,*_img_Bullet_yellow );
+            m_bpButtonDistance->state = 1;
+        }
+        if ( opt->courseChange )
+        {
+            setBulletColorAllStates( m_bpButtonCourse,*_img_Bullet_yellow );
+            m_bpButtonCourse->state = 1;
+        }
+    }
 }
 
 void LogbookDialog::resetBullets()
 {
-	setBulletColorAllStates(m_bpButtonTimer,*_img_Bullet_red); m_bpButtonTimer->state = 0;
-	setBulletColorAllStates(m_bpButtonWatch,*_img_Bullet_red); m_bpButtonTimer->state = 0;
-	setBulletColorAllStates(m_bpButton8Waypoint,*_img_Bullet_red); m_bpButtonTimer->state = 0;
-	setBulletColorAllStates(m_bpButtonDistance,*_img_Bullet_red); m_bpButtonTimer->state = 0;
-	setBulletColorAllStates(m_bpButtonCourse,*_img_Bullet_red); m_bpButtonTimer->state = 0;
-}
-
-int LogbookDialog::setBulletColor(myBitmapButton* button, bool* option, int on)
-{
-
-	if(!logbookPlugIn->eventsEnabled && !*option)
-	{
-		setBulletColorAllStates(button, *_img_Bullet_green);
-		button->state = 2;
-		*option = true;
-		on = 2;
-	}
-	else if(logbookPlugIn->eventsEnabled && !*option)
-	{
-		setBulletColorAllStates(button, *_img_Bullet_yellow);
-		button->state = 1;
-		*option = true;
-		on = 1;
-	}
-	else
-	{
-		setBulletColorAllStates(button, *_img_Bullet_red);
-		button->state = 0;
-		*option = false;
-		on = 0;
-	}
-
-	button->Refresh();
-	checkBitmaps();
-	return on;
-}
-
-void LogbookDialog::setBulletColorAllStates(myBitmapButton* button, wxBitmap bmp)
-{
-		button->SetBitmapLabel(bmp);
-		button->SetBitmapHover(bmp);
-		button->SetBitmapSelected(bmp);
+    setBulletColorAllStates( m_bpButtonTimer,*_img_Bullet_red );
+    m_bpButtonTimer->state = 0;
+    setBulletColorAllStates( m_bpButtonWatch,*_img_Bullet_red );
+    m_bpButtonTimer->state = 0;
+    setBulletColorAllStates( m_bpButton8Waypoint,*_img_Bullet_red );
+    m_bpButtonTimer->state = 0;
+    setBulletColorAllStates( m_bpButtonDistance,*_img_Bullet_red );
+    m_bpButtonTimer->state = 0;
+    setBulletColorAllStates( m_bpButtonCourse,*_img_Bullet_red );
+    m_bpButtonTimer->state = 0;
+}
+
+int LogbookDialog::setBulletColor( myBitmapButton* button, bool* option, int on )
+{
+
+    if ( !logbookPlugIn->eventsEnabled && !*option )
+    {
+        setBulletColorAllStates( button, *_img_Bullet_green );
+        button->state = 2;
+        *option = true;
+        on = 2;
+    }
+    else if ( logbookPlugIn->eventsEnabled && !*option )
+    {
+        setBulletColorAllStates( button, *_img_Bullet_yellow );
+        button->state = 1;
+        *option = true;
+        on = 1;
+    }
+    else
+    {
+        setBulletColorAllStates( button, *_img_Bullet_red );
+        button->state = 0;
+        *option = false;
+        on = 0;
+    }
+
+    button->Refresh();
+    checkBitmaps();
+    return on;
+}
+
+void LogbookDialog::setBulletColorAllStates( myBitmapButton* button, wxBitmap bmp )
+{
+    button->SetBitmapLabel( bmp );
+    button->SetBitmapHover( bmp );
+    button->SetBitmapSelected( bmp );
 #if wxCHECK_VERSION(2, 9, 0)
-		button->SetBitmapCurrent(bmp);
+    button->SetBitmapCurrent( bmp );
 #endif
-		button->SetBitmapFocus(bmp);
+    button->SetBitmapFocus( bmp );
 }
 
 int LogbookDialog::checkBitmaps()
 {
-	if(m_bpButtonTimer->state == 1 ||
-		m_bpButtonWatch->state == 1 ||
-		m_bpButton8Waypoint->state == 1 ||
-		m_bpButtonDistance->state == 1 ||
-		m_bpButtonCourse->state == 1)
-	{
-		m_buttonStartStop->SetLabel(_("Start"));
-		m_buttonStartStop->Enable(true);
-		logbookPlugIn->eventsEnabled = true;
-		m_staticTextStatusText->SetLabel(statusText[SUSPEND]);
-#ifdef __WXMAC__
-
-    // on Mac, if a string contains "\n" then the size is not computed correctly in SetLabel(). This fixes it.
-    wxClientDC aDC(this);
-    wxSize aSize=aDC.GetMultiLineTextExtent(statusText[SUSPEND]);
-    m_staticTextStatusText->SetClientSize(aSize);
-
-#endif
-
-		return 1;
-	}
-	else if(m_bpButtonTimer->state == 2 ||
-			m_bpButtonWatch->state == 2 ||
-			m_bpButton8Waypoint->state == 2 ||
-			m_bpButtonDistance->state == 2 ||
-			m_bpButtonCourse->state == 2)
-	{
-		m_buttonStartStop->SetLabel(_("Stop"));
-		m_buttonStartStop->Enable(true);
-		logbookPlugIn->eventsEnabled = false;
-		m_staticTextStatusText->SetLabel(statusText[RUN]);
-#ifdef __WXMAC__
-
-    // on Mac, if a string contains "\n" then the size is not computed correctly in SetLabel(). This fixes it.
-    wxClientDC aDC(this);
-    wxSize aSize=aDC.GetMultiLineTextExtent(statusText[RUN]);
-    m_staticTextStatusText->SetClientSize(aSize);
-
-#endif
-		return 2;
-	}
-	else 
-	{
-		logbookPlugIn->eventsEnabled = false;
-		m_buttonStartStop->Enable(false);
-		m_staticTextStatusText->SetLabel(statusText[STOP]);
-#ifdef __WXMAC__
-
-    // on Mac, if a string contains "\n" then the size is not computed correctly in SetLabel(). This fixes it.
-    wxClientDC aDC(this);
-    wxSize aSize=aDC.GetMultiLineTextExtent(statusText[STOP]);
-    m_staticTextStatusText->SetClientSize(aSize);
+    if ( m_bpButtonTimer->state == 1 ||
+            m_bpButtonWatch->state == 1 ||
+            m_bpButton8Waypoint->state == 1 ||
+            m_bpButtonDistance->state == 1 ||
+            m_bpButtonCourse->state == 1 )
+    {
+        m_buttonStartStop->SetLabel( _( "Start" ) );
+        m_buttonStartStop->Enable( true );
+        logbookPlugIn->eventsEnabled = true;
+        m_staticTextStatusText->SetLabel( statusText[SUSPEND] );
 
-#endif
-		return 0;
-	}
+        return 1;
+    }
+    else if ( m_bpButtonTimer->state == 2 ||
+              m_bpButtonWatch->state == 2 ||
+              m_bpButton8Waypoint->state == 2 ||
+              m_bpButtonDistance->state == 2 ||
+              m_bpButtonCourse->state == 2 )
+    {
+        m_buttonStartStop->SetLabel( _( "Stop" ) );
+        m_buttonStartStop->Enable( true );
+        logbookPlugIn->eventsEnabled = false;
+        m_staticTextStatusText->SetLabel( statusText[RUN] );
+        return 2;
+    }
+    else
+    {
+        logbookPlugIn->eventsEnabled = false;
+        m_buttonStartStop->Enable( false );
+        m_staticTextStatusText->SetLabel( statusText[STOP] );
+        return 0;
+    }
 }
 
 void LogbookDialog::OnMenuSelectionShutdown( wxCommandEvent& event )
 {
-	event.Skip();
-	logbookPlugIn->shutdown(true);
+    event.Skip();
+    logbookPlugIn->shutdown( true );
 }
 
 void LogbookDialog::clearDataDir()
 {
-	wxString data = *pHome_Locn;
-	data.Append(_T("data"));
-	data.Append(wxFileName::GetPathSeparator());
-
-	wxString f = wxFindFirstFile(data+_T("*.tmp"));
-	while ( !f.empty() )
-	{
-		wxRemoveFile(f);
-		f = wxFindNextFile();
-	}
-
-	f = wxFindFirstFile(data+_T("*.html"));
-	while ( !f.empty() )
-	{
-		wxRemoveFile(f);
-		f = wxFindNextFile();
-	}
-
-	f = wxFindFirstFile(data+_T("*.odt"));
-	while ( !f.empty() )
-	{
-		wxRemoveFile(f);
-		f = wxFindNextFile();
-	}
+    wxString data = Home_Locn;
+
+    wxString f = wxFindFirstFile( data+_T( "*.tmp" ) );
+    while ( !f.empty() )
+    {
+        wxRemoveFile( f );
+        f = wxFindNextFile();
+    }
+
+    f = wxFindFirstFile( data+_T( "*.html" ) );
+    while ( !f.empty() )
+    {
+        wxRemoveFile( f );
+        f = wxFindNextFile();
+    }
+
+    f = wxFindFirstFile( data+_T( "*.odt" ) );
+    while ( !f.empty() )
+    {
+        wxRemoveFile( f );
+        f = wxFindNextFile();
+    }
 }
 
 
 void LogbookDialog::OnGridLabelLeftDClickGlobal( wxGridEvent& ev )
 {
-	if(ev.GetCol() == -1) return;
-	selGridCol = ev.GetCol();
-	navigationHideColumn(ev);
+    if ( ev.GetCol() == -1 ) return;
+    selGridCol = ev.GetCol();
+    navigationHideColumn( ev );
 }
 
 void LogbookDialog::OnGridLabelLeftDClickWeather( wxGridEvent& ev )
 {
-	if(ev.GetCol() == -1) return;
-	selGridCol = ev.GetCol();
-	navigationHideColumn(ev);
+    if ( ev.GetCol() == -1 ) return;
+    selGridCol = ev.GetCol();
+    navigationHideColumn( ev );
 }
 
 void LogbookDialog::OnGridLabelLeftDClickMotorSails( wxGridEvent& ev )
 {
-	if(ev.GetCol() == -1) return;
-	selGridCol = ev.GetCol();
-	navigationHideColumn(ev);
+    if ( ev.GetCol() == -1 ) return;
+    selGridCol = ev.GetCol();
+    navigationHideColumn( ev );
 }
 
-void LogbookDialog::m_menu1Highlighted(wxMenuEvent& ev)
+void LogbookDialog::m_menu1Highlighted( wxMenuEvent& ev )
 {
-	wxMessageBox(m_menu1->GetLabel(ev.GetMenuId()));
+    wxMessageBox( m_menu1->GetLabel( ev.GetMenuId() ) );
 }
 
 void LogbookDialog::OnMenuSelectionSearch( wxCommandEvent& event )
 {
-	logbook->showSearchDlg(selGridRow,selGridCol);
+    logbook->showSearchDlg( selGridRow,selGridCol );
 }
 
-void LogbookDialog::OnMenuSelectionHideColumn(wxCommandEvent& ev)
+void LogbookDialog::OnMenuSelectionHideColumn( wxCommandEvent& ev )
 {
-	navigationHideColumn(ev);	
+    navigationHideColumn( ev );
 }
 
-void LogbookDialog::navigationHideColumn(wxCommandEvent& ev)
+void LogbookDialog::navigationHideColumn( wxCommandEvent& ev )
 {
-	int selGrid = this->m_notebook8->GetSelection();
-	int count = 0;
+    int selGrid = this->m_notebook8->GetSelection();
+    int count = 0;
 
-	for(int i = 0; i < logGrids[selGrid]->GetNumberCols() && count < 2; i++)
-		if(logGrids[selGrid]->GetColumnWidth(i) > 0)
-			count++;
+    for ( int i = 0; i < logGrids[selGrid]->GetNumberCols() && count < 2; i++ )
+        if ( logGrids[selGrid]->GetColumnWidth( i ) > 0 )
+            count++;
 
-	if(count < 2) return;
+    if ( count < 2 ) return;
 
-	logGrids[selGrid]->SetColumnWidth(selGridCol,0);
-	if(previousColumn != selGridCol)
-		logGrids[selGrid]->SetGridCursor(selGridRow,previousColumn);
-	selGridCol = previousColumn;
-	logGrids[selGrid]->Refresh();
+    logGrids[selGrid]->SetColumnWidth( selGridCol,0 );
+    if ( previousColumn != selGridCol )
+        logGrids[selGrid]->SetGridCursor( selGridRow,previousColumn );
+    selGridCol = previousColumn;
+    logGrids[selGrid]->Refresh();
 }
 
 void LogbookDialog::m_gridGlobalOnKeyDown( wxKeyEvent& ev )
 {
-	noOpenPositionDlg = true;
-	wxTextCtrl *ctrl = (wxTextCtrl*)ev.GetEventObject();
+    noOpenPositionDlg = true;
+    wxTextCtrl *ctrl = ( wxTextCtrl* )ev.GetEventObject();
+
+    selGridCol  = logGrids[m_notebook8->GetSelection()]->GetGridCursorCol();
+
+    if ( ev.ShiftDown() && ev.GetKeyCode() == WXK_RETURN )
+    {
+        if ( ev.GetEventObject()->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+            ctrl->WriteText( wxT( "\n" ) );
+        return;
+    }
+
+    if ( ev.GetKeyCode() == WXK_RETURN )
+    {
+        noOpenPositionDlg = false;
+
+        ev.Skip();
+        setEqualRowHeight( selGridRow );
+        for ( int i = 0; i < LOGGRIDS; i++ )
+            logGrids[i]->Refresh();
+        return;
+    }
+
+    if ( ( ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) || ( ev.GetKeyCode() == WXK_LEFT ) )
+    {
+        if ( selGridCol == 0 )
+        {
+            if ( m_notebook8->GetSelection() == 0 )
+                m_notebook8->SetSelection( 2 );
+            else
+                m_notebook8->SetSelection( m_notebook8->GetSelection()-1 );
+            selGridCol = logGrids[m_notebook8->GetSelection()]->GetNumberCols()-1;
+            logGrids[m_notebook8->GetSelection()]->SetFocus();
+            logGrids[m_notebook8->GetSelection()]->SetGridCursor( selGridRow,selGridCol );
+            logGrids[m_notebook8->GetSelection()]->MakeCellVisible( selGridRow,selGridCol );
 
-	selGridCol  = logGrids[m_notebook8->GetSelection()]->GetGridCursorCol();
+            checkHiddenColumns( logGrids[m_notebook8->GetSelection()],-1,true );
+        }
+        else
+        {
+            if ( checkHiddenColumns( logGrids[m_notebook8->GetSelection()],-1,true ) )
+                ev.Skip();
+        }
+        return;
+    }
+
+    if ( ev.GetKeyCode() == WXK_TAB || ev.GetKeyCode() == WXK_RIGHT )
+    {
+        if ( selGridCol == logGrids[m_notebook8->GetSelection()]->GetNumberCols()-1 )
+        {
+            if ( m_notebook8->GetSelection() == LOGGRIDS - 1 )
+                m_notebook8->SetSelection( 0 );
+            else
+                m_notebook8->SetSelection( m_notebook8->GetSelection()+1 );
+            selGridCol = 0;
+            logGrids[m_notebook8->GetSelection()]->SetFocus();
+            logGrids[m_notebook8->GetSelection()]->SetGridCursor( selGridRow,selGridCol );
+            logGrids[m_notebook8->GetSelection()]->MakeCellVisible( selGridRow,selGridCol );
 
-	if (ev.ShiftDown() && ev.GetKeyCode() == WXK_RETURN)
-	{	
-		if(ev.GetEventObject()->IsKindOf(CLASSINFO(wxTextCtrl)))	
-			ctrl->WriteText( wxT("\n") );
-		return;
-	}
-
-	if (ev.GetKeyCode() == WXK_RETURN)
-	{	
-		noOpenPositionDlg = false;
-
-		ev.Skip();
-		setEqualRowHeight(selGridRow);
-		for(int i = 0; i < LOGGRIDS; i++)
-			logGrids[i]->Refresh();
-		return;
-	}
-
-	if ((ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || (ev.GetKeyCode() == WXK_LEFT))
-	{	
-		if(selGridCol == 0)
-		{
-			if(m_notebook8->GetSelection() == 0)
-				m_notebook8->SetSelection(2);
-			else
-				m_notebook8->SetSelection(m_notebook8->GetSelection()-1);
-			selGridCol = logGrids[m_notebook8->GetSelection()]->GetNumberCols()-1;
-			logGrids[m_notebook8->GetSelection()]->SetFocus();
-			logGrids[m_notebook8->GetSelection()]->SetGridCursor(selGridRow,selGridCol);
-			logGrids[m_notebook8->GetSelection()]->MakeCellVisible(selGridRow,selGridCol);
-
-			checkHiddenColumns(logGrids[m_notebook8->GetSelection()],-1,true);
-		}
-		else
-		{
-			if(checkHiddenColumns(logGrids[m_notebook8->GetSelection()],-1,true))
-				ev.Skip();
-		}
-		return;
-	}
-
-	if (ev.GetKeyCode() == WXK_TAB || ev.GetKeyCode() == WXK_RIGHT)
-	{	
-		if(selGridCol == logGrids[m_notebook8->GetSelection()]->GetNumberCols()-1)
-		{
-			if(m_notebook8->GetSelection() == LOGGRIDS - 1)
-				m_notebook8->SetSelection(0);
-			else
-				m_notebook8->SetSelection(m_notebook8->GetSelection()+1);
-			selGridCol = 0;
-			logGrids[m_notebook8->GetSelection()]->SetFocus();
-			logGrids[m_notebook8->GetSelection()]->SetGridCursor(selGridRow,selGridCol);
-			logGrids[m_notebook8->GetSelection()]->MakeCellVisible(selGridRow,selGridCol);
-
-			checkHiddenColumns(logGrids[m_notebook8->GetSelection()],1,true);
-		}
-		else
-		{
-			if(checkHiddenColumns(logGrids[m_notebook8->GetSelection()],1,true))
-				ev.Skip();
-		}
-		return;
-	}
-    else 
-	{
+            checkHiddenColumns( logGrids[m_notebook8->GetSelection()],1,true );
+        }
+        else
+        {
+            if ( checkHiddenColumns( logGrids[m_notebook8->GetSelection()],1,true ) )
+                ev.Skip();
+        }
+        return;
+    }
+    else
+    {
         ev.Skip () ;
-	}
+    }
 }
 
-bool LogbookDialog::checkHiddenColumns(wxGrid* grid,int i, bool use)
+bool LogbookDialog::checkHiddenColumns( wxGrid* grid,int i, bool use )
 {
-	bool skip = true;
+    bool skip = true;
+
+    while ( ( selGridCol+i <= grid->GetNumberCols() ) && ( selGridCol+i >= 0 ) )
+    {
+        if ( grid->GetColSize( selGridCol+i ) == 0 )
+            selGridCol += i;
+        else
+            break;
+
+        if ( ( selGridCol == 0  && i == -1 ) && use )
+        {
+            if ( m_notebook8->GetSelection() == 0 )
+                m_notebook8->SetSelection( 2 );
+            else if ( m_notebook8->GetSelection() == 1 )
+                m_notebook8->SetSelection( 0 );
+            else
+                m_notebook8->SetSelection( 1 );
+
+            grid = logGrids[m_notebook8->GetSelection()];
+            selGridCol = grid->GetNumberCols()-1;
+            grid->SetFocus();
+            grid->SetGridCursor( selGridRow,selGridCol );
+            grid->MakeCellVisible( selGridRow,selGridCol );
+            checkHiddenColumns( grid, i, false );
+            return true;
+        }
+
+        if ( ( selGridCol == grid->GetNumberCols()-1 && i == 1 ) && use )
+        {
+            if ( m_notebook8->GetSelection() == 0 )
+                m_notebook8->SetSelection( 1 );
+            else if ( m_notebook8->GetSelection() == 1 )
+                m_notebook8->SetSelection( 2 );
+            else
+                m_notebook8->SetSelection( 0 );
+
+            selGridCol = 0;
+            grid = logGrids[m_notebook8->GetSelection()];
+            grid->SetFocus();
+            grid->SetGridCursor( selGridRow,selGridCol );
+            grid->MakeCellVisible( selGridRow,selGridCol );
+            if ( m_notebook8->GetSelection() == 0 )
+                selGridCol--;
+            checkHiddenColumns( grid, i, false );
+            return true;
+        }
+
+        grid = logGrids[m_notebook8->GetSelection()];
 
-	while((selGridCol+i <= grid->GetNumberCols()) && (selGridCol+i >= 0))
-	{
-		if(grid->GetColSize(selGridCol+i) == 0)
-			selGridCol += i;
-		else
-			break;
-		
-		if((selGridCol == 0  && i == -1) && use)
-		{
-			  if(m_notebook8->GetSelection() == 0)
-				m_notebook8->SetSelection(2);
-			  else if(m_notebook8->GetSelection() == 1)
-				m_notebook8->SetSelection(0);
-			  else
-				m_notebook8->SetSelection(1);
-
-			  grid = logGrids[m_notebook8->GetSelection()];
-			  selGridCol = grid->GetNumberCols()-1;
-			  grid->SetFocus();
-			  grid->SetGridCursor(selGridRow,selGridCol);
-			  grid->MakeCellVisible(selGridRow,selGridCol);
-			  checkHiddenColumns(grid, i, false);
-			  return true;
-		}
-
-			if((selGridCol == grid->GetNumberCols()-1 && i == 1) && use)
-			{
-			  if(m_notebook8->GetSelection() == 0)
-				m_notebook8->SetSelection(1);
-			  else if(m_notebook8->GetSelection() == 1)
-				m_notebook8->SetSelection(2);
-			  else
-				m_notebook8->SetSelection(0);
-
-			  selGridCol = 0;
-			  grid = logGrids[m_notebook8->GetSelection()];
-			  grid->SetFocus();
-			  grid->SetGridCursor(selGridRow,selGridCol);
-			  grid->MakeCellVisible(selGridRow,selGridCol);
-			  if(m_notebook8->GetSelection() == 0)
-				 selGridCol--;
-			  checkHiddenColumns(grid, i, false);
-			  return true;
-			}
-
-			grid = logGrids[m_notebook8->GetSelection()];
-		
-
-	}
-	grid->SetGridCursor(selGridRow,selGridCol);
-	return skip;
+
+    }
+    grid->SetGridCursor( selGridRow,selGridCol );
+    return skip;
 }
 
 void LogbookDialog::OnGridCellLeftClickGlobal( wxGridEvent& event )
 {
-	noOpenPositionDlg = false;
-	event.Skip();
+    noOpenPositionDlg = false;
+    event.Skip();
 }
 
 void LogbookDialog::gridGlobalScrolled( wxScrollWinEvent& ev )
 {
-	ev.Skip();
-	m_gridWeather->HandleOnScroll(ev);
-	m_gridMotorSails->HandleOnScroll(ev);
+    ev.Skip();
+    m_gridWeather->HandleOnScroll( ev );
+    m_gridMotorSails->HandleOnScroll( ev );
 }
 
 void LogbookDialog::gridWeatherScrolled( wxScrollWinEvent& ev )
 {
-	ev.Skip();
-	m_gridGlobal->HandleOnScroll(ev);
-	m_gridMotorSails->HandleOnScroll(ev);
+    ev.Skip();
+    m_gridGlobal->HandleOnScroll( ev );
+    m_gridMotorSails->HandleOnScroll( ev );
 }
 
 void LogbookDialog::gridMotorSailsScrolled( wxScrollWinEvent& ev )
 {
-	ev.Skip();
-	m_gridWeather->HandleOnScroll(ev);
-	m_gridGlobal->HandleOnScroll(ev);
+    ev.Skip();
+    m_gridWeather->HandleOnScroll( ev );
+    m_gridGlobal->HandleOnScroll( ev );
 }
 
 void LogbookDialog::m_gridMotorSailsOnKeyDown( wxKeyEvent& ev )
 {
-	m_gridGlobalOnKeyDown( ev );
+    m_gridGlobalOnKeyDown( ev );
 }
 
 void LogbookDialog::m_gridWeatherOnKeyDown( wxKeyEvent& ev )
 {
-	m_gridGlobalOnKeyDown( ev );
+    m_gridGlobalOnKeyDown( ev );
 }
 
 void LogbookDialog::newLogbookOnButtonClick( wxCommandEvent& ev )
 {
-	logbook->newLogbook();
+    logbook->newLogbook();
 }
 
 void LogbookDialog::selLogbookOnButtonClick( wxCommandEvent& ev )
 {
-	logbook->selectLogbook();
+    logbook->selectLogbook();
 }
 
-void LogbookDialog::onButtonReloadLayoutLogbook(wxCommandEvent & ev)
+void LogbookDialog::onButtonReloadLayoutLogbook( wxCommandEvent & ev )
 {
-	loadLayoutChoice(LogbookDialog::LOGBOOK,logbook->layout_locn,logbookChoice,logbookPlugIn->opt->layoutPrefix[LogbookDialog::LOGBOOK]);
-	logGrids[m_logbook->GetSelection()]->SetFocus();
+    loadLayoutChoice( LogbookDialog::LOGBOOK,logbook->layout_locn,logbookChoice,logbookPlugIn->opt->layoutPrefix[LogbookDialog::LOGBOOK] );
+    logGrids[m_logbook->GetSelection()]->SetFocus();
 }
 
-void LogbookDialog::onButtonClickEditLayoutLogbook(wxCommandEvent & ev)
+void LogbookDialog::onButtonClickEditLayoutLogbook( wxCommandEvent & ev )
 {
-	int format;
+    int format;
 
-	if(m_radioBtnODT->GetValue())
-		format = ODT;
-	else
-		format = HTML;
+    if ( m_radioBtnODT->GetValue() )
+        format = ODT;
+    else
+        format = HTML;
 
-	showLayoutDialog(LogbookDialog::LOGBOOK, logbookChoice,logbook->layout_locn, format);
-	logGrids[m_logbook->GetSelection()]->SetFocus();
-	this->Raise();
+    showLayoutDialog( LogbookDialog::LOGBOOK, logbookChoice,logbook->layout_locn, format );
+    logGrids[m_logbook->GetSelection()]->SetFocus();
+    this->Raise();
 }
 
-int LogbookDialog::showLayoutDialog(int grid, wxChoice *choice, wxString location, int format)
+int LogbookDialog::showLayoutDialog( int grid, wxChoice *choice, wxString location, int format )
 {
-	wxString layout = choice->GetString(choice->GetSelection());
-	int sel = choice->GetSelection();
+    wxString layout = choice->GetString( choice->GetSelection() );
+    int sel = choice->GetSelection();
     int filterSel = 0;
-	wxString fmt;
+    wxString fmt;
 
-	if(format)
-		fmt = _T(".odt");
-	else
-		fmt = _T(".html");
+    if ( format )
+        fmt = _T( ".odt" );
+    else
+        fmt = _T( ".html" );
 
-	LayoutDialog* dlg = new LayoutDialog(this,location,choice);
-	dlg->SetTitle(layout);
+    LayoutDialog* dlg = new LayoutDialog( this,location,choice );
+    dlg->SetTitle( layout );
 
-	wxArrayString ar;
-	ar.Add(_("none"));
+    wxArrayString ar;
+    ar.Add( _( "none" ) );
 
     wxArrayString files;
-    wxDir::GetAllFiles(location,&files);
-	for(unsigned int r = 0; r < files.GetCount(); r++)
-	{
-        wxFileName fn(files[r]);
+    wxDir::GetAllFiles( location,&files );
+    for ( unsigned int r = 0; r < files.GetCount(); r++ )
+    {
+        wxFileName fn( files[r] );
         wxString g = fn.GetName();
-        if(!g.Contains(_T("_"))) continue;
-        if(m_logbook->GetSelection() == 0)
-            g.Remove(0,1);
-		g = g.substr(0,g.find_first_of('_')+1);
-
-		if(!isInArrayString(ar,g))
-			ar.Add(g);
-	}
-
-	dlg->m_choice15->Clear();
-	dlg->m_choice15->Append(ar);
-    for(unsigned int i = 0; i < dlg->m_choice15->GetCount(); i++)
-        if(dlg->m_choice15->GetString(i) == logbookPlugIn->opt->layoutPrefix[grid])
+        if ( !g.Contains( _T( "_" ) ) ) continue;
+        if ( m_logbook->GetSelection() == 0 )
+            g.Remove( 0,1 );
+        g = g.substr( 0,g.find_first_of( '_' )+1 );
+
+        if ( !isInArrayString( ar,g ) )
+            ar.Add( g );
+    }
+
+    dlg->m_choice15->Clear();
+    dlg->m_choice15->Append( ar );
+    for ( unsigned int i = 0; i < dlg->m_choice15->GetCount(); i++ )
+        if ( dlg->m_choice15->GetString( i ) == logbookPlugIn->opt->layoutPrefix[grid] )
         {
             filterSel = i;
             break;
         }
 
-/*	if(filterSel == 0)
-{
-    logbookPlugIn->opt->filterLayout[grid] = false;
-    dlg->m_choice15->SetSelection(0);
-}
-else
-{
-    dlg->m_choice15->SetSelection(filterSel);
-    logbookPlugIn->opt->filterLayout[grid] = true;
-}
-*/
-    dlg->m_choice15->SetSelection(filterSel);
+    /*	if(filterSel == 0)
+    {
+        logbookPlugIn->opt->filterLayout[grid] = false;
+        dlg->m_choice15->SetSelection(0);
+    }
+    else
+    {
+        dlg->m_choice15->SetSelection(filterSel);
+        logbookPlugIn->opt->filterLayout[grid] = true;
+    }
+    */
+    dlg->m_choice15->SetSelection( filterSel );
 
-    if(filterSel != 0 && logbookPlugIn->opt->filterLayout[grid])
-        layout.Prepend(logbookPlugIn->opt->layoutPrefix[grid]);
+    if ( filterSel != 0 && logbookPlugIn->opt->filterLayout[grid] )
+        layout.Prepend( logbookPlugIn->opt->layoutPrefix[grid] );
 
-    dlg->m_textCtrlRename->SetValue(layout);
-    dlg->m_radioBtnEdit->SetValue(true);
+    dlg->m_textCtrlRename->SetValue( layout );
+    dlg->m_radioBtnEdit->SetValue( true );
 
-    if(m_logbook->GetSelection() == 0 && filterSel != 0)
-        layout.Prepend(logbookPlugIn->opt->engineStr[logbookPlugIn->opt->engines]);
+    if ( m_logbook->GetSelection() == 0 && filterSel != 0 )
+        layout.Prepend( logbookPlugIn->opt->engineStr[logbookPlugIn->opt->engines] );
 
 
     layout = location + layout + fmt;
 
-    loadLayoutChoice(grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid]);
-	choice->SetSelection(sel);
+    loadLayoutChoice( grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid] );
+    choice->SetSelection( sel );
+
+    if ( dlg->ShowModal() == wxID_CANCEL )
+        return -1;
 
-	if (dlg->ShowModal() == wxID_CANCEL)
-            return -1;
-	
-	if(dlg->m_radioBtnEdit->GetValue())
-	{
-		if(m_radioBtnODT->GetValue())
-			startApplication(layout,fmt);
-		else
-			startApplication(layout, fmt);
-	}
-	else if(dlg->m_radioBtnFilter->GetValue())
-	{
-		if((filterSel = dlg->m_choice15->GetSelection()) != 0)
-		{
-			logbookPlugIn->opt->filterLayout[grid] = true;
-            logbookPlugIn->opt->layoutPrefix[grid] = dlg->m_choice15->GetString(filterSel);
-		}
-		else
+    if ( dlg->m_radioBtnEdit->GetValue() )
+    {
+        if ( m_radioBtnODT->GetValue() )
+            startApplication( layout,fmt );
+        else
+            startApplication( layout, fmt );
+    }
+    else if ( dlg->m_radioBtnFilter->GetValue() )
+    {
+        if ( ( filterSel = dlg->m_choice15->GetSelection() ) != 0 )
+        {
+            logbookPlugIn->opt->filterLayout[grid] = true;
+            logbookPlugIn->opt->layoutPrefix[grid] = dlg->m_choice15->GetString( filterSel );
+        }
+        else
         {
             logbookPlugIn->opt->filterLayout[grid] = false;
-            logbookPlugIn->opt->layoutPrefix[grid] = dlg->m_choice15->GetString(0);
+            logbookPlugIn->opt->layoutPrefix[grid] = dlg->m_choice15->GetString( 0 );
         }
 
-		loadLayoutChoice(grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid]);
+        loadLayoutChoice( grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid] );
         return 1;
-	}
-	else if(dlg->m_radioBtnRename->GetValue())
-	{
-		wxString t = dlg->m_textCtrlRename->GetValue();
-        if(m_logbook->GetSelection() == 0 && (t.GetChar(0) !=  '1' && t.GetChar(0) != '2'))
-            t.Prepend(logbookPlugIn->opt->engineStr[logbookPlugIn->opt->engines]);
-        wxRenameFile(layout,location+t+fmt);
-        loadLayoutChoice(grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid]);
-		return 2;
-	}
-	else if(dlg->m_radioBtnDelete->GetValue())
-	{
-		::wxRemoveFile(layout);
-		loadLayoutChoice(grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid]);
-		return 3;
-	}
-	else if(dlg->m_radioBtnEmail->GetValue())
-	{
-		wxString command = logbookPlugIn->opt->mailClient;
-#ifdef __WXMSW__		
-		wxExecute(command + _T(" /mailurl:mailto:myfriend@xy.xy?subject=LogbookKonni-Layout&body=Drag and Drop file here"));			
-		wxExecute(_T("explorer.exe /select,")+layout);
+    }
+    else if ( dlg->m_radioBtnRename->GetValue() )
+    {
+        wxString t = dlg->m_textCtrlRename->GetValue();
+        if ( m_logbook->GetSelection() == 0 && ( t.GetChar( 0 ) !=  '1' && t.GetChar( 0 ) != '2' ) )
+            t.Prepend( logbookPlugIn->opt->engineStr[logbookPlugIn->opt->engines] );
+        wxRenameFile( layout,location+t+fmt );
+        loadLayoutChoice( grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid] );
+        return 2;
+    }
+    else if ( dlg->m_radioBtnDelete->GetValue() )
+    {
+        ::wxRemoveFile( layout );
+        loadLayoutChoice( grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid] );
+        return 3;
+    }
+    else if ( dlg->m_radioBtnEmail->GetValue() )
+    {
+        wxString command = logbookPlugIn->opt->mailClient;
+#ifdef __WXMSW__
+        wxExecute( command + _T( " /mailurl:mailto:myfriend@xy.xy?subject=LogbookKonni-Layout&body=Drag and Drop file here" ) );
+        wxExecute( _T( "explorer.exe /select," )+layout );
 #endif
 #ifdef __WXGTK__
-		wxExecute(_T("/bin/bash -c \"") + logbookPlugIn->opt->mailClient +  _T(" -s Logbook-Layout --attach ") +
-			  layout + _T("\"\""));		
-		wxExecute(logbookPlugIn->opt->dataManager+_T(" ")+layout);		
+        wxExecute( _T( "/bin/bash -c \"" ) + logbookPlugIn->opt->mailClient +  _T( " -s Logbook-Layout --attach " ) +
+                   layout + _T( "\"\"" ) );
+        wxExecute( logbookPlugIn->opt->dataManager+_T( " " )+layout );
 #endif
 #ifdef __WXOSX__
 // worked in Mac-OS X
-        wxExecute(command + _T(" mailto:carcode@me.com?subject=LogbookKonni-Layout&body=Drag-And-Drop-File-Here"));
+        wxExecute( command + _T( " mailto:carcode@me.com?subject=LogbookKonni-Layout&body=Drag-And-Drop-File-Here" ) );
 #endif
-		return 4;
-	}
-	else if(dlg->m_radioBtnInstall->GetValue())
-	{
-		if(!dlg->layoutFileName.IsEmpty())
-		{
-			::wxCopyFile(dlg->layoutPath,location+dlg->layoutFileName);
-		}
-		loadLayoutChoice(grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid]);
-		return 5;
-	}
-
-	delete dlg;
-	return -1;	
-}
-
-bool LogbookDialog::isInArrayString(wxArrayString ar, wxString s)
-{
-	for(unsigned int z = 0; z < ar.GetCount(); z ++)
-		if(s.Trim() == ar[z].Trim())
-			return true;
+        return 4;
+    }
+    else if ( dlg->m_radioBtnInstall->GetValue() )
+    {
+        if ( !dlg->layoutFileName.IsEmpty() )
+        {
+            ::wxCopyFile( dlg->layoutPath,location+dlg->layoutFileName );
+        }
+        loadLayoutChoice( grid,location,choice,logbookPlugIn->opt->layoutPrefix[grid] );
+        return 5;
+    }
+
+    delete dlg;
+    return -1;
+}
+
+bool LogbookDialog::isInArrayString( wxArrayString ar, wxString s )
+{
+    for ( unsigned int z = 0; z < ar.GetCount(); z ++ )
+        if ( s.Trim() == ar[z].Trim() )
+            return true;
 
-	return false;
+    return false;
 }
 
 void LogbookDialog::m_gridGlobalOnGridSelectCell( wxGridEvent& ev )
 {
-	if(!this->IsShown()) return;
-	for(int i = 0; i < LOGGRIDS; i++)
-		logGrids[i]->ClearSelection();
-
-	if(ev.GetRow() < 0 || selGridRow < 0) return;
-
-	if(selGridRow != ev.GetRow())
-		setEqualRowHeight(selGridRow);
-
-	selGridCol = ev.GetCol();
-	selGridRow = ev.GetRow();
-
-	previousColumn = ev.GetCol();
-
-	int rowHeight = m_gridGlobal->GetRowHeight(selGridRow);
-
-	if(selGridCol == LogbookHTML::REMARKS && rowHeight < 120)
-		m_gridGlobal->SetRowHeight(selGridRow,120);
-	else if(rowHeight == 120 && selGridCol != LogbookHTML::REMARKS)
-		setEqualRowHeight(selGridRow);
-
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		logGrids[i]->Refresh();
-		logGrids[i]->MakeCellVisible(selGridRow,selGridCol);
-	}
-
-	if(selGridCol == LogbookHTML::POSITION && !noOpenPositionDlg)
-	{
-		PositionDlg* dlg = new PositionDlg(this);
-		int i = dlg->ShowModal();
-		if( i == wxID_OK)
-		{
-			m_gridGlobal->SetCellValue(dlg->retstr,selGridRow,LogbookHTML::POSITION);
-            logbook->getModifiedCellValue(0,selGridRow,0,LogbookHTML::POSITION);
-			setEqualRowHeight(selGridRow);
-		}
-		delete dlg;
-	}
+    if ( !this->IsShown() ) return;
+    for ( int i = 0; i < LOGGRIDS; i++ )
+        logGrids[i]->ClearSelection();
+
+    if ( ev.GetRow() < 0 || selGridRow < 0 ) return;
+
+    if ( selGridRow != ev.GetRow() )
+        setEqualRowHeight( selGridRow );
+
+    selGridCol = ev.GetCol();
+    selGridRow = ev.GetRow();
+
+    previousColumn = ev.GetCol();
+
+    int rowHeight = m_gridGlobal->GetRowHeight( selGridRow );
+
+    if ( selGridCol == LogbookHTML::REMARKS && rowHeight < 120 )
+        m_gridGlobal->SetRowHeight( selGridRow,120 );
+    else if ( rowHeight == 120 && selGridCol != LogbookHTML::REMARKS )
+        setEqualRowHeight( selGridRow );
+
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        logGrids[i]->Refresh();
+        logGrids[i]->MakeCellVisible( selGridRow,selGridCol );
+    }
+
+    if ( selGridCol == LogbookHTML::POSITION && !noOpenPositionDlg )
+    {
+        PositionDlg* dlg = new PositionDlg( this );
+        int i = dlg->ShowModal();
+        if ( i == wxID_OK )
+        {
+            m_gridGlobal->SetCellValue( dlg->retstr,selGridRow,LogbookHTML::POSITION );
+            logbook->getModifiedCellValue( 0,selGridRow,0,LogbookHTML::POSITION );
+            setEqualRowHeight( selGridRow );
+        }
+        delete dlg;
+    }
 
-	ev.Skip();
+    ev.Skip();
 }
 
 void LogbookDialog::m_gridMotorSailsOnGridSelectCell( wxGridEvent& ev )
 {
-	if(!this->IsShown()) return;
-	for(int i = 0; i < LOGGRIDS; i++)
-		logGrids[i]->ClearSelection();
-
-	if(ev.GetRow() < 0 || selGridRow < 0) return;
-
-	if(selGridRow != ev.GetRow())
-		setEqualRowHeight(selGridRow);
-
-	selGridCol = ev.GetCol();
-	selGridRow = ev.GetRow();
-	previousColumn = ev.GetCol();
-
-	if(selGridCol == LogbookHTML::MREMARKS && m_gridMotorSails->GetRowHeight(selGridRow) < 120)
-		m_gridMotorSails->SetRowHeight(selGridRow,120);
-	else if(m_gridMotorSails->GetRowHeight(selGridRow) == 120 && selGridCol != LogbookHTML::MREMARKS)
-		setEqualRowHeight(selGridRow);
-
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		logGrids[i]->Refresh();
-		logGrids[i]->MakeCellVisible(selGridRow,selGridCol);
-	}
-	ev.Skip();
+    if ( !this->IsShown() ) return;
+    for ( int i = 0; i < LOGGRIDS; i++ )
+        logGrids[i]->ClearSelection();
+
+    if ( ev.GetRow() < 0 || selGridRow < 0 ) return;
+
+    if ( selGridRow != ev.GetRow() )
+        setEqualRowHeight( selGridRow );
+
+    selGridCol = ev.GetCol();
+    selGridRow = ev.GetRow();
+    previousColumn = ev.GetCol();
+
+    if ( selGridCol == LogbookHTML::MREMARKS && m_gridMotorSails->GetRowHeight( selGridRow ) < 120 )
+        m_gridMotorSails->SetRowHeight( selGridRow,120 );
+    else if ( m_gridMotorSails->GetRowHeight( selGridRow ) == 120 && selGridCol != LogbookHTML::MREMARKS )
+        setEqualRowHeight( selGridRow );
+
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        logGrids[i]->Refresh();
+        logGrids[i]->MakeCellVisible( selGridRow,selGridCol );
+    }
+    ev.Skip();
 }
 
 void LogbookDialog::m_gridWeatherOnGridSelectCell( wxGridEvent& ev )
 {
-	if(!this->IsShown()) return;
-	for(int i = 0; i < LOGGRIDS; i++)
-		logGrids[i]->ClearSelection();
-
-	if(ev.GetRow() < 0 || selGridRow < 0) return;
-
-	selGridCol = ev.GetCol();
-	selGridRow = ev.GetRow();
-	previousColumn = ev.GetCol();
-
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		logGrids[i]->Refresh();
-		logGrids[i]->MakeCellVisible(selGridRow,selGridCol);
-	}
+    if ( !this->IsShown() ) return;
+    for ( int i = 0; i < LOGGRIDS; i++ )
+        logGrids[i]->ClearSelection();
+
+    if ( ev.GetRow() < 0 || selGridRow < 0 ) return;
+
+    selGridCol = ev.GetCol();
+    selGridRow = ev.GetRow();
+    previousColumn = ev.GetCol();
 
-	ev.Skip();
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        logGrids[i]->Refresh();
+        logGrids[i]->MakeCellVisible( selGridRow,selGridCol );
+    }
+
+    ev.Skip();
 }
 
 void LogbookDialog::LogbookDialogOnInitDialog( wxInitDialogEvent& ev )
@@ -3619,213 +3628,187 @@
 
 void LogbookDialog::setTitleExt()
 {
-	switch(logbookPlugIn->opt->timerType)
-	{
-	case 0:
-		titleExt = _(" - Normal Timer - Interval: ")+wxString::Format(_T("%s h %s m"),
-			logbookPlugIn->opt->thour.c_str(),logbookPlugIn->opt->tmin.c_str());
-		break;
-	case 1:
-		titleExt = _(" - Full Hour Timer");
-		break;
-	case 2:
-		titleExt = _(" - Individual Timer");
-		break;
-	}
+    switch ( logbookPlugIn->opt->timerType )
+    {
+    case 0:
+        titleExt = _( " - Normal Timer - Interval: " )+wxString::Format( _T( "%s h %s m" ),
+                   logbookPlugIn->opt->thour.c_str(),logbookPlugIn->opt->tmin.c_str() );
+        break;
+    case 1:
+        titleExt = _( " - Full Hour Timer" );
+        break;
+    case 2:
+        titleExt = _( " - Individual Timer" );
+        break;
+    }
 
 }
 
 void LogbookDialog::init()
-{	
-	fullHourModified = false;
-	statusGPS = false;
-	sashPos = -1;
-	noOpenPositionDlg = false;
-	decimalPoint = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER);
-	setDatePattern();
-	logbookPlugIn->opt->dateseparatorlocale = dateSeparator;
-	m_buttonCalculate->Enable(false);
+{
+    fullHourModified = false;
+    statusGPS = false;
+    sashPos = -1;
+    noOpenPositionDlg = false;
+    decimalPoint = wxLocale::GetInfo( wxLOCALE_DECIMAL_POINT, wxLOCALE_CAT_NUMBER );
+    setDatePattern();
+    logbookPlugIn->opt->dateseparatorlocale = dateSeparator;
+    m_buttonCalculate->Enable( false );
 
 #ifdef __WXOSX__
-	wxFont f = m_staticTextStatusText->GetFont();
-	f.SetPointSize(11);
-	m_staticTextStatusText->SetFont(f);
+    wxFont f = m_staticTextStatusText->GetFont();
+    f.SetPointSize( 11 );
+    m_staticTextStatusText->SetFont( f );
 #endif
 
 //	wxInitAllImageHandlers();
 
-	clouds[0] = wxT("Cirrus");
-	clouds[1] = wxT("Cirrocumulus");
-	clouds[2] = wxT("Cirrostratus");
-	clouds[3] = wxT("Altocumulus");
-	clouds[4] = wxT("Altostratus");
-	clouds[5] = wxT("Stratocumulus");
-	clouds[6] = wxT("Stratus");
-	clouds[7] = wxT("Cumulus");
-	clouds[8] = wxT("Nimbostratus");
-	clouds[9] = wxT("Cumulonimbus");
-
-	statusText[0] = _("no Event/s\nClick one or more bullets to start");
-	statusText[1] = _("Event/s suspended\nClick the button to restart all events");
-	statusText[2] = _("Event/s running\nClick the button to suspend or a bullet to stop");
-
-	wxString bulletToolTip = _("green = Event is running\nred = Event is stopped\nyellow = Event is suspended. Restart event with Start-Button");
-	m_bpButton8Waypoint->SetToolTip(bulletToolTip);
-	m_bpButtonCourse->SetToolTip(bulletToolTip);
-	m_bpButtonDistance->SetToolTip(bulletToolTip);
-	m_bpButtonTimer->SetToolTip(bulletToolTip);
-	m_bpButtonWatch->SetToolTip(bulletToolTip);
+    clouds[0] = wxT( "Cirrus" );
+    clouds[1] = wxT( "Cirrocumulus" );
+    clouds[2] = wxT( "Cirrostratus" );
+    clouds[3] = wxT( "Altocumulus" );
+    clouds[4] = wxT( "Altostratus" );
+    clouds[5] = wxT( "Stratocumulus" );
+    clouds[6] = wxT( "Stratus" );
+    clouds[7] = wxT( "Cumulus" );
+    clouds[8] = wxT( "Nimbostratus" );
+    clouds[9] = wxT( "Cumulonimbus" );
+
+    statusText[0] = _( "no Event/s\nClick one or more bullets to start" );
+    statusText[1] = _( "Event/s suspended\nClick the button to restart all events" );
+    statusText[2] = _( "Event/s running\nClick the button to suspend or a bullet to stop" );
+
+    wxString bulletToolTip = _( "green = Event is running\nred = Event is stopped\nyellow = Event is suspended. Restart event with Start-Button" );
+    m_bpButton8Waypoint->SetToolTip( bulletToolTip );
+    m_bpButtonCourse->SetToolTip( bulletToolTip );
+    m_bpButtonDistance->SetToolTip( bulletToolTip );
+    m_bpButtonTimer->SetToolTip( bulletToolTip );
+    m_bpButtonWatch->SetToolTip( bulletToolTip );
 
-	saveDialogFilter = _("Opendocument SpreadSheet(*.ods)|*.ods|\
+    saveDialogFilter = _( "Opendocument SpreadSheet(*.ods)|*.ods|\
 Excel 2003 Format(*.xml)|*.xml|\
 CSV Format OpenOffice(*.csv)|*.csv|\
-Backup Logbook(*.txt)|*.txt");
+Backup Logbook(*.txt)|*.txt" );
 
-	setTitleExt();
-	if(logbookPlugIn->opt->timer)
-		SetTitle(GetTitle()+titleExt);
+    setTitleExt();
+    if ( logbookPlugIn->opt->timer )
+        SetTitle( GetTitle()+titleExt );
 
-	declareExportHeader();
+    declareExportHeader();
 
-	defaultBackground = GetBackgroundColour();
+    defaultBackground = GetBackgroundColour();
 
-	numPages = 0;
-	totalColumns = 0;
-	selGridRow = 0;
-	selGridCol = 0;
-	logbook = NULL;
+    numPages = 0;
+    totalColumns = 0;
+    selGridRow = 0;
+    selGridCol = 0;
+    logbook = NULL;
 
-	logGrids[0] = m_gridGlobal;
-	logGrids[1] = m_gridWeather;
-	logGrids[2] = m_gridMotorSails;
+    logGrids[0] = m_gridGlobal;
+    logGrids[1] = m_gridWeather;
+    logGrids[2] = m_gridMotorSails;
 
-	numPages = m_notebook8->GetPageCount();
+    numPages = m_notebook8->GetPageCount();
 
-	for(int i = 0; i < LOGGRIDS; i ++)
-	{
-		logGrids[i]->SetDefaultEditor(new wxGridCellAutoWrapStringEditor);
-		totalColumns += logGrids[i]->GetNumberCols();
-	}
+    for ( int i = 0; i < LOGGRIDS; i ++ )
+    {
+        logGrids[i]->SetDefaultEditor( new wxGridCellAutoWrapStringEditor );
+        totalColumns += logGrids[i]->GetNumberCols();
+    }
 
-	wxStandardPathsBase& std_path = wxStandardPathsBase::Get();
-#ifdef __WXMSW__
-	wxString stdPath  = std_path.GetConfigDir();
-#endif
-#ifdef __WXGTK__
-	wxString stdPath  = std_path.GetUserDataDir();
-#endif
-#ifdef __WXOSX__
-	wxString stdPath  = std_path.GetUserConfigDir();   // should be ~/Library/Preferences	
-#endif
+    data  = logbookkonni_pi::StandardPath();
+    data.Append( _T( "data" ) );
+    appendOSDirSlash( &data ) ;
+    Home_Locn = data;
+
+    if ( !wxDir::Exists( data ) )
+        wxMkdir( data );
+
+    layoutHTML = data;
+    layoutHTML.append( _T( "HTMLLayouts" ) );
+    appendOSDirSlash( &layoutHTML );
+
+    layoutODT = data;
+    layoutODT.append( _T( "ODTLayouts" ) );
+    appendOSDirSlash( &layoutODT );
+
+    wxString s = wxFileName::GetPathSeparator();
+    help_locn = *GetpSharedDataLocation() + _T( "plugins" ) + s + _T( "logbookkonni_pi" ) + s + _T( "data" ) + s;
+    image_locn = help_locn + _T( "Images" ) + s;
+
+    lastRowSelectedRepairs = 0;
+    lastRowSelectedBuyParts = 0;
+
+    logbook     = new Logbook    ( this,data,layoutHTML,layoutODT );
 
-    basePath = stdPath;
-    appendOSDirSlash(&basePath);
-	pHome_Locn = new wxString();
-	pHome_Locn->Append(stdPath);
-	appendOSDirSlash(pHome_Locn) ;
-
-	pHome_Locn->append(_T("plugins"));
-	appendOSDirSlash(pHome_Locn);
-	if(!wxDir::Exists(*pHome_Locn))
-		wxMkdir(*pHome_Locn);
-
-	pHome_Locn->Append(_T("logbook"));
-	appendOSDirSlash(pHome_Locn);
-	bool u = false;
-	if(!wxDir::Exists(*pHome_Locn))
-		u = wxMkdir(*pHome_Locn);
-
-	data  = *pHome_Locn;
-	data.Append(_T("data"));
-	appendOSDirSlash(&data) ;
-	if(!wxDir::Exists(data))
-		wxMkdir(data);
-
-	layoutHTML = data;
-	layoutHTML.append(_T("HTMLLayouts"));
-	appendOSDirSlash(&layoutHTML);
-
-	layoutODT = data;
-	layoutODT.append(_T("ODTLayouts"));
-	appendOSDirSlash(&layoutODT);
-
-	wxString s = wxFileName::GetPathSeparator();
-	help_locn = *GetpSharedDataLocation() + _T("plugins") + s + _T("logbookkonni_pi") + s + _T("data") + s;
-	image_locn = help_locn + _T("Images") + s;
-
-	lastRowSelectedRepairs = 0;
-	lastRowSelectedBuyParts = 0;
-
-	logbook     = new Logbook    (this,data,layoutHTML,layoutODT);
-
-    m_gridGlobal->SetColMinimalAcceptableWidth(0);
-    m_gridWeather->SetColMinimalAcceptableWidth(0);
-    m_gridMotorSails->SetColMinimalAcceptableWidth(0);
-    m_gridOverview->SetColMinimalAcceptableWidth(0);
-    m_gridCrew->SetColMinimalAcceptableWidth(0);
-    m_gridCrew->SetRowMinimalAcceptableHeight(0);
-    m_gridOverview->SetColMinimalWidth(OverView::FPATH,0);
-    m_gridOverview->SetColSize(OverView::FPATH,0);
-
-	getIniValues();
-
-	logbookPlugIn->opt->setDateFormat();
-	logbookPlugIn->opt->setTimeFormat(logbookPlugIn->opt->noseconds);
-	logbookPlugIn->opt->setOptionsTimeFormat();
-
-	overview    = new OverView   (this,data,layoutHTML,layoutODT);
-	crewList    = new CrewList   (this,data,layoutHTML,layoutODT);
-	boat        = new Boat       (this,data,layoutHTML,layoutODT);
-	maintenance = new Maintenance(this,data,layoutHTML,layoutODT);
-	maintenance->setLayoutLocation();
-	logbook->loadData();
-	crewList->loadData();
-	boat->loadData();
-	maintenance->loadData();
-	logbook->setPlaceholders();
-
-    if(logGrids[0]->GetNumberRows() > 0)
-    {
-        m_logbook->SetSelection(0);
-        m_notebook8->SetSelection(0);
-        m_gridGlobal->SetGridCursor(0,0);
-        m_gridWeather->SetGridCursor(0,0);
-        m_gridMotorSails->SetGridCursor(0,0);
-    }
-
-	loadTimerEx();
-
-	if(logbookPlugIn->opt->checkStateOfEvents())
-		logbookPlugIn->eventsEnabled = true;
-
-	m_textCtrlStatusCourseDeg->SetValue(logbookPlugIn->opt->courseChangeDegrees+_T(" ")+logbookPlugIn->opt->Deg);
-	m_textCtrlStatusCourseMin->SetValue(logbookPlugIn->opt->courseTextAfterMinutes+_T(" m"));
-	m_textCtrlStatusDistance->SetValue(logbookPlugIn->opt->everySMAmount+_T(" ")+logbookPlugIn->opt->distance);
-
-	refreshBullets(); // Statusbar
-	checkBitmaps();
-
-
-	GPSTimer = new wxTimer(this,ID_GPSTIMER);
-	this->Connect( ID_GPSTIMER,wxEVT_TIMER, wxTimerEventHandler(LogbookDialog::OnTimerGPS), NULL, this );
-	GPSTimer->Start(GPSTIMEOUT);
-
-	logbookTimer = new wxTimer(this,ID_LOGTIMER);
-	this->Connect( ID_LOGTIMER,wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnLogTimer ), NULL, this);
-	logbookTimer->Start(LOGSAVETIME);
+    m_gridGlobal->SetColMinimalAcceptableWidth( 0 );
+    m_gridWeather->SetColMinimalAcceptableWidth( 0 );
+    m_gridMotorSails->SetColMinimalAcceptableWidth( 0 );
+    m_gridOverview->SetColMinimalAcceptableWidth( 0 );
+    m_gridCrew->SetColMinimalAcceptableWidth( 0 );
+    m_gridCrew->SetRowMinimalAcceptableHeight( 0 );
+    m_gridOverview->SetColMinimalWidth( OverView::FPATH,0 );
+    m_gridOverview->SetColSize( OverView::FPATH,0 );
 
-    SailsTimer = new wxTimer(this,ID_SAILSTIMER);
-    this->Connect( ID_SAILSTIMER,wxEVT_TIMER, wxTimerEventHandler(LogbookDialog::OnTimerSails), NULL, this );
+    getIniValues();
+
+    logbookPlugIn->opt->setDateFormat();
+    logbookPlugIn->opt->setTimeFormat( logbookPlugIn->opt->noseconds );
+    logbookPlugIn->opt->setOptionsTimeFormat();
+
+    overview    = new OverView   ( this,data,layoutHTML,layoutODT );
+    crewList    = new CrewList   ( this,data,layoutHTML,layoutODT );
+    boat        = new Boat       ( this,data,layoutHTML,layoutODT );
+    maintenance = new Maintenance( this,data,layoutHTML,layoutODT );
+    maintenance->setLayoutLocation();
+    logbook->loadData();
+    crewList->loadData();
+    boat->loadData();
+    maintenance->loadData();
+    logbook->setPlaceholders();
+
+    if ( logGrids[0]->GetNumberRows() > 0 )
+    {
+        m_logbook->SetSelection( 0 );
+        m_notebook8->SetSelection( 0 );
+        m_gridGlobal->SetGridCursor( 0,0 );
+        m_gridWeather->SetGridCursor( 0,0 );
+        m_gridMotorSails->SetGridCursor( 0,0 );
+    }
+
+    loadTimerEx();
+
+    if ( logbookPlugIn->opt->checkStateOfEvents() )
+        logbookPlugIn->eventsEnabled = true;
+
+    m_textCtrlStatusCourseDeg->SetValue( logbookPlugIn->opt->courseChangeDegrees+_T( " " )+logbookPlugIn->opt->Deg );
+    m_textCtrlStatusCourseMin->SetValue( logbookPlugIn->opt->courseTextAfterMinutes+_T( " m" ) );
+    m_textCtrlStatusDistance->SetValue( logbookPlugIn->opt->everySMAmount+_T( " " )+logbookPlugIn->opt->distance );
+
+    refreshBullets(); // Statusbar
+    checkBitmaps();
+
+
+    GPSTimer = new wxTimer( this,ID_GPSTIMER );
+    this->Connect( ID_GPSTIMER,wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnTimerGPS ), NULL, this );
+    GPSTimer->Start( GPSTIMEOUT );
+
+    logbookTimer = new wxTimer( this,ID_LOGTIMER );
+    this->Connect( ID_LOGTIMER,wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnLogTimer ), NULL, this );
+    logbookTimer->Start( LOGSAVETIME );
+
+    SailsTimer = new wxTimer( this,ID_SAILSTIMER );
+    this->Connect( ID_SAILSTIMER,wxEVT_TIMER, wxTimerEventHandler( LogbookDialog::OnTimerSails ), NULL, this );
 
     logbookPlugIn->GetOriginalColors();
 
-	coldfinger = new ColdFinger(this);
-	coldfinger->Show(false);
+    coldfinger = new ColdFinger( this );
+    coldfinger->Show( false );
 
-	crewList->filterCrewMembers();
+    crewList->filterCrewMembers();
 
-    m_gridMotorSails->SetColumnWidth(LogbookHTML::ROUTEID,0);
-    m_gridMotorSails->SetColumnWidth(LogbookHTML::TRACKID,0);
+    m_gridMotorSails->SetColumnWidth( LogbookHTML::ROUTEID,0 );
+    m_gridMotorSails->SetColumnWidth( LogbookHTML::TRACKID,0 );
 
     setCheckboxSails();
     setSailsGap();
@@ -3834,9 +3817,9 @@
     logbook->sailsMessage = false;
     logbook->oldSailsState = logbook->sailsState;
 
-    panelOnOff[0] = _("Show Engines/Sails Mode");
-    panelOnOff[1] = _("Show Layout Selection Mode");
-    if(logbookPlugIn->opt->layoutShow)
+    panelOnOff[0] = _( "Show Engines/Sails Mode" );
+    panelOnOff[1] = _( "Show Layout Selection Mode" );
+    if ( logbookPlugIn->opt->layoutShow )
     {
         m_panelLayout->Show();
         m_panelEngine->Hide();
@@ -3846,14 +3829,14 @@
         m_panelLayout->Hide();
         m_panelEngine->Show();
     }
-    m_bpButtonShowHideLayout->SetToolTip(panelOnOff[!logbookPlugIn->opt->layoutShow]);
+    m_bpButtonShowHideLayout->SetToolTip( panelOnOff[!logbookPlugIn->opt->layoutShow] );
 
-    onOff[0] = _(" off");
-    onOff[1] = _(" on");
-    m_toggleBtnEngine1->SetValue(logbookPlugIn->opt->toggleEngine1);
-    m_toggleBtnEngine2->SetValue(logbookPlugIn->opt->toggleEngine2);
+    onOff[0] = _( " off" );
+    onOff[1] = _( " on" );
+    m_toggleBtnEngine1->SetValue( logbookPlugIn->opt->toggleEngine1 );
+    m_toggleBtnEngine2->SetValue( logbookPlugIn->opt->toggleEngine2 );
 
-    m_toggleBtnGenerator->SetValue(logbookPlugIn->opt->toggleGenerator);
+    m_toggleBtnGenerator->SetValue( logbookPlugIn->opt->toggleGenerator );
 
     logbook->bRPM1 = logbookPlugIn->opt->engine1Running;
     logbook->bRPM2 = logbookPlugIn->opt->engine2Running;
@@ -3861,63 +3844,63 @@
 
     setToNumberEngine();
     setShowGenerator();
-                         
-    if((!logbookPlugIn->opt->toggleEngine1 && logbookPlugIn->opt->engine1Running)
-       || (!logbookPlugIn->opt->toggleEngine2 && logbookPlugIn->opt->engine2Running)
-       || (!logbookPlugIn->opt->toggleGenerator && logbookPlugIn->opt->generatorRunning))
+
+    if ( ( !logbookPlugIn->opt->toggleEngine1 && logbookPlugIn->opt->engine1Running )
+            || ( !logbookPlugIn->opt->toggleEngine2 && logbookPlugIn->opt->engine2Running )
+            || ( !logbookPlugIn->opt->toggleGenerator && logbookPlugIn->opt->generatorRunning ) )
     {
         logbook->rpmSentence = true;
         logbook->dtRPM = wxDateTime::Now();
-        if(logbookPlugIn->opt->engine1Running && logbookPlugIn->opt->bEng1RPMIsChecked)
-           m_toggleBtnEngine1->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[1]);
-        if(logbookPlugIn->opt->engine2Running && logbookPlugIn->opt->bEng2RPMIsChecked)
-            m_toggleBtnEngine2->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[1]);
-        if(logbookPlugIn->opt->generatorRunning && logbookPlugIn->opt->bGenRPMIsChecked)
-            m_toggleBtnGenerator->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[1]);
+        if ( logbookPlugIn->opt->engine1Running && logbookPlugIn->opt->bEng1RPMIsChecked )
+            m_toggleBtnEngine1->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[1] );
+        if ( logbookPlugIn->opt->engine2Running && logbookPlugIn->opt->bEng2RPMIsChecked )
+            m_toggleBtnEngine2->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[1] );
+        if ( logbookPlugIn->opt->generatorRunning && logbookPlugIn->opt->bGenRPMIsChecked )
+            m_toggleBtnGenerator->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[1] );
     }
-                         
+
 #ifdef PBVE_DEBUG
-	if(PBVE_DEBUG)
-	{
-		logbook->pvbe = new PBVEDialog(this);
-		logbook->pvbe->Show();
-	}
+    if ( PBVE_DEBUG )
+    {
+        logbook->pvbe = new PBVEDialog( this );
+        logbook->pvbe->Show();
+    }
 #endif
 
 
 
 #ifndef __WXMSW__  // wxWidgets won't set buttonwidth in Linux like in windows
-	m_buttonEditLayout->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonReloadLayout->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonEditLayoutOview->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonReloadLayoutOview->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonEditLayoutCrew->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonReloadCrew->SetMinSize( wxSize( 25,-1 ) );	
-	
-	m_buttonEditLayoutBoat->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonReloadLayoutsBoat->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonReloadLayoutsServiceHTML->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonEditLayoutODTService->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonEditLayoutODTRepairs->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonReloadLayoutsRepairsHTML->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonEditLayoutODTBuyParts->SetMinSize( wxSize( 25,-1 ) );
-	m_buttonReloadLayoutsBuyPartsHTML->SetMinSize( wxSize( 25,-1 ) );
-	
+    m_buttonEditLayout->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonReloadLayout->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonEditLayoutOview->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonReloadLayoutOview->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonEditLayoutCrew->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonReloadCrew->SetMinSize( wxSize( 25,-1 ) );
+
+    m_buttonEditLayoutBoat->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonReloadLayoutsBoat->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonReloadLayoutsServiceHTML->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonEditLayoutODTService->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonEditLayoutODTRepairs->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonReloadLayoutsRepairsHTML->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonEditLayoutODTBuyParts->SetMinSize( wxSize( 25,-1 ) );
+    m_buttonReloadLayoutsBuyPartsHTML->SetMinSize( wxSize( 25,-1 ) );
+
 #endif
 }
 
 void LogbookDialog::setCheckboxSails()
 {
-    for(unsigned int i = 0; i < 14; i++)
+    for ( unsigned int i = 0; i < 14; i++ )
     {
-        checkboxSails[i] = new wxCheckBox( m_panelEngine, wxID_ANY,logbookPlugIn->opt->abrSails.Item(i) , wxDefaultPosition, wxDefaultSize, 0 );
+        checkboxSails[i] = new wxCheckBox( m_panelEngine, wxID_ANY,logbookPlugIn->opt->abrSails.Item( i ) , wxDefaultPosition, wxDefaultSize, 0 );
         checkboxSails[i]->SetValue( logbookPlugIn->opt->bSailIsChecked[i] );
-        checkboxSails[i]->SetToolTip( logbookPlugIn->opt->sailsName.Item(i) );
+        checkboxSails[i]->SetToolTip( logbookPlugIn->opt->sailsName.Item( i ) );
         fgSizerSails->Add( checkboxSails[i] , 0, 0, 5 );
         checkboxSails[i]->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookDialog::OnCheckboxSails ), NULL, this );
     }
-    m_buttonSailsReset = new wxButton( m_panelEngine, wxID_ANY, _("none"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSailsReset->SetToolTip(_("Reset"));
+    m_buttonSailsReset = new wxButton( m_panelEngine, wxID_ANY, _( "none" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSailsReset->SetToolTip( _( "Reset" ) );
     m_buttonSailsReset->SetMinSize( wxSize( 40,15 ) );
     m_buttonSailsReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookDialog::OnButtonClickResetSails ), NULL, this );
     fgSizerSails->Add( m_buttonSailsReset, 0, 0, 5 );
@@ -3925,46 +3908,47 @@
 
 void LogbookDialog::setSailsGap()
 {
-    fgSizerSails->SetVGap(logbookPlugIn->opt->rowGap);
-    fgSizerSails->SetHGap(logbookPlugIn->opt->colGap);
+    fgSizerSails->SetVGap( logbookPlugIn->opt->rowGap );
+    fgSizerSails->SetHGap( logbookPlugIn->opt->colGap );
     fgSizerSails->Layout();
 }
 
 void LogbookDialog::OnCheckboxSails( wxCommandEvent& event )
 {
-    if(SailsTimer->IsRunning())
+    if ( SailsTimer->IsRunning() )
         SailsTimer->Stop();
 
     unsigned int i = 0;
-    for(; i < 14; i++)
-        if(checkboxSails[i] == ((wxCheckBox*)event.GetEventObject()))
+    for ( ; i < 14; i++ )
+        if ( checkboxSails[i] == ( ( wxCheckBox* )event.GetEventObject() ) )
             break;
 
-    SailsTimer->Start(3000,true);
+    SailsTimer->Start( 3000,true );
     logbookPlugIn->opt->bSailIsChecked[i] = event.IsChecked();
     stateSails();
 }
 
-void LogbookDialog::OnTimerSails(wxTimerEvent &event)
+void LogbookDialog::OnTimerSails( wxTimerEvent &event )
 {
-    if(logbook->sailsMessage)
-        logbook->appendRow(true, true);
+    if ( logbook->sailsMessage )
+        logbook->appendRow( true, true );
 }
 
 void LogbookDialog::stateSails()
 {
-    int i = 0; bool change = false;
+    int i = 0;
+    bool change = false;
 
-    for(; i < 14; i++)
+    for ( ; i < 14; i++ )
     {
-        if(logbookPlugIn->opt->bSailIsChecked[i] && checkboxSails[i]->IsChecked())
+        if ( logbookPlugIn->opt->bSailIsChecked[i] && checkboxSails[i]->IsChecked() )
         {
             change = true;
             break;
         }
     }
 
-    if(!change)
+    if ( !change )
     {
         logbook->sailsMessage = true;
         logbook->oldSailsState = logbook->sailsState;
@@ -3972,20 +3956,20 @@
         return;
     }
 
-    for(i = 0; i < 14; i++)
+    for ( i = 0; i < 14; i++ )
     {
-        if((!logbookPlugIn->opt->bSailIsChecked[i] && checkboxSails[i]->IsChecked())
-            || (logbookPlugIn->opt->bSailIsChecked[i] && !checkboxSails[i]->IsChecked()))
+        if ( ( !logbookPlugIn->opt->bSailIsChecked[i] && checkboxSails[i]->IsChecked() )
+                || ( logbookPlugIn->opt->bSailIsChecked[i] && !checkboxSails[i]->IsChecked() ) )
         {
             change = true;
             break;
         }
     }
 
-    if(change)
+    if ( change )
     {
         logbook->sailsMessage = true;
-        if(logbook->oldSailsState != 1)
+        if ( logbook->oldSailsState != 1 )
             logbook->oldSailsState = 0;
         logbook->sailsState = 1;
         return;
@@ -3996,38 +3980,38 @@
 
 void LogbookDialog::setCheckboxLabels()
 {
-    for(unsigned int i = 0; i < 14 ; i++)
+    for ( unsigned int i = 0; i < 14 ; i++ )
     {
-        checkboxSails[i]->SetLabel( logbookPlugIn->opt->abrSails.Item(i) );
-        checkboxSails[i]->SetToolTip( logbookPlugIn->opt->sailsName.Item(i) );
+        checkboxSails[i]->SetLabel( logbookPlugIn->opt->abrSails.Item( i ) );
+        checkboxSails[i]->SetToolTip( logbookPlugIn->opt->sailsName.Item( i ) );
     }
 }
 
 void LogbookDialog::setToNumberEngine()
 {
-    if(logbookPlugIn->opt->engines == 0)
+    if ( logbookPlugIn->opt->engines == 0 )
     {
-        m_gridMotorSails->SetColumnWidth(LogbookHTML::MOTOR1,0);
-        m_gridMotorSails->SetColumnWidth(LogbookHTML::MOTOR1T,0);
-        m_gridMotorSails->SetColumnWidth(LogbookHTML::RPM2,0);
-        m_toggleBtnEngine1->Enable(!logbookPlugIn->opt->bEng1RPMIsChecked);
-        m_toggleBtnEngine1->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[(int) m_toggleBtnEngine1->GetValue()]);
-        m_toggleBtnEngine2->Enable(false);
-	m_toggleBtnEngine2->Hide();
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::MOTOR1,0 );
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::MOTOR1T,0 );
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::RPM2,0 );
+        m_toggleBtnEngine1->Enable( !logbookPlugIn->opt->bEng1RPMIsChecked );
+        m_toggleBtnEngine1->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[( int ) m_toggleBtnEngine1->GetValue()] );
+        m_toggleBtnEngine2->Enable( false );
+        m_toggleBtnEngine2->Hide();
     }
     else
     {
-        m_gridMotorSails->SetColumnWidth(LogbookHTML::MOTOR1,1);
-        m_gridMotorSails->AutoSizeColumn(LogbookHTML::MOTOR1,false);
-        m_gridMotorSails->SetColumnWidth(LogbookHTML::MOTOR1T,1);
-        m_gridMotorSails->AutoSizeColumn(LogbookHTML::MOTOR1T,false);
-        m_gridMotorSails->SetColumnWidth(LogbookHTML::RPM2,1);
-        m_gridMotorSails->AutoSizeColumn(LogbookHTML::RPM2,false);
-        m_toggleBtnEngine1->Enable(!logbookPlugIn->opt->bEng1RPMIsChecked);
-        m_toggleBtnEngine1->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[(int) m_toggleBtnEngine1->GetValue()]);
-	m_toggleBtnEngine2->Show();
-        m_toggleBtnEngine2->Enable(!logbookPlugIn->opt->bEng2RPMIsChecked);
-        m_toggleBtnEngine2->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[(int) m_toggleBtnEngine2->GetValue()]);
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::MOTOR1,1 );
+        m_gridMotorSails->AutoSizeColumn( LogbookHTML::MOTOR1,false );
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::MOTOR1T,1 );
+        m_gridMotorSails->AutoSizeColumn( LogbookHTML::MOTOR1T,false );
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::RPM2,1 );
+        m_gridMotorSails->AutoSizeColumn( LogbookHTML::RPM2,false );
+        m_toggleBtnEngine1->Enable( !logbookPlugIn->opt->bEng1RPMIsChecked );
+        m_toggleBtnEngine1->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[( int ) m_toggleBtnEngine1->GetValue()] );
+        m_toggleBtnEngine2->Show();
+        m_toggleBtnEngine2->Enable( !logbookPlugIn->opt->bEng2RPMIsChecked );
+        m_toggleBtnEngine2->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[( int ) m_toggleBtnEngine2->GetValue()] );
     }
     m_panel2->Layout();
     Refresh();
@@ -4035,129 +4019,129 @@
 
 void LogbookDialog::setShowGenerator()
 {
-        if(logbookPlugIn->opt->generator == 1)
-        {
-            m_gridMotorSails->SetColumnWidth(LogbookHTML::GENE,1);
-            m_gridMotorSails->AutoSizeColumn(LogbookHTML::GENE,false);
-            m_gridMotorSails->SetColumnWidth(LogbookHTML::GENET,1);
-            m_gridMotorSails->AutoSizeColumn(LogbookHTML::GENET,false);
-	    m_toggleBtnGenerator->Show();
-            m_toggleBtnGenerator->Enable(!logbookPlugIn->opt->bGenRPMIsChecked);
-            m_toggleBtnGenerator->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[(int) m_toggleBtnGenerator->GetValue()]);
-        }
-        else
-        {
-            m_gridMotorSails->SetColumnWidth(LogbookHTML::GENE,0);
-            m_gridMotorSails->SetColumnWidth(LogbookHTML::GENET,0);
-            m_toggleBtnGenerator->Enable(false);
-	    m_toggleBtnGenerator->Hide();
-        }
+    if ( logbookPlugIn->opt->generator == 1 )
+    {
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::GENE,1 );
+        m_gridMotorSails->AutoSizeColumn( LogbookHTML::GENE,false );
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::GENET,1 );
+        m_gridMotorSails->AutoSizeColumn( LogbookHTML::GENET,false );
+        m_toggleBtnGenerator->Show();
+        m_toggleBtnGenerator->Enable( !logbookPlugIn->opt->bGenRPMIsChecked );
+        m_toggleBtnGenerator->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[( int ) m_toggleBtnGenerator->GetValue()] );
+    }
+    else
+    {
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::GENE,0 );
+        m_gridMotorSails->SetColumnWidth( LogbookHTML::GENET,0 );
+        m_toggleBtnGenerator->Enable( false );
+        m_toggleBtnGenerator->Hide();
+    }
     m_panel2->Layout();
     Refresh();
 }
 
-void LogbookDialog::stopEngine1(bool enabled, bool print)
+void LogbookDialog::stopEngine1( bool enabled, bool print )
 {
     logbook->bRPM1 = false;
-    if(logbookPlugIn->opt->engine1Running)
-        logbook->dtEngine1Off = wxDateTime::Now().Subtract(logbookPlugIn->opt->dtEngine1On);
+    if ( logbookPlugIn->opt->engine1Running )
+        logbook->dtEngine1Off = wxDateTime::Now().Subtract( logbookPlugIn->opt->dtEngine1On );
     logbookPlugIn->opt->dtEngine1On = -1;
-    if(print)
-        logbook->appendRow(true, false);
+    if ( print )
+        logbook->appendRow( true, false );
     logbookPlugIn->opt->engine1Running = false;
     logbookPlugIn->opt->toggleEngine1 = false;
-    m_toggleBtnEngine1->SetValue(false);
-    m_toggleBtnEngine1->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[0]);
-    if(enabled)
+    m_toggleBtnEngine1->SetValue( false );
+    m_toggleBtnEngine1->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[0] );
+    if ( enabled )
     {
-        m_toggleBtnEngine1->Enable(true);
+        m_toggleBtnEngine1->Enable( true );
     }
     else
     {
-        m_toggleBtnEngine1->Enable(false);
+        m_toggleBtnEngine1->Enable( false );
     }
 }
 
-void LogbookDialog::stopEngine2(bool enabled, bool show, bool print)
+void LogbookDialog::stopEngine2( bool enabled, bool show, bool print )
 {
     logbook->bRPM2 = false;
-    if(logbookPlugIn->opt->engine2Running)
-        logbook->dtEngine2Off = wxDateTime::Now().Subtract(logbookPlugIn->opt->dtEngine2On);
+    if ( logbookPlugIn->opt->engine2Running )
+        logbook->dtEngine2Off = wxDateTime::Now().Subtract( logbookPlugIn->opt->dtEngine2On );
     logbookPlugIn->opt->dtEngine2On = -1;
-    if(print)
-        logbook->appendRow(true, false);
+    if ( print )
+        logbook->appendRow( true, false );
     logbookPlugIn->opt->engine2Running = false;
     logbookPlugIn->opt->toggleEngine2 = false;
-    m_toggleBtnEngine2->SetValue(false);
-    if(enabled)
+    m_toggleBtnEngine2->SetValue( false );
+    if ( enabled )
     {
-        m_toggleBtnEngine2->Enable(true);
+        m_toggleBtnEngine2->Enable( true );
     }
     else
     {
-        m_toggleBtnEngine2->Enable(false);
+        m_toggleBtnEngine2->Enable( false );
     }
-    if(show)
+    if ( show )
     {
-	m_toggleBtnEngine2->Show();
-        m_toggleBtnEngine2->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[0]);
+        m_toggleBtnEngine2->Show();
+        m_toggleBtnEngine2->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[0] );
     }
     else
     {
-	m_toggleBtnEngine2->Hide();
+        m_toggleBtnEngine2->Hide();
     }
 
 }
-                         
-void LogbookDialog::stopGenerator(bool enabled, bool show, bool print)
+
+void LogbookDialog::stopGenerator( bool enabled, bool show, bool print )
 {
     logbook->bGEN = false;
-    if(logbookPlugIn->opt->generatorRunning)
-        logbook->dtGeneratorOff = wxDateTime::Now().Subtract(logbookPlugIn->opt->dtGeneratorOn);
+    if ( logbookPlugIn->opt->generatorRunning )
+        logbook->dtGeneratorOff = wxDateTime::Now().Subtract( logbookPlugIn->opt->dtGeneratorOn );
     logbookPlugIn->opt->dtGeneratorOn = -1;
-    if(print)
-        logbook->appendRow(true, false);
+    if ( print )
+        logbook->appendRow( true, false );
     logbookPlugIn->opt->generatorRunning = false;
     logbookPlugIn->opt->toggleGenerator = false;
-    m_toggleBtnGenerator->SetValue(false);
-    if(enabled)
+    m_toggleBtnGenerator->SetValue( false );
+    if ( enabled )
     {
-        m_toggleBtnGenerator->Enable(true);
+        m_toggleBtnGenerator->Enable( true );
     }
     else
     {
-        m_toggleBtnGenerator->Enable(false);
+        m_toggleBtnGenerator->Enable( false );
     }
-    if(show)
+    if ( show )
     {
-	m_toggleBtnGenerator->Show();
-        m_toggleBtnGenerator->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[0]);
+        m_toggleBtnGenerator->Show();
+        m_toggleBtnGenerator->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[0] );
     }
     else
     {
-	m_toggleBtnGenerator->Hide();
+        m_toggleBtnGenerator->Hide();
     }
 }
-                         
-void LogbookDialog::startEngine1(bool enabled, bool active, bool print)
+
+void LogbookDialog::startEngine1( bool enabled, bool active, bool print )
 {
-    
+
     logbookPlugIn->opt->dtEngine1On = wxDateTime::Now();
-    if(enabled)
+    if ( enabled )
     {
         logbook->bRPM1 = true;
-        m_toggleBtnEngine1->Enable(true);
-        m_toggleBtnEngine1->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[1]);
+        m_toggleBtnEngine1->Enable( true );
+        m_toggleBtnEngine1->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[1] );
         logbook->engine1Manual = true;
     }
     else
     {
         logbook->bRPM1 = true; //Set for NMEA RPM message
-        m_toggleBtnEngine1->Enable(false);
-        m_toggleBtnEngine1->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR)+onOff[0]);
+        m_toggleBtnEngine1->Enable( false );
+        m_toggleBtnEngine1->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR )+onOff[0] );
         logbook->engine1Manual = false;
     }
-    if(active)
+    if ( active )
     {
         logbookPlugIn->opt->toggleEngine1 = true;
     }
@@ -4165,30 +4149,30 @@
     {
         logbookPlugIn->opt->toggleEngine1 = false;
     }
-    if(print)
-        logbook->appendRow(true, false);
+    if ( print )
+        logbook->appendRow( true, false );
     logbookPlugIn->opt->engine1Running = true;
 }
-    
-void LogbookDialog::startEngine2(bool enabled, bool active, bool print)
+
+void LogbookDialog::startEngine2( bool enabled, bool active, bool print )
 {
-        
+
     logbookPlugIn->opt->dtEngine2On = wxDateTime::Now();
-    if(enabled)
+    if ( enabled )
     {
         logbook->bRPM2 = true;
-        m_toggleBtnEngine2->Enable(true);
-        m_toggleBtnEngine2->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[1]);
+        m_toggleBtnEngine2->Enable( true );
+        m_toggleBtnEngine2->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[1] );
         logbook->engine2Manual = true;
     }
     else
     {
         logbook->bRPM2 = true;  //Set for NMEA RPM message
-        m_toggleBtnEngine2->Enable(false);
-        m_toggleBtnEngine2->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::MOTOR1)+onOff[0]);
+        m_toggleBtnEngine2->Enable( false );
+        m_toggleBtnEngine2->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::MOTOR1 )+onOff[0] );
         logbook->engine2Manual = false;
     }
-    if(active)
+    if ( active )
     {
         logbookPlugIn->opt->toggleEngine2 = true;
     }
@@ -4196,30 +4180,30 @@
     {
         logbookPlugIn->opt->toggleEngine2 = false;
     }
-    if(print)
-        logbook->appendRow(true, false);
+    if ( print )
+        logbook->appendRow( true, false );
     logbookPlugIn->opt->engine2Running = true;
 }
-                         
-void LogbookDialog::startGenerator(bool enabled, bool active, bool print)
+
+void LogbookDialog::startGenerator( bool enabled, bool active, bool print )
 {
-        
+
     logbookPlugIn->opt->dtGeneratorOn = wxDateTime::Now();
-    if(enabled)
+    if ( enabled )
     {
         logbook->bGEN = true;
-        m_toggleBtnGenerator->Enable(true);
-        m_toggleBtnGenerator->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[1]);
+        m_toggleBtnGenerator->Enable( true );
+        m_toggleBtnGenerator->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[1] );
         logbook->generatorManual = true;
     }
     else
     {
         logbook->bGEN = true;  //Set for NMEA RPM message
-        m_toggleBtnGenerator->Enable(false);
-        m_toggleBtnGenerator->SetLabel(m_gridMotorSails->GetColLabelValue(LogbookHTML::GENE)+onOff[0]);
+        m_toggleBtnGenerator->Enable( false );
+        m_toggleBtnGenerator->SetLabel( m_gridMotorSails->GetColLabelValue( LogbookHTML::GENE )+onOff[0] );
         logbook->generatorManual = false;
     }
-    if(active)
+    if ( active )
     {
         logbookPlugIn->opt->toggleGenerator = true;
     }
@@ -4227,217 +4211,217 @@
     {
         logbookPlugIn->opt->toggleGenerator = false;
     }
-    if(print)
-        logbook->appendRow(true, false);
+    if ( print )
+        logbook->appendRow( true, false );
     logbookPlugIn->opt->generatorRunning = true;
 
 }
 
 void LogbookDialog::loadTimerEx()
 {
-	wxTextFile txt(data+wxFileName::GetPathSeparator()+_T("Timer.txt"));
-	if(!txt.Exists()) return;
+    wxTextFile txt( data+wxFileName::GetPathSeparator()+_T( "Timer.txt" ) );
+    if ( !txt.Exists() ) return;
+
+    TimerFull.clear();
+    TimerIndividualH.clear();
+    TimerIndividualM.clear();
+
+    txt.Open();
+    wxString full = txt.GetFirstLine();
+    wxStringTokenizer tkzf( full,_T( "," ) );
+    fullHourPlus = wxAtoi( tkzf.GetNextToken() );
+
+    while ( tkzf.HasMoreTokens() )
+        TimerFull.Add( wxAtoi( tkzf.GetNextToken() ) );
+
+    wxString ind = txt.GetNextLine();
+    wxDateTime dt = wxDateTime::Now();
+    wxStringTokenizer tkzi( ind,_T( "#" ) );
+    long h, m;
+    while ( tkzi.HasMoreTokens() )
+    {
+        wxString s = tkzi.GetNextToken();
+        wxStringTokenizer f( s,_T( "," ) );
+
+        dt.SetHour( wxAtoi( f.GetNextToken() ) );
+        dt.SetMinute( wxAtoi( f.GetNextToken() ) );
+
+        wxString ss = dt.Format( logbookPlugIn->opt->stimeformat );
+        wxStringTokenizer tkz( ss,_T( ":" ) );
+        tkz.GetNextToken().ToLong( &h );
+        tkz.GetNextToken().ToLong( &m );
+        TimerIndividualH.Add( h );
+        TimerIndividualM.Add( m );
+
+        if ( logbookPlugIn->opt->timeformat == 1 )
+        {
+            ss = dt.Format( _T( "%p" ) );
+            TimerIndidividualAMPM.Add( ss );
+        }
+    }
+
+    txt.Close();
+}
+
+void LogbookDialog::OnLogTimer( wxTimerEvent& ev )
+{
+    static int maintenance_timer = 0;
 
-	TimerFull.clear();
-	TimerIndividualH.clear();
-	TimerIndividualM.clear();
-
-	txt.Open();
-	wxString full = txt.GetFirstLine();
-	wxStringTokenizer tkzf(full,_T(","));
-	fullHourPlus = wxAtoi(tkzf.GetNextToken());
-
-	while(tkzf.HasMoreTokens())
-		TimerFull.Add(wxAtoi(tkzf.GetNextToken()));
-
-	wxString ind = txt.GetNextLine();
-	wxDateTime dt = wxDateTime::Now();
-	wxStringTokenizer tkzi(ind,_T("#"));
-	long h, m;
-	while(tkzi.HasMoreTokens())
-	{
-		wxString s = tkzi.GetNextToken();
-		wxStringTokenizer f(s,_T(","));
-
-		dt.SetHour(wxAtoi(f.GetNextToken()));
-		dt.SetMinute(wxAtoi(f.GetNextToken()));
-
-		wxString ss = dt.Format(logbookPlugIn->opt->stimeformat);
-		wxStringTokenizer tkz(ss,_T(":"));
-		tkz.GetNextToken().ToLong(&h);
-		tkz.GetNextToken().ToLong(&m);
-		TimerIndividualH.Add(h);
-		TimerIndividualM.Add(m);
-
-		if(logbookPlugIn->opt->timeformat == 1)
-		{
-			ss = dt.Format(_T("%p"));
-			TimerIndidividualAMPM.Add(ss);
-		}
-	}
-	
-	txt.Close();
-}
-
-void LogbookDialog::OnLogTimer(wxTimerEvent& ev)
-{
-	static int maintenance_timer = 0;
-
-	int id = ev.GetId();
-	if(id == ID_GPSTIMER)
-		OnTimerGPS(ev);
-	else
-	{
-		maintenance_timer++;
-		logbook->update();			// save Data every 10 Minutes, if modified
-		if(maintenance_timer == 6) // = once per hour
-		{
-			maintenance->checkService(m_gridGlobal->GetNumberRows()-1);
-			maintenance_timer = 0;
-		}
-	}
+    int id = ev.GetId();
+    if ( id == ID_GPSTIMER )
+        OnTimerGPS( ev );
+    else
+    {
+        maintenance_timer++;
+        logbook->update();			// save Data every 10 Minutes, if modified
+        if ( maintenance_timer == 6 ) // = once per hour
+        {
+            maintenance->checkService( m_gridGlobal->GetNumberRows()-1 );
+            maintenance_timer = 0;
+        }
+    }
 }
 
 void LogbookDialog::m_menuItem1OnMenuSelection( wxCommandEvent& ev )
 {
-	logbook->modified = true;
+    logbook->modified = true;
 
-	if(ev.GetId() == DELETE_ROW)
-	{
-		logbook->deleteRow(selGridRow);
-		logbook->modified = true;
-		selGridRow--;
+    if ( ev.GetId() == DELETE_ROW )
+    {
+        logbook->deleteRow( selGridRow );
+        logbook->modified = true;
+        selGridRow--;
 //		if(selGridRow < 0) selGridRow = 0;
 //		logbook->recalculateLogbook(selGridRow);
-	}
-	else if(ev.GetId() == COLDFINGER)
-	{
-		coldfinger->ShowModal();
-		if(!coldfinger->IsModal() && coldfinger->retItem != NULL)
-		{
-			myTreeItem* item = coldfinger->retItem;
-			m_notebook8->SetSelection(item->grid);
-			wxString insert = logGrids[item->grid]->GetCellValue(selGridRow,item->gridcol);
-
-			logGrids[item->grid]->SetCellValue(insert+((insert.Length() == 0)?_T(""):_T("\n"))+item->text,selGridRow,item->gridcol);
-
-			logGrids[item->grid]->SetFocus();
-			logGrids[item->grid]->SetGridCursor(selGridRow,item->gridcol);
-			setEqualRowHeight(selGridRow);
-		}
-		
-	}
-	else if(ev.GetId() == SELECT_ROUTE || ev.GetId() == SELECT_TRACK)
-	{
+    }
+    else if ( ev.GetId() == COLDFINGER )
+    {
+        coldfinger->ShowModal();
+        if ( !coldfinger->IsModal() && coldfinger->retItem != NULL )
+        {
+            myTreeItem* item = coldfinger->retItem;
+            m_notebook8->SetSelection( item->grid );
+            wxString insert = logGrids[item->grid]->GetCellValue( selGridRow,item->gridcol );
+
+            logGrids[item->grid]->SetCellValue( insert+( ( insert.Length() == 0 )?_T( "" ):_T( "\n" ) )+item->text,selGridRow,item->gridcol );
+
+            logGrids[item->grid]->SetFocus();
+            logGrids[item->grid]->SetGridCursor( selGridRow,item->gridcol );
+            setEqualRowHeight( selGridRow );
+        }
+
+    }
+    else if ( ev.GetId() == SELECT_ROUTE || ev.GetId() == SELECT_TRACK )
+    {
         wxString search;
-		wxListItem itemCol;
+        wxListItem itemCol;
 
-		if(ev.GetId() == SELECT_ROUTE)
+        if ( ev.GetId() == SELECT_ROUTE )
         {
             wxJSONWriter w;
-        	wxString out;
+            wxString out;
             wxJSONValue v;
-        	v[_T("mode")] =  _T("Route");
-        	w.Write(v, out);
-        	SendPluginMessage(wxString(_T("OCPN_ROUTELIST_REQUEST")),out);
-		}
+            v[_T( "mode" )] =  _T( "Route" );
+            w.Write( v, out );
+            SendPluginMessage( wxString( _T( "OCPN_ROUTELIST_REQUEST" ) ),out );
+        }
         else
-		{
-			wxJSONWriter w;
+        {
+            wxJSONWriter w;
             wxString out;
             wxJSONValue v;
-            v[_T("mode")] =  _T("Track");
-            w.Write(v, out);
-            SendPluginMessage(wxString(_T("OCPN_ROUTELIST_REQUEST")),out);
-            search = _T("<rte>");
-            itemCol.SetText(_("Track"));
-		}
-	}
-	else if(selGridCol == LogbookHTML::WAKE && this->m_notebook8->GetSelection() == 0)
-	{
-		wxString s = logGrids[m_notebook8->GetSelection()]->GetCellValue(selGridRow,selGridCol);
-		logGrids[m_notebook8->GetSelection()]->SetCellValue(
-		selGridRow,selGridCol,
-		(s.IsEmpty()) 
-		? m_menu1->GetLabelText(ev.GetId())
-		: s + _T("\n") + m_menu1->GetLabelText(ev.GetId())
-		);
-		setEqualRowHeight(selGridRow);
-		logGrids[m_notebook8->GetSelection()]->Refresh();
-	}
-	else if((selGridCol == LogbookHTML::REMARKS     && m_notebook8->GetSelection() == 0) ||
-            (selGridCol == LogbookHTML::WEATHER		&& m_notebook8->GetSelection() == 1) ||
-            (selGridCol == LogbookHTML::VISIBILITY	&& m_notebook8->GetSelection() == 1) ||
-            (selGridCol == LogbookHTML::SAILS		&& m_notebook8->GetSelection() == 2) ||
-            (selGridCol == LogbookHTML::REEF		&& m_notebook8->GetSelection() == 2) ||
-            (selGridCol == LogbookHTML::MREMARKS	&& m_notebook8->GetSelection() == 2) )
-	{
-		wxString s = logGrids[m_notebook8->GetSelection()]->GetCellValue(selGridRow,selGridCol);
-        if(s.Length() == 1 && s.GetChar(0) == ' ')
+            v[_T( "mode" )] =  _T( "Track" );
+            w.Write( v, out );
+            SendPluginMessage( wxString( _T( "OCPN_ROUTELIST_REQUEST" ) ),out );
+            search = _T( "<rte>" );
+            itemCol.SetText( _( "Track" ) );
+        }
+    }
+    else if ( selGridCol == LogbookHTML::WAKE && this->m_notebook8->GetSelection() == 0 )
+    {
+        wxString s = logGrids[m_notebook8->GetSelection()]->GetCellValue( selGridRow,selGridCol );
+        logGrids[m_notebook8->GetSelection()]->SetCellValue(
+            selGridRow,selGridCol,
+            ( s.IsEmpty() )
+            ? m_menu1->GetLabelText( ev.GetId() )
+            : s + _T( "\n" ) + m_menu1->GetLabelText( ev.GetId() )
+        );
+        setEqualRowHeight( selGridRow );
+        logGrids[m_notebook8->GetSelection()]->Refresh();
+    }
+    else if ( ( selGridCol == LogbookHTML::REMARKS     && m_notebook8->GetSelection() == 0 ) ||
+              ( selGridCol == LogbookHTML::WEATHER		&& m_notebook8->GetSelection() == 1 ) ||
+              ( selGridCol == LogbookHTML::VISIBILITY	&& m_notebook8->GetSelection() == 1 ) ||
+              ( selGridCol == LogbookHTML::SAILS		&& m_notebook8->GetSelection() == 2 ) ||
+              ( selGridCol == LogbookHTML::REEF		&& m_notebook8->GetSelection() == 2 ) ||
+              ( selGridCol == LogbookHTML::MREMARKS	&& m_notebook8->GetSelection() == 2 ) )
+    {
+        wxString s = logGrids[m_notebook8->GetSelection()]->GetCellValue( selGridRow,selGridCol );
+        if ( s.Length() == 1 && s.GetChar( 0 ) == ' ' )
             s = wxEmptyString;
-		wxTreeItemId id = FindMenuItem(m_notebook8->GetSelection(), selGridCol, m_menu1->GetLabelText(ev.GetId()));
-		wxString text = ((myTreeItem*)coldfinger->m_treeCtrl3->GetItemData(id))->text;
-		int grid = ((myTreeItem*)coldfinger->m_treeCtrl3->GetItemData(id))->grid;
-
-		logGrids[grid]->SetCellValue(selGridRow,selGridCol,s+((s.Length() == 0 )?_T(""):_T("\n"))+text);
-		logGrids[grid]->SetGridCursor(selGridRow,selGridCol);
-	}
-	else if(selGridCol == LogbookHTML::CLOUDS && m_notebook8->GetSelection() == 1)
-	{
-		logGrids[1]->SetCellValue(selGridRow,LogbookHTML::CLOUDS,m_menu1->GetLabelText(ev.GetId()));
-	}
+        wxTreeItemId id = FindMenuItem( m_notebook8->GetSelection(), selGridCol, m_menu1->GetLabelText( ev.GetId() ) );
+        wxString text = ( ( myTreeItem* )coldfinger->m_treeCtrl3->GetItemData( id ) )->text;
+        int grid = ( ( myTreeItem* )coldfinger->m_treeCtrl3->GetItemData( id ) )->grid;
+
+        logGrids[grid]->SetCellValue( selGridRow,selGridCol,s+( ( s.Length() == 0 )?_T( "" ):_T( "\n" ) )+text );
+        logGrids[grid]->SetGridCursor( selGridRow,selGridCol );
+    }
+    else if ( selGridCol == LogbookHTML::CLOUDS && m_notebook8->GetSelection() == 1 )
+    {
+        logGrids[1]->SetCellValue( selGridRow,LogbookHTML::CLOUDS,m_menu1->GetLabelText( ev.GetId() ) );
+    }
 }
 
-void LogbookDialog::writeToRouteDlg(wxJSONValue data)
+void LogbookDialog::writeToRouteDlg( wxJSONValue data )
 {
     wxListItem itemCol;
     int n = 1;
     bool isTrack = false;
 
-    if(data[0].HasMember(_T("isTrack")))
-        isTrack = data[0][_T("isTrack")].AsBool();
+    if ( data[0].HasMember( _T( "isTrack" ) ) )
+        isTrack = data[0][_T( "isTrack" )].AsBool();
 
-    RouteDialog *dlg = new RouteDialog(this);
-    if(isTrack)
+    RouteDialog *dlg = new RouteDialog( this );
+    if ( isTrack )
     {
-        dlg->SetTitle(_("Select Track"));
-        itemCol.SetText(_("Track"));
+        dlg->SetTitle( _( "Select Track" ) );
+        itemCol.SetText( _( "Track" ) );
     }
     else
     {
-        dlg->SetTitle(_("Select Route"));
-        itemCol.SetText(_("Route"));
+        dlg->SetTitle( _( "Select Route" ) );
+        itemCol.SetText( _( "Route" ) );
     }
-    itemCol.SetImage(-1);
-    itemCol.SetWidth(225);
+    itemCol.SetImage( -1 );
+    itemCol.SetWidth( 225 );
     wxListItem itemCol1;
-    itemCol1.SetText(_("GUID"));
-    itemCol1.SetImage(-1);
-    itemCol1.SetWidth(225);
-
-    dlg->m_listCtrlRoute->InsertColumn(0, itemCol);
-    dlg->m_listCtrlRoute->InsertColumn(1, itemCol1);
-
-    while(data[n].HasMember(_T("error")) && !data[n][_T("error")].AsBool())
-    {
-        int ind = dlg->m_listCtrlRoute->InsertItem(n,data[n][_T("name")].AsString());
-        dlg->m_listCtrlRoute->SetItem(ind,1,data[n][_T("GUID")].AsString());
-        if(data[n][_T("active")].AsBool())
-        {
-            wxFont font = dlg->m_listCtrlRoute->GetItemFont(ind);
-            font.SetWeight(wxBOLD);
-            dlg->m_listCtrlRoute->SetItemFont(ind, font );
+    itemCol1.SetText( _( "GUID" ) );
+    itemCol1.SetImage( -1 );
+    itemCol1.SetWidth( 225 );
+
+    dlg->m_listCtrlRoute->InsertColumn( 0, itemCol );
+    dlg->m_listCtrlRoute->InsertColumn( 1, itemCol1 );
+
+    while ( data[n].HasMember( _T( "error" ) ) && !data[n][_T( "error" )].AsBool() )
+    {
+        int ind = dlg->m_listCtrlRoute->InsertItem( n,data[n][_T( "name" )].AsString() );
+        dlg->m_listCtrlRoute->SetItem( ind,1,data[n][_T( "GUID" )].AsString() );
+        if ( data[n][_T( "active" )].AsBool() )
+        {
+            wxFont font = dlg->m_listCtrlRoute->GetItemFont( ind );
+            font.SetWeight( wxBOLD );
+            dlg->m_listCtrlRoute->SetItemFont( ind, font );
         }
         n++;
     }
 
-    if(dlg->ShowModal() == wxID_OK)
+    if ( dlg->ShowModal() == wxID_OK )
     {
         int selIndex = -1;
-        for(;;)
+        for ( ;; )
         {
-            selIndex = dlg->m_listCtrlRoute->GetNextItem(selIndex,wxLIST_NEXT_ALL,wxLIST_STATE_SELECTED);
-            if(selIndex != -1) break;
+            selIndex = dlg->m_listCtrlRoute->GetNextItem( selIndex,wxLIST_NEXT_ALL,wxLIST_STATE_SELECTED );
+            if ( selIndex != -1 ) break;
             else
             {
                 delete dlg;
@@ -4457,738 +4441,763 @@
         dlg->m_listCtrlRoute->GetItem( row_info );
         guid = row_info.m_text;
 
-        m_gridGlobal->SetCellValue(selGridRow,0,s);
-        if(!isTrack)
-            m_gridMotorSails->SetCellValue(selGridRow,LogbookHTML::ROUTEID,guid);
+        m_gridGlobal->SetCellValue( selGridRow,0,s );
+        if ( !isTrack )
+            m_gridMotorSails->SetCellValue( selGridRow,LogbookHTML::ROUTEID,guid );
         else
-            m_gridMotorSails->SetCellValue(selGridRow,LogbookHTML::TRACKID,guid);
+            m_gridMotorSails->SetCellValue( selGridRow,LogbookHTML::TRACKID,guid );
         logbook->modified = true;
     }
     delete dlg;
 }
 
-void LogbookDialog::OnMenuSelectionShowHiddenCols(wxCommandEvent &ev)
+void LogbookDialog::OnMenuSelectionShowHiddenCols( wxCommandEvent &ev )
 {
-	int selGrid = this->m_notebook8->GetSelection();
-	for(int i = 0; i < logGrids[selGrid]->GetNumberCols(); i++)
-		if(logGrids[selGrid]->GetColumnWidth(i) == 0)
-        {
-			if((selGrid == 2 && logbookPlugIn->opt->engines == 0) && ((i == LogbookHTML::MOTOR1 || i == LogbookHTML::MOTOR1T) || i == LogbookHTML::RPM2
-                                                                     || (i == LogbookHTML::GENE || i == LogbookHTML::GENET)) )
-				continue;
+    int selGrid = this->m_notebook8->GetSelection();
+    for ( int i = 0; i < logGrids[selGrid]->GetNumberCols(); i++ )
+        if ( logGrids[selGrid]->GetColumnWidth( i ) == 0 )
+        {
+            if ( ( selGrid == 2 && logbookPlugIn->opt->engines == 0 ) && ( ( i == LogbookHTML::MOTOR1 || i == LogbookHTML::MOTOR1T ) || i == LogbookHTML::RPM2
+                    || ( i == LogbookHTML::GENE || i == LogbookHTML::GENET ) ) )
+                continue;
             else
-#ifdef __WXOSX__
             {
-				logGrids[selGrid]->SetColumnWidth(i,1);
-                logGrids[selGrid]->AutoSizeColumn(i,false);
+                logGrids[selGrid]->SetColumnWidth( i,1 );
+                logGrids[selGrid]->AutoSizeColumn( i,false );
             }
-#else
-                logGrids[selGrid]->AutoSizeColumn(i,false);
-#endif
         }
- 
-	m_gridMotorSails->SetColumnWidth(LogbookHTML::ROUTEID,0);
-	m_gridMotorSails->SetColumnWidth(LogbookHTML::TRACKID,0);
-    
-	if(logbookPlugIn->opt->engines == 0)
+
+    m_gridMotorSails->SetColumnWidth( LogbookHTML::ROUTEID,0 );
+    m_gridMotorSails->SetColumnWidth( LogbookHTML::TRACKID,0 );
+
+    if ( logbookPlugIn->opt->engines == 0 )
         setToNumberEngine();
 
     setShowGenerator();
-    
-	logGrids[selGrid]->Refresh();
+
+    logGrids[selGrid]->Refresh();
+}
+
+void LogbookDialog::OnMenuSelectionShowHiddenColsOverview( wxCommandEvent &ev )
+{
+    for ( int i = 0; i < m_gridOverview->GetNumberCols()-1; i++ )
+        if ( m_gridOverview->GetColumnWidth( i ) == 0 )
+        {
+            m_gridOverview->SetColumnWidth( i,1 );
+            m_gridOverview->AutoSizeColumn( i,false );
+        }
+
+    m_gridOverview->Refresh();
 }
 
-void LogbookDialog::OnMenuSelectionShowHiddenColsOverview(wxCommandEvent &ev)
+void LogbookDialog::OnNoteBookPageChangedLogbook( wxNotebookEvent & ev )
 {
-	for(int i = 0; i < m_gridOverview->GetNumberCols()-1; i++)
-		if(m_gridOverview->GetColumnWidth(i) == 0)
-		{
-			m_gridOverview->SetColumnWidth(i,1);
-			m_gridOverview->AutoSizeColumn(i,false);
-		}
-
-	m_gridOverview->Refresh();
-}
-
-void LogbookDialog::OnNoteBookPageChangedLogbook(wxNotebookEvent & ev)
-{
-	if(ev.GetEventObject() == this->m_logbook && ev.GetSelection() == 1)
-	{      // OverView
-		logbook->modified = true;
-		logbook->update();
-		overview->refresh();
-	}
-	
-	if(ev.GetSelection() == 3)
-	{
-		if(sashPos == -1)
-		{
-			this->m_panel72->Fit();
-			m_splitter1->SetSashPosition(m_panel72->GetSize().GetY());
-		}
-	}
-	ev.Skip();
+    if ( ev.GetEventObject() == this->m_logbook && ev.GetSelection() == 1 )
+    {
+        // OverView
+        logbook->modified = true;
+        logbook->update();
+        overview->refresh();
+    }
+
+    if ( ev.GetSelection() == 3 )
+    {
+        if ( sashPos == -1 )
+        {
+            this->m_panel72->Fit();
+            m_splitter1->SetSashPosition( m_panel72->GetSize().GetY() );
+        }
+    }
+    ev.Skip();
 }
 
 void LogbookDialog::m_gridGlobalOnGridCellRightClick( wxGridEvent& ev )
 {
-	wxString sails = _T("");
+    wxString sails = _T( "" );
 
-	for(int i = 0; i < LOGGRIDS; i++)
-		logGrids[i]->ClearSelection();
+    for ( int i = 0; i < LOGGRIDS; i++ )
+        logGrids[i]->ClearSelection();
 
-	selGridCol = ev.GetCol();
-	selGridRow = ev.GetRow();
+    selGridCol = ev.GetCol();
+    selGridRow = ev.GetRow();
+
+    if ( ev.GetCol() == 4 && ( m_notebook8->GetSelection() == 0 ) )
+    {
+        m_menu1->PrependSeparator();
+        for ( unsigned int i = 0; i < ActualWatch::menuMembers.Count(); i++ )
+        {
+            wxMenuItem *item = new wxMenuItem( m_menu1, wxID_ANY, ActualWatch::menuMembers[i],wxEmptyString,wxITEM_NORMAL );
+            m_menu1->Prepend( item );
+            this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+                           wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+        }
+    }
 
-	if(ev.GetCol() == 4 && (m_notebook8->GetSelection() == 0))
-	{
-		m_menu1->PrependSeparator();
-		for(unsigned int i = 0; i < ActuellWatch::menuMembers.Count(); i++)
-		{
-			wxMenuItem *item = new wxMenuItem( m_menu1, wxID_ANY, ActuellWatch::menuMembers[i],wxEmptyString,wxITEM_NORMAL);
-			m_menu1->Prepend( item );
-			this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED, 
-				wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
-		}
-	}
-
-	if(ev.GetCol() == 0 && (m_notebook8->GetSelection() == 0))
-	{
-		m_menu1->PrependSeparator();
+    if ( ev.GetCol() == 0 && ( m_notebook8->GetSelection() == 0 ) )
+    {
+        m_menu1->PrependSeparator();
 
         wxMenuItem *item1 = new wxMenuItem( m_menu1, SELECT_TRACK,
-                _("Select Track"), wxEmptyString, wxITEM_NORMAL );
+                                            _( "Select Track" ), wxEmptyString, wxITEM_NORMAL );
         m_menu1->Prepend( item1 );
         this->Connect( item1->GetId(), wxEVT_COMMAND_MENU_SELECTED,
-                wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+                       wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+
+        wxMenuItem *item = new wxMenuItem( m_menu1, SELECT_ROUTE,
+                                           _( "Select Route" ), wxEmptyString, wxITEM_NORMAL );
+        m_menu1->Prepend( item );
+        this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+                       wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+    }
+
+    if ( ( selGridCol == LogbookHTML::REMARKS      && m_notebook8->GetSelection() == 0 ) ||
+            ( selGridCol == LogbookHTML::WEATHER		&& m_notebook8->GetSelection() == 1 ) ||
+            ( selGridCol == LogbookHTML::VISIBILITY	&& m_notebook8->GetSelection() == 1 ) ||
+            ( selGridCol == LogbookHTML::SAILS		&& m_notebook8->GetSelection() == 2 ) ||
+            ( selGridCol == LogbookHTML::REEF		&& m_notebook8->GetSelection() == 2 ) ||
+            ( selGridCol == LogbookHTML::MREMARKS	&& m_notebook8->GetSelection() == 2 )
+       )
+    {
+        addColdFingerDialog( m_menu1 );
+        addColdFingerTextBlocks( m_menu1 );
+    }
+
+    if ( ev.GetCol() == 13 && ( m_notebook8->GetSelection() == 1 ) )
+    {
+        m_menu1->PrependSeparator();
+        wxString s = wxFileName::GetPathSeparator();
+        clouds_locn = data  + _T( "Clouds" ) + s;
+
+        for ( int i = 0; i < 10; i++ )
+        {
+            wxMenu *temp = new wxMenu();
+            wxMenuItem *item = new wxMenuItem( temp, wxID_ANY, clouds[i], wxEmptyString,wxITEM_NORMAL );
+
+            const wxBitmap bmp ( ( clouds_locn+clouds[i].Lower()+_T( ".jpg" ) ), wxBITMAP_TYPE_ANY );
+            item->SetBitmap( bmp );
+            temp->Append( item );
+            m_menu1->Prepend( -1, clouds[i], temp );
+
+            this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+                           wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+        }
+    }
+
+    switch ( m_notebook8->GetSelection() )
+    {
+    case 0:
+        m_gridGlobal->PopupMenu( m_menu1, ev.GetPosition() );
+        break;
+    case 1:
+        m_gridWeather->PopupMenu( m_menu1, ev.GetPosition() );
+        break;
+    case 2:
+        m_gridMotorSails->PopupMenu( m_menu1, ev.GetPosition() );
+        break;
+    }
+
+    wxMenuItemList  list = m_menu1->GetMenuItems();
+
+    for ( wxMenuItemList::iterator it = list.begin(); it != list.end(); it++ )
+    {
+        wxMenuItem* item = *it;
+        int id = ( *it )->GetId();
+
+        if ( id == DELETE_ROW ) break;
+
+        m_menu1->Remove( item->GetId() );
+
+        this->Disconnect( id, wxEVT_COMMAND_MENU_SELECTED,
+                          wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+    }
+}
+
+void LogbookDialog::addColdFingerDialog( wxMenu* m_menu )
+{
+    m_menu->PrependSeparator();
 
-		wxMenuItem *item = new wxMenuItem( m_menu1, SELECT_ROUTE, 
-				_("Select Route"), wxEmptyString, wxITEM_NORMAL );
-		m_menu1->Prepend( item );
-		this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED, 
-				wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
-	}
-
-	if((selGridCol == LogbookHTML::REMARKS      && m_notebook8->GetSelection() == 0) ||
-        (selGridCol == LogbookHTML::WEATHER		&& m_notebook8->GetSelection() == 1) ||
-        (selGridCol == LogbookHTML::VISIBILITY	&& m_notebook8->GetSelection() == 1) ||
-        (selGridCol == LogbookHTML::SAILS		&& m_notebook8->GetSelection() == 2) ||
-        (selGridCol == LogbookHTML::REEF		&& m_notebook8->GetSelection() == 2) ||
-        (selGridCol == LogbookHTML::MREMARKS	&& m_notebook8->GetSelection() == 2)
-	   )
-	{
-		addColdFingerDialog(m_menu1);
-		addColdFingerTextBlocks(m_menu1);
-	}
-
-	if(ev.GetCol() == 13 && (m_notebook8->GetSelection() == 1))
-	{
-		m_menu1->PrependSeparator();
-		wxString s = wxFileName::GetPathSeparator();
-		clouds_locn = data  + _T("Clouds") + s;
-
-		for(int i = 0; i < 10; i++)
-		{
-			wxMenu *temp = new wxMenu();
-			wxMenuItem *item = new wxMenuItem( temp, wxID_ANY, clouds[i], wxEmptyString,wxITEM_NORMAL);
-
-			const wxBitmap bmp ((clouds_locn+clouds[i].Lower()+_T(".jpg")), wxBITMAP_TYPE_ANY);
-			item->SetBitmap(bmp);
-			temp->Append(item);
-			m_menu1->Prepend( -1, clouds[i], temp );
-
-			this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED, 
-				wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
-		}
-	}
-
-	switch(m_notebook8->GetSelection() )
-	  {
-      	  case 0: m_gridGlobal->PopupMenu( m_menu1, ev.GetPosition() ); break;
-	  case 1: m_gridWeather->PopupMenu( m_menu1, ev.GetPosition() );break;
-	  case 2: m_gridMotorSails->PopupMenu( m_menu1, ev.GetPosition() );break;
-	  }
-
-	wxMenuItemList  list = m_menu1->GetMenuItems();
-
-	for(wxMenuItemList::iterator it = list.begin(); it != list.end(); it++)
-		{
-			wxMenuItem* item = *it;
-			int id = (*it)->GetId();
-
-			if(id == DELETE_ROW) break;
-
-			m_menu1->Remove( item->GetId() );
-
-			this->Disconnect( id, wxEVT_COMMAND_MENU_SELECTED, 
-			wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
-		}
-}
-
-void LogbookDialog::addColdFingerDialog(wxMenu* m_menu)
-{
-	m_menu->PrependSeparator();
-
-		wxMenuItem *item = new wxMenuItem( m_menu, COLDFINGER, 
-				_("use Textblocks..."), wxEmptyString, wxITEM_NORMAL );
-		m_menu1->Prepend( item );
-		this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED, 
-				wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+    wxMenuItem *item = new wxMenuItem( m_menu, COLDFINGER,
+                                       _( "use Textblocks..." ), wxEmptyString, wxITEM_NORMAL );
+    m_menu1->Prepend( item );
+    this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+                   wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
 }
 
-void LogbookDialog::addColdFingerTextBlocks(wxMenu* menu)
+void LogbookDialog::addColdFingerTextBlocks( wxMenu* menu )
 {
-	FindMenuItem(-1,0,wxEmptyString);
-	FindMenuItem(m_notebook8->GetSelection(),selGridCol,wxEmptyString);
+    FindMenuItem( -1,0,wxEmptyString );
+    FindMenuItem( m_notebook8->GetSelection(),selGridCol,wxEmptyString );
 }
 
 #include <stack>
 using namespace std;
-wxTreeItemId LogbookDialog::FindMenuItem(int grid, int col, wxString name)
+wxTreeItemId LogbookDialog::FindMenuItem( int grid, int col, wxString name )
 {
-	wxTreeCtrl* tree = coldfinger->m_treeCtrl3;
-	std::stack<wxTreeItemId> items;
-	if (tree->GetRootItem().IsOk())
-		items.push(tree->GetRootItem());
-
-	while (!items.empty())
-	{
-		wxTreeItemId next = items.top();
-		items.pop();
-
-		if(grid == -1)
-		{
-			if (next != tree->GetRootItem() && ((myTreeItem*)tree->GetItemData(next))->grid == -1)
-				return next;
-		}
-		else if(name == wxEmptyString)
-		{			
-			if (((next != tree->GetRootItem() && ((myTreeItem*)tree->GetItemData(next))->grid == grid)) && ((myTreeItem*)tree->GetItemData(next))->gridcol == col && 
-				((myTreeItem*)tree->GetItemData(next))->menu == true)
-			{	
-				wxTreeItemIdValue cookie;
-				next = tree->GetFirstChild(next, cookie);
-
-				while(next.IsOk())
-				{
-				wxMenuItem *item = new wxMenuItem( m_menu1, wxID_ANY, 
-					tree->GetItemText(next), wxEmptyString, wxITEM_NORMAL );
-				m_menu1->Prepend( item );
-				this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED, 
-					wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
-				 next = tree->GetNextSibling(next);
-				}
-
-				return  wxTreeItemId();
-			}
-		}
-		else
-		{
-			if (next != tree->GetRootItem() && tree->GetItemText(next) == name)
-				return next;
-		}
- 
-		wxTreeItemIdValue cookie;
-		wxTreeItemId nextChild = tree->GetFirstChild(next, cookie);
-		while (nextChild.IsOk())
-		{
-			items.push(nextChild);
-			nextChild = tree->GetNextSibling(nextChild);
-		}
-	}
- 
-	return wxTreeItemId();
+    wxTreeCtrl* tree = coldfinger->m_treeCtrl3;
+    std::stack<wxTreeItemId> items;
+    if ( tree->GetRootItem().IsOk() )
+        items.push( tree->GetRootItem() );
+
+    while ( !items.empty() )
+    {
+        wxTreeItemId next = items.top();
+        items.pop();
+
+        if ( grid == -1 )
+        {
+            if ( next != tree->GetRootItem() && ( ( myTreeItem* )tree->GetItemData( next ) )->grid == -1 )
+                return next;
+        }
+        else if ( name == wxEmptyString )
+        {
+            if ( ( ( next != tree->GetRootItem() && ( ( myTreeItem* )tree->GetItemData( next ) )->grid == grid ) ) && ( ( myTreeItem* )tree->GetItemData( next ) )->gridcol == col &&
+                    ( ( myTreeItem* )tree->GetItemData( next ) )->menu == true )
+            {
+                wxTreeItemIdValue cookie;
+                next = tree->GetFirstChild( next, cookie );
+
+                while ( next.IsOk() )
+                {
+                    wxMenuItem *item = new wxMenuItem( m_menu1, wxID_ANY,
+                                                       tree->GetItemText( next ), wxEmptyString, wxITEM_NORMAL );
+                    m_menu1->Prepend( item );
+                    this->Connect( item->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+                                   wxCommandEventHandler( LogbookDialog::m_menuItem1OnMenuSelection ) );
+                    next = tree->GetNextSibling( next );
+                }
+
+                return  wxTreeItemId();
+            }
+        }
+        else
+        {
+            if ( next != tree->GetRootItem() && tree->GetItemText( next ) == name )
+                return next;
+        }
+
+        wxTreeItemIdValue cookie;
+        wxTreeItemId nextChild = tree->GetFirstChild( next, cookie );
+        while ( nextChild.IsOk() )
+        {
+            items.push( nextChild );
+            nextChild = tree->GetNextSibling( nextChild );
+        }
+    }
+
+    return wxTreeItemId();
 }
 
 void LogbookDialog::m_gridWeatherOnGridCellRightClick( wxGridEvent& ev )
 {
-	m_gridGlobalOnGridCellRightClick( ev );
+    m_gridGlobalOnGridCellRightClick( ev );
 }
 
 void LogbookDialog::m_gridMotorSailsOnGridCellRightClick( wxGridEvent& ev )
 {
-	m_gridGlobalOnGridCellRightClick( ev );
+    m_gridGlobalOnGridCellRightClick( ev );
 }
 
 void LogbookDialog::m_gridGlobalOnGridCmdCellChange( wxGridEvent& ev )
 {
-	logbook->changeCellValue(ev.GetRow(),ev.GetCol(),0);
+    logbook->changeCellValue( ev.GetRow(),ev.GetCol(),0 );
 }
 
 void LogbookDialog::m_gridWeatherOnGridCmdCellChange( wxGridEvent& ev )
 {
-	logbook->changeCellValue(ev.GetRow(),ev.GetCol(),0);
+    logbook->changeCellValue( ev.GetRow(),ev.GetCol(),0 );
 }
 
 void LogbookDialog::m_gridMotorSailsOnGridCmdCellChange( wxGridEvent& ev )
 {
-	logbook->changeCellValue(ev.GetRow(),ev.GetCol(),0);
+    logbook->changeCellValue( ev.GetRow(),ev.GetCol(),0 );
 }
 
 void LogbookDialog::logSaveOnButtonClick( wxCommandEvent& ev )
 {
     wxString layout;
-	wxString filter = saveDialogFilter;
-    filter.Prepend(_T("Google-Format(*.kml)|*.kml|"));
-	if(m_radioBtnHTML->GetValue())
-		filter.Prepend(_T("HTML Format(*.html)|*.html|"));
-	else
-		filter.Prepend(_T("Opendocument Text(*.odt)|*.odt|"));
-
-	wxFileDialog *saveFileDialog = 
-			new wxFileDialog(this, _("Save Logbook File"), _T(""), backupFile,
-										   filter, 
-										   wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
-
-	if (saveFileDialog->ShowModal() == wxID_CANCEL)
-	{
-		logGrids[m_logbook->GetSelection()]->SetFocus();
+    wxString filter = saveDialogFilter;
+    filter.Prepend( _T( "Google-Format(*.kml)|*.kml|" ) );
+    if ( m_radioBtnHTML->GetValue() )
+        filter.Prepend( _T( "HTML Format(*.html)|*.html|" ) );
+    else
+        filter.Prepend( _T( "Opendocument Text(*.odt)|*.odt|" ) );
+
+    wxFileDialog *saveFileDialog =
+        new wxFileDialog( this, _( "Save Logbook File" ), _T( "" ), backupFile,
+                          filter,
+                          wxFD_SAVE|wxFD_OVERWRITE_PROMPT );
+
+    if ( saveFileDialog->ShowModal() == wxID_CANCEL )
+    {
+        logGrids[m_logbook->GetSelection()]->SetFocus();
         return;
-	}
+    }
 
-	wxString path = saveFileDialog->GetPath();
-	int sel = saveFileDialog->GetFilterIndex();
+    wxString path = saveFileDialog->GetPath();
+    int sel = saveFileDialog->GetFilterIndex();
 
-    layout = logbookChoice->GetString(logbookChoice->GetSelection());
+    layout = logbookChoice->GetString( logbookChoice->GetSelection() );
     wxString prefix = logbook->opt->engineStr[logbook->opt->engines]+logbook->opt->layoutPrefix[LogbookDialog::LOGBOOK];
-    if(logbook->opt->filterLayout[LogbookDialog::LOGBOOK])
-        layout.Prepend(prefix);
+    if ( logbook->opt->filterLayout[LogbookDialog::LOGBOOK] )
+        layout.Prepend( prefix );
 
-	switch(sel)
-	{
-	case 0: if(m_radioBtnHTML->GetValue())
-				logbook->toHTML(path, layout, true);
-			else
-				logbook->toODT(path, layout, true);
-			break;
-	case 1: logbook->toKML(path); break;
-	case 2:	logbook->toODS(path); break;
-	case 3: logbook->toXML(path); break;
-	case 4: logbook->toCSV(path); break;
-	case 5: logbook->backup(path); break;
-	default: wxMessageBox(_T("Not implemented yet"),_T("Information")); break;
+    switch ( sel )
+    {
+    case 0:
+        if ( m_radioBtnHTML->GetValue() )
+            logbook->toHTML( path, layout, true );
+        else
+            logbook->toODT( path, layout, true );
+        break;
+    case 1:
+        logbook->toKML( path );
+        break;
+    case 2:
+        logbook->toODS( path );
+        break;
+    case 3:
+        logbook->toXML( path );
+        break;
+    case 4:
+        logbook->toCSV( path );
+        break;
+    case 5:
+        logbook->backup( path );
+        break;
+    default:
+        wxMessageBox( _T( "Not implemented yet" ),_T( "Information" ) );
+        break;
 
-	}
-	logGrids[m_logbook->GetSelection()]->SetFocus();
+    }
+    logGrids[m_logbook->GetSelection()]->SetFocus();
 }
 
 void LogbookDialog::logViewOnButtonClick( wxCommandEvent& ev )
 {
-	logGrids[m_logbook->GetSelection()]->SetFocus();
-	ev.Skip();
+    logGrids[m_logbook->GetSelection()]->SetFocus();
+    ev.Skip();
 
-	if(this->m_radioBtnHTML->GetValue())
-		logbook->viewHTML(_T(""),logbookChoice->GetString(logbookChoice->GetSelection()),false);
-	else
-		logbook->viewODT(_T(""),logbookChoice->GetString(logbookChoice->GetSelection()),false);
+    if ( this->m_radioBtnHTML->GetValue() )
+        logbook->viewHTML( _T( "" ),logbookChoice->GetString( logbookChoice->GetSelection() ),false );
+    else
+        logbook->viewODT( _T( "" ),logbookChoice->GetString( logbookChoice->GetSelection() ),false );
 }
 
 void LogbookDialog::m_button4OnButtonClick( wxCommandEvent& ev )
 {
-	logbook->appendRow(true, false);
+    logbook->appendRow( true, false );
 }
 
 void LogbookDialog::startNormalTimer()
 {
-	long sec = logbookPlugIn->opt->timerSec;
+    long sec = logbookPlugIn->opt->timerSec;
 
-	while(logbookPlugIn->opt->timerSec <= 0)
-	{
-		TimerInterval* ti = new TimerInterval(this,logbookPlugIn->opt);
-		wxMessageBox(_("Normal Timer has 0 h 0 Min.\n\nPlease change settings (Timer-Interval)"),_T(""));
-		ti->ShowModal();
-		sec = logbookPlugIn->opt->timerSec;
-		delete ti;
-	}
-
-	if(logbookPlugIn->opt->timer && sec > 0 )
-	{
-		if(logbookPlugIn->opt->timerType == 0 && !logbookPlugIn->eventsEnabled)
-			timer->Start(sec);
-		logbookPlugIn->opt->timer = true;
-		logbookPlugIn->state = logbookPlugIn->ONWITHEVENTS;
-		setTitleExt();
-		SetTitle(logbook->title + titleExt);
-	}
-	else 
-	{
-		if(logbookPlugIn->opt->timerType == 0 && (m_bpButtonTimer->state == 0 || m_bpButtonTimer->state == 1))
-			timer->Stop();
-		logbookPlugIn->opt->timer = false;
-		SetTitle(logbook->title);
-		if(logbookPlugIn->opt->checkStateOfEvents())
-			logbookPlugIn->state = logbookPlugIn->ONNOEVENTS;
-	}
+    while ( logbookPlugIn->opt->timerSec <= 0 )
+    {
+        TimerInterval* ti = new TimerInterval( this,logbookPlugIn->opt );
+        wxMessageBox( _( "Normal Timer has 0 h 0 Min.\n\nPlease change settings (Timer-Interval)" ),_T( "" ) );
+        ti->ShowModal();
+        sec = logbookPlugIn->opt->timerSec;
+        delete ti;
+    }
+
+    if ( logbookPlugIn->opt->timer && sec > 0 )
+    {
+        if ( logbookPlugIn->opt->timerType == 0 && !logbookPlugIn->eventsEnabled )
+            timer->Start( sec );
+        logbookPlugIn->opt->timer = true;
+        logbookPlugIn->state = logbookPlugIn->ONWITHEVENTS;
+        setTitleExt();
+        SetTitle( logbook->title + titleExt );
+    }
+    else
+    {
+        if ( logbookPlugIn->opt->timerType == 0 && ( m_bpButtonTimer->state == 0 || m_bpButtonTimer->state == 1 ) )
+            timer->Stop();
+        logbookPlugIn->opt->timer = false;
+        SetTitle( logbook->title );
+        if ( logbookPlugIn->opt->checkStateOfEvents() )
+            logbookPlugIn->state = logbookPlugIn->ONNOEVENTS;
+    }
 }
 
-void LogbookDialog::OnTimerGPS(wxTimerEvent& ev)
+void LogbookDialog::OnTimerGPS( wxTimerEvent& ev )
 {
     logbook->checkNMEADeviceIsOn();
 //	logbook->SetGPSStatus(false);
-	logbook->checkGPS(true);
+    logbook->checkGPS( true );
 }
 
-void LogbookDialog::onRadioButtonHTML(wxCommandEvent& ev)
+void LogbookDialog::onRadioButtonHTML( wxCommandEvent& ev )
 {
-	logbook->setLayoutLocation(layoutHTML);
-	logbookPlugIn->opt->navHTML = true;
-	logGrids[m_logbook->GetSelection()]->SetFocus();
+    logbook->setLayoutLocation( layoutHTML );
+    logbookPlugIn->opt->navHTML = true;
+    logGrids[m_logbook->GetSelection()]->SetFocus();
 }
 
-void LogbookDialog::onRadioButtonODT(wxCommandEvent &ev)
+void LogbookDialog::onRadioButtonODT( wxCommandEvent &ev )
 {
-	logbook->setLayoutLocation(layoutODT);
-	logbookPlugIn->opt->navHTML = false;
-	logGrids[m_logbook->GetSelection()]->SetFocus();
+    logbook->setLayoutLocation( layoutODT );
+    logbookPlugIn->opt->navHTML = false;
+    logGrids[m_logbook->GetSelection()]->SetFocus();
 }
 
 void LogbookDialog::LogbookDialogOnClose( wxCloseEvent& ev )
 {
-	logbookPlugIn->dlgShow = !logbookPlugIn->dlgShow;
-	this->Hide();
+    logbookPlugIn->dlgShow = !logbookPlugIn->dlgShow;
+    this->Hide();
 }
 
-void LogbookDialog::loadLayoutChoice(int grid, wxString path, wxChoice* choice, wxString filter)
+void LogbookDialog::loadLayoutChoice( int grid, wxString path, wxChoice* choice, wxString filter )
 {
-	wxArrayString files;
+    wxArrayString files;
     //	wxString filter = logbookPlugIn->opt->layoutPrefix;
-    wxFileName fn(path);
+    wxFileName fn( path );
 
     wxString e;
-    e = path.SubString(path.Len()-8,path.Len());
-    if(e.Contains(_T("logbook")))
-        filter.Prepend(logbookPlugIn->opt->engineStr[logbookPlugIn->opt->engines]);
+    e = path.SubString( path.Len()-8,path.Len() );
+    if ( e.Contains( _T( "logbook" ) ) )
+        filter.Prepend( logbookPlugIn->opt->engineStr[logbookPlugIn->opt->engines] );
 
-	int i = wxDir::GetAllFiles(path,&files);
-	choice->Clear();
+    int i = wxDir::GetAllFiles( path,&files );
+    choice->Clear();
 
-	for(int n = 0; n < i; n++)
-	{
-		if(wxFileName(files[n]).GetExt().Upper() != _T("ODT") && wxFileName(files[n]).GetExt().Upper() != _T("HTML")) continue;
+    for ( int n = 0; n < i; n++ )
+    {
+        if ( wxFileName( files[n] ).GetExt().Upper() != _T( "ODT" ) && wxFileName( files[n] ).GetExt().Upper() != _T( "HTML" ) ) continue;
 
-		if(logbookPlugIn->opt->filterLayout[grid])
-		{
-			if(wxFileName(files[n]).GetName().Contains(filter))
-                choice->Append(wxFileName(files[n]).GetName().Remove(0,filter.Len()));
-		}
-		else
-			choice->Append(wxFileName(files[n]).GetName());
-	}
-	choice->SetSelection(0);
+        if ( logbookPlugIn->opt->filterLayout[grid] )
+        {
+            if ( wxFileName( files[n] ).GetName().Contains( filter ) )
+                choice->Append( wxFileName( files[n] ).GetName().Remove( 0,filter.Len() ) );
+        }
+        else
+            choice->Append( wxFileName( files[n] ).GetName() );
+    }
+    choice->SetSelection( 0 );
 }
 
 
-void LogbookDialog::setEqualRowHeight(int row)
+void LogbookDialog::setEqualRowHeight( int row )
 {
-	if(row < 0) return;
+    if ( row < 0 ) return;
 
-	int max = 0, height;
+    int max = 0, height;
 
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		int count = logGrids[i]->GetNumberRows();
-		if(count <= 0) return;
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        int count = logGrids[i]->GetNumberRows();
+        if ( count <= 0 ) return;
 
-		logGrids[i]->AutoSizeRow(row,false);	
-		height = logGrids[i]->GetRowHeight(row);
+        logGrids[i]->AutoSizeRow( row,false );
+        height = logGrids[i]->GetRowHeight( row );
 
-		if( height > max)
-			max = height;
-	}
+        if ( height > max )
+            max = height;
+    }
 
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		logGrids[i]->SetRowHeight(row,max);
-	}
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        logGrids[i]->SetRowHeight( row,max );
+    }
 }
 
-void LogbookDialog::appendOSDirSlash(wxString* pString)
+void LogbookDialog::appendOSDirSlash( wxString* pString )
 {
-	wxChar sep = wxFileName::GetPathSeparator();
+    wxChar sep = wxFileName::GetPathSeparator();
 
-	if (pString->Last() != sep)
-		pString->Append(sep);
+    if ( pString->Last() != sep )
+        pString->Append( sep );
 }
 
-wxString LogbookDialog::replaceDangerChar(wxString s)
+wxString LogbookDialog::replaceDangerChar( wxString s )
 {
-	s.Replace(wxT("\n"),wxT("\\n"));
-	return s;
+    s.Replace( wxT( "\n" ),wxT( "\\n" ) );
+    return s;
 }
 
-wxString LogbookDialog::restoreDangerChar(wxString s)
+wxString LogbookDialog::restoreDangerChar( wxString s )
 {
-	s.Replace(wxT("\\n"),wxT("\n"));
-	return s;
+    s.Replace( wxT( "\\n" ),wxT( "\n" ) );
+    return s;
 }
 
-void LogbookDialog::startBrowser(wxString filename)
+void LogbookDialog::startBrowser( wxString filename )
 {
-    if(!wxLaunchDefaultBrowser(wxString(_T("file://"))+filename))
+    if ( !wxLaunchDefaultBrowser( wxString( _T( "file://" ) )+filename ) )
     {
-        if(wxGetOsVersion() & wxOS_WINDOWS) // maybe old XP-Versions needs it
+        if ( wxGetOsVersion() & wxOS_WINDOWS ) // maybe old XP-Versions needs it
         {
-            filename.Replace(wxT("/"),wxT("\\"));
-            wxFileType *filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("html"));
-            wxString cmd = filetype->GetOpenCommand(wxT("file:///")+filename);
+            filename.Replace( wxT( "/" ),wxT( "\\" ) );
+            wxFileType *filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( _T( "html" ) );
+            wxString cmd = filetype->GetOpenCommand( wxT( "file:///" )+filename );
 
-            if(cmd.Contains(wxT("IEXPLORE")))
-                wxExecute(wxString::Format(wxT("explorer.exe ")+filename));
+            if ( cmd.Contains( wxT( "IEXPLORE" ) ) )
+                wxExecute( wxString::Format( wxT( "explorer.exe " )+filename ) );
             else
-                wxExecute(cmd);
+                wxExecute( cmd );
         }
     }
 }
 
-void LogbookDialog::startApplication(wxString filename, wxString ext)
+void LogbookDialog::startApplication( wxString filename, wxString ext )
 {
 
-	if(ext == _T(".odt"))
-	{
-		 wxString command = logbookPlugIn->opt->odtEditor +  _T(" \"") +filename + _T("\"");
+    if ( ext == _T( ".odt" ) )
+    {
+        wxString command = logbookPlugIn->opt->odtEditor +  _T( " \"" ) +filename + _T( "\"" );
 
 #ifdef __WXOSX__
-		command = _T("/bin/bash -c \"open ")+filename+_T("\"");
+        command = _T( "/bin/bash -c \"open " )+filename+_T( "\"" );
 #endif
-		wxExecute(command);		
-	}
-	else
-	{
-		if(!logbookPlugIn->opt->htmlEditor.IsEmpty())
-			wxExecute(wxString::Format(wxT("%s \"%s\" "),logbookPlugIn->opt->htmlEditor.c_str(),filename.c_str()));
-		else
-			wxMessageBox(_("No Path set to HTML-Editor\nin ToolBox/Plugins/LogbookKonni/Preferences"));
-	}
+        wxExecute( command );
+    }
+    else
+    {
+        if ( !logbookPlugIn->opt->htmlEditor.IsEmpty() )
+            wxExecute( wxString::Format( wxT( "%s \"%s\" " ),logbookPlugIn->opt->htmlEditor.c_str(),filename.c_str() ) );
+        else
+            wxMessageBox( _( "No Path set to HTML-Editor\nin ToolBox/Plugins/LogbookKonni/Preferences" ) );
+    }
 }
 
 void LogbookDialog::setIniValues()
 {
-	Options * opt = logbookPlugIn->opt;
+    Options * opt = logbookPlugIn->opt;
 
-	opt->NavColWidth.Clear();
-	opt->WeatherColWidth.Clear();
-	opt->MotorColWidth.Clear();
-	opt->CrewColWidth.Clear();
-	opt->WakeColWidth.Clear();
-	opt->EquipColWidth.Clear();
-	opt->ServiceColWidth.Clear();
-	opt->RepairsColWidth.Clear();
-	opt->BuyPartsColWidth.Clear();
-	opt->OverviewColWidth.Clear();
-
-	opt->navGridLayoutChoice = logbookChoice->GetSelection();
-	opt->crewGridLayoutChoice = crewChoice->GetSelection();
-	opt->boatGridLayoutChoice = boatChoice->GetSelection();
-
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		for(int n = 0; n < logGrids[i]->GetNumberCols(); n++)
-		{
-			switch(i)
-			{
-			case 0:	opt->NavColWidth.Add(logGrids[i]->GetColumnWidth(n)); break;
-			case 1: opt->WeatherColWidth.Add(logGrids[i]->GetColumnWidth(n)); break;
-			case 2: opt->MotorColWidth.Add(logGrids[i]->GetColumnWidth(n)); break;
-			}
-		}
-	}
-
-	for(int n = 0; n < m_gridCrew->GetNumberCols(); n++)
-		opt->CrewColWidth.Add(m_gridCrew->GetColumnWidth(n));
-	for(int n = 0; n < m_gridCrewWake->GetNumberCols(); n++)
-		opt->WakeColWidth.Add(m_gridCrewWake->GetColumnWidth(n));
-	for(int n = 0; n < m_gridEquipment->GetNumberCols(); n++)
-		opt->EquipColWidth.Add(m_gridEquipment->GetColumnWidth(n));
-
-	for(int n = 0; n < m_gridMaintanence->GetNumberCols(); n++)
-		opt->ServiceColWidth.Add(m_gridMaintanence->GetColumnWidth(n));
-	for(int n = 0; n < m_gridMaintanenceRepairs->GetNumberCols(); n++)
-		opt->RepairsColWidth.Add(m_gridMaintanenceRepairs->GetColumnWidth(n));
-	for(int n = 0; n < m_gridMaintenanceBuyParts->GetNumberCols(); n++)
-		opt->BuyPartsColWidth.Add(m_gridMaintenanceBuyParts->GetColumnWidth(n));
+    opt->NavColWidth.Clear();
+    opt->WeatherColWidth.Clear();
+    opt->MotorColWidth.Clear();
+    opt->CrewColWidth.Clear();
+    opt->WakeColWidth.Clear();
+    opt->EquipColWidth.Clear();
+    opt->ServiceColWidth.Clear();
+    opt->RepairsColWidth.Clear();
+    opt->BuyPartsColWidth.Clear();
+    opt->OverviewColWidth.Clear();
+
+    opt->navGridLayoutChoice = logbookChoice->GetSelection();
+    opt->crewGridLayoutChoice = crewChoice->GetSelection();
+    opt->boatGridLayoutChoice = boatChoice->GetSelection();
 
-	for(int n = 0; n < m_gridOverview->GetNumberCols(); n++)
-		opt->OverviewColWidth.Add(m_gridOverview->GetColumnWidth(n));
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        for ( int n = 0; n < logGrids[i]->GetNumberCols(); n++ )
+        {
+            switch ( i )
+            {
+            case 0:
+                opt->NavColWidth.Add( logGrids[i]->GetColumnWidth( n ) );
+                break;
+            case 1:
+                opt->WeatherColWidth.Add( logGrids[i]->GetColumnWidth( n ) );
+                break;
+            case 2:
+                opt->MotorColWidth.Add( logGrids[i]->GetColumnWidth( n ) );
+                break;
+            }
+        }
+    }
+
+    for ( int n = 0; n < m_gridCrew->GetNumberCols(); n++ )
+        opt->CrewColWidth.Add( m_gridCrew->GetColumnWidth( n ) );
+    for ( int n = 0; n < m_gridCrewWake->GetNumberCols(); n++ )
+        opt->WakeColWidth.Add( m_gridCrewWake->GetColumnWidth( n ) );
+    for ( int n = 0; n < m_gridEquipment->GetNumberCols(); n++ )
+        opt->EquipColWidth.Add( m_gridEquipment->GetColumnWidth( n ) );
+
+    for ( int n = 0; n < m_gridMaintanence->GetNumberCols(); n++ )
+        opt->ServiceColWidth.Add( m_gridMaintanence->GetColumnWidth( n ) );
+    for ( int n = 0; n < m_gridMaintanenceRepairs->GetNumberCols(); n++ )
+        opt->RepairsColWidth.Add( m_gridMaintanenceRepairs->GetColumnWidth( n ) );
+    for ( int n = 0; n < m_gridMaintenanceBuyParts->GetNumberCols(); n++ )
+        opt->BuyPartsColWidth.Add( m_gridMaintenanceBuyParts->GetColumnWidth( n ) );
+
+    for ( int n = 0; n < m_gridOverview->GetNumberCols(); n++ )
+        opt->OverviewColWidth.Add( m_gridOverview->GetColumnWidth( n ) );
 }
 
 void LogbookDialog::getIniValues()
 {
-	Options * opt = logbookPlugIn->opt;
-	unsigned int colCount[3];
-	colCount[0] = opt->NavColWidth.Count();
-	colCount[1] = opt->WeatherColWidth.Count();
-	colCount[2] = opt->MotorColWidth.Count();
-
-
-	opt->everySMAmount.Replace(_T(","),_T("."));
-	opt->dEverySM = wxAtof(opt->everySMAmount);
-
-	opt->dCourseChangeDegrees = wxAtof(opt->courseChangeDegrees);
-
-	if((opt->navGridLayoutChoice == -1) || (opt->NavColWidth.GetCount() == 0)) return;
-
-	for(int i = 0; i < LOGGRIDS; i++)
-	{
-		for(unsigned int n = 0; n < (unsigned int) logGrids[i]->GetNumberCols(); n++)
-		{
-			if(n >= colCount[i]) break;
-
-			switch(i)
-			{
-			case 0:
-                logGrids[i]->SetColumnWidth(n,opt->NavColWidth[n]);
-				break;
-			case 1:
-                logGrids[i]->SetColumnWidth(n,opt->WeatherColWidth[n]);
-				break;
-			case 2: 
-				logGrids[i]->SetColumnWidth(n,opt->MotorColWidth[n]); 
-				break;
-			}
-		}
-	}
-
-	for(int n = 0; n < m_gridCrew->GetNumberCols(); n++)
-		m_gridCrew->SetColumnWidth(n,opt->CrewColWidth[n]);
-
-	for(int n = 0; n < m_gridEquipment->GetNumberCols(); n++)
-		m_gridEquipment->SetColumnWidth(n,opt->EquipColWidth[n]);
-
-	if(opt->OverviewColWidth[0] != -1 )
-	{
-		for(int n = 0; n < m_gridOverview->GetNumberCols(); n++)
-			m_gridOverview->SetColumnWidth(n,opt->OverviewColWidth[n]);
-	}
-
-	if(opt->ServiceColWidth[0] != -1 )
-	{
-		for(int n = 0; n < m_gridMaintanence->GetNumberCols(); n++)
-			m_gridMaintanence->SetColumnWidth(n,opt->ServiceColWidth[n]);
-	}
-
-	if(opt->RepairsColWidth[0] != -1 )
-	{
-		for(int n = 0; n < m_gridMaintanenceRepairs->GetNumberCols(); n++)
-			m_gridMaintanenceRepairs->SetColumnWidth(n,opt->RepairsColWidth[n]);
-	}
-
-	if(opt->BuyPartsColWidth[0] != -1 )
-	{
-		for(int n = 0; n < m_gridMaintenanceBuyParts->GetNumberCols(); n++)
-			m_gridMaintenanceBuyParts->SetColumnWidth(n,opt->BuyPartsColWidth[n]);
-	}
-
-	if(logbookPlugIn->opt->navHTML)
-	{
-	  logbook->setLayoutLocation(layoutHTML);
-	  m_radioBtnHTML->SetValue(true);
-	}
-	else
-	{
-	  logbook->setLayoutLocation(layoutODT);
-	  this->m_radioBtnODT->SetValue(true);
-	}
-
-	if(logbookPlugIn->opt->crewHTML)
-	  m_radioBtnHTMLCrew->SetValue(true);
-	else
-	  this->m_radioBtnODTCrew->SetValue(true);
-
-
-	if(logbookPlugIn->opt->boatHTML)
-	  this->m_radioBtnHTMLBoat->SetValue(true);
-	else
-	  this->m_radioBtnODTBoat->SetValue(true);
-
-	if(logbookPlugIn->opt->overviewHTML)
-	  this->m_radioBtnHTMLOverview->SetValue(true);
-	else	
-	  this->m_radioBtnODTOverview->SetValue(true);
-	
-	if(logbookPlugIn->opt->serviceHTML)
-	  this->m_radioBtnHTMLService->SetValue(true);
-	else
-	  this->m_radioBtnODTService->SetValue(true);
-
-	if(logbookPlugIn->opt->repairsHTML)
-	  this->m_radioBtnHTMLRepairs->SetValue(true);
-	else
-	  this->m_radioBtnODTRepairs->SetValue(true);
-	
-	if(logbookPlugIn->opt->buypartsHTML)
-	  this->m_radioBtnHTMLBuyParts->SetValue(true);
-	else	
-	  this->m_radioBtnODTBuyParts->SetValue(true);
+    Options * opt = logbookPlugIn->opt;
+    unsigned int colCount[3];
+    colCount[0] = opt->NavColWidth.Count();
+    colCount[1] = opt->WeatherColWidth.Count();
+    colCount[2] = opt->MotorColWidth.Count();
+
+
+    opt->everySMAmount.Replace( _T( "," ),_T( "." ) );
+    opt->dEverySM = wxAtof( opt->everySMAmount );
+
+    opt->dCourseChangeDegrees = wxAtof( opt->courseChangeDegrees );
+
+    if ( ( opt->navGridLayoutChoice == -1 ) || ( opt->NavColWidth.GetCount() == 0 ) ) return;
+
+    for ( int i = 0; i < LOGGRIDS; i++ )
+    {
+        for ( unsigned int n = 0; n < ( unsigned int ) logGrids[i]->GetNumberCols(); n++ )
+        {
+            if ( n >= colCount[i] ) break;
+
+            switch ( i )
+            {
+            case 0:
+                logGrids[i]->SetColumnWidth( n,opt->NavColWidth[n] );
+                break;
+            case 1:
+                logGrids[i]->SetColumnWidth( n,opt->WeatherColWidth[n] );
+                break;
+            case 2:
+                logGrids[i]->SetColumnWidth( n,opt->MotorColWidth[n] );
+                break;
+            }
+        }
+    }
+
+    for ( int n = 0; n < m_gridCrew->GetNumberCols(); n++ )
+        m_gridCrew->SetColumnWidth( n,opt->CrewColWidth[n] );
+
+    for ( int n = 0; n < m_gridEquipment->GetNumberCols(); n++ )
+        m_gridEquipment->SetColumnWidth( n,opt->EquipColWidth[n] );
+
+    if ( opt->OverviewColWidth[0] != -1 )
+    {
+        for ( int n = 0; n < m_gridOverview->GetNumberCols(); n++ )
+            m_gridOverview->SetColumnWidth( n,opt->OverviewColWidth[n] );
+    }
+
+    if ( opt->ServiceColWidth[0] != -1 )
+    {
+        for ( int n = 0; n < m_gridMaintanence->GetNumberCols(); n++ )
+            m_gridMaintanence->SetColumnWidth( n,opt->ServiceColWidth[n] );
+    }
+
+    if ( opt->RepairsColWidth[0] != -1 )
+    {
+        for ( int n = 0; n < m_gridMaintanenceRepairs->GetNumberCols(); n++ )
+            m_gridMaintanenceRepairs->SetColumnWidth( n,opt->RepairsColWidth[n] );
+    }
+
+    if ( opt->BuyPartsColWidth[0] != -1 )
+    {
+        for ( int n = 0; n < m_gridMaintenanceBuyParts->GetNumberCols(); n++ )
+            m_gridMaintenanceBuyParts->SetColumnWidth( n,opt->BuyPartsColWidth[n] );
+    }
+
+    if ( logbookPlugIn->opt->navHTML )
+    {
+        logbook->setLayoutLocation( layoutHTML );
+        m_radioBtnHTML->SetValue( true );
+    }
+    else
+    {
+        logbook->setLayoutLocation( layoutODT );
+        this->m_radioBtnODT->SetValue( true );
+    }
+
+    if ( logbookPlugIn->opt->crewHTML )
+        m_radioBtnHTMLCrew->SetValue( true );
+    else
+        this->m_radioBtnODTCrew->SetValue( true );
+
+
+    if ( logbookPlugIn->opt->boatHTML )
+        this->m_radioBtnHTMLBoat->SetValue( true );
+    else
+        this->m_radioBtnODTBoat->SetValue( true );
+
+    if ( logbookPlugIn->opt->overviewHTML )
+        this->m_radioBtnHTMLOverview->SetValue( true );
+    else
+        this->m_radioBtnODTOverview->SetValue( true );
+
+    if ( logbookPlugIn->opt->serviceHTML )
+        this->m_radioBtnHTMLService->SetValue( true );
+    else
+        this->m_radioBtnODTService->SetValue( true );
+
+    if ( logbookPlugIn->opt->repairsHTML )
+        this->m_radioBtnHTMLRepairs->SetValue( true );
+    else
+        this->m_radioBtnODTRepairs->SetValue( true );
+
+    if ( logbookPlugIn->opt->buypartsHTML )
+        this->m_radioBtnHTMLBuyParts->SetValue( true );
+    else
+        this->m_radioBtnODTBuyParts->SetValue( true );
+
+    switch ( opt->overviewAll )
+    {
+    case 0:
+        this->m_radioBtnActualLogbook->SetValue( true );
+        break;
+    case 1:
+        this->m_radioBtnAllLogbooks->SetValue( true );
+        break;
+    case 2:
+        this->m_radioBtnActualLogbook->SetValue( true ); // at startup theres no seleted logbook = crash, set to actual logbook
+        break;
+    }
+
+    if ( logbookPlugIn->opt->statusbarGlobal )
+        m_bpButtonShowHideStatusGlobal->SetBitmapLabel( up_xpm );
+    else
+        m_bpButtonShowHideStatusGlobal->SetBitmapLabel( down_xpm );
+
+}
+
+void LogbookDialog::sortGrid( wxGrid* grid, int col, bool ascending )
+{
+    bool sort = false;
+    crewList->showAllCrewMembers();
+
+    myGridStringTable* data = ( myGridStringTable* )grid->GetTable();
+
+    wxGridStringArray arr = data->m_data;
+    if ( arr.Count() < 2 ) return;
 
-	switch(opt->overviewAll)
+    wxGridStringArray temp;
+
+    temp .Add( arr[0] );
+    int i;
+    do
     {
-        case 0:
-            this->m_radioBtnActuellLogbook->SetValue(true);
-            break;
-        case 1:
-            this->m_radioBtnAllLogbooks->SetValue(true);
-            break;
-        case 2:
-            this->m_radioBtnActuellLogbook->SetValue(true); // at startup theres no seleted logbook = crash, set to actual logbook
-            break;
+        sort = false;
+        i = 0;
+        do
+        {
+            if ( ascending )
+            {
+                if ( ( arr[i][col] > arr[i+1][col] ) )
+                {
+                    temp[0] = arr[i];
+                    arr[i]  = arr[i+1];
+                    arr[i+1]  = temp[0];
+                    sort = true;
+                }
+            }
+            else
+            {
+                if ( ( arr[i+1][col] > arr[i][col] ) )
+                {
+                    temp[0] = arr[i];
+                    arr[i]  = arr[i+1];
+                    arr[i+1]  = temp[0];
+                    sort = true;
+                }
+            }
+            i++;
+        }
+        while ( i < grid->GetNumberRows()-1 );
     }
+    while ( sort );
 
-	if(logbookPlugIn->opt->statusbarGlobal)
-		m_bpButtonShowHideStatusGlobal->SetBitmapLabel(up_xpm);
-	else
-		m_bpButtonShowHideStatusGlobal->SetBitmapLabel(down_xpm);
-
-}
+    data->m_data = arr;
 
-void LogbookDialog::sortGrid(wxGrid* grid, int col, bool ascending)
-{
-	bool sort = false;
-	crewList->showAllCrewMembers();
-
-	myGridStringTable* data = (myGridStringTable*)grid->GetTable();
-
-	wxGridStringArray arr = data->m_data;
-	if(arr.Count() < 2) return;
-
-	wxGridStringArray temp;
-
-	temp .Add(arr[0]);
-	int i;
-	do{
-		sort = false;
-		i = 0;
-		do
-		{
-			if(ascending) 
-			{
-				if((arr[i][col] > arr[i+1][col]))
-				{
-					temp[0] = arr[i];
-					arr[i]  = arr[i+1];
-					arr[i+1]  = temp[0];
-					sort = true;
-				}
-			}
-			else
-			{
-				if((arr[i+1][col] > arr[i][col]))
-				{
-					temp[0] = arr[i];
-					arr[i]  = arr[i+1];
-					arr[i+1]  = temp[0];
-					sort = true;
-				}
-			}
-			i++;
-		}while(i < grid->GetNumberRows()-1);
-	}while(sort);
-
-	data->m_data = arr;
-
-	if(m_menu2->IsChecked(MENUCREWONBOARD))
-		crewList->filterCrewMembers();
-	else
-		grid->ForceRefresh();
+    if ( m_menu2->IsChecked( MENUCREWONBOARD ) )
+        crewList->filterCrewMembers();
+    else
+        grid->ForceRefresh();
 }
 
 //////////////////////////////////////////////////////////
@@ -5196,468 +5205,493 @@
 //////////////////////////////////////////////////////////
 void LogbookDialog::m_gridCrewOnGridCellLeftClick( wxGridEvent& event )
 {
-	if(!this->IsShown()) return;
-	crewList->selRow = event.GetRow();
-	crewList->selCol = event.GetCol();
-	m_gridCrew->SetGridCursor(crewList->selRow,crewList->selCol);
-	crewList->selstr = m_gridCrew->GetCellValue(crewList->selRow,crewList->selCol);
-	event.Skip();
+    if ( !this->IsShown() ) return;
+    crewList->selRow = event.GetRow();
+    crewList->selCol = event.GetCol();
+    m_gridCrew->SetGridCursor( crewList->selRow,crewList->selCol );
+    crewList->selstr = m_gridCrew->GetCellValue( crewList->selRow,crewList->selCol );
+    event.Skip();
 }
 
 void LogbookDialog::OnGridCellLeftClickWatch( wxGridEvent& event )
 {
-	if(!this->IsShown()) return;
-	crewList->selRowWake = event.GetRow();
-	crewList->selColWake = event.GetCol();
+    if ( !this->IsShown() ) return;
+    crewList->selRowWake = event.GetRow();
+    crewList->selColWake = event.GetCol();
 
-	if(event.GetRow() == 3)
-		crewList->wakeMemberDrag(event.GetRow(), event.GetCol());
+    if ( event.GetRow() == 3 )
+        crewList->wakeMemberDrag( event.GetRow(), event.GetCol() );
 
-	m_gridCrewWake->SetGridCursor(event.GetRow(), event.GetCol());
+    m_gridCrewWake->SetGridCursor( event.GetRow(), event.GetCol() );
 
-	event.Skip();
+    event.Skip();
 }
 
 void LogbookDialog::OnChoiceCrew( wxCommandEvent& event )
 {
-	if(m_radioBtnHTMLCrew->GetValue())
-		logbookPlugIn->opt->crewGridLayoutChoice = event.GetSelection();
-	else
-		logbookPlugIn->opt->crewGridLayoutChoiceODT = event.GetSelection();
+    if ( m_radioBtnHTMLCrew->GetValue() )
+        logbookPlugIn->opt->crewGridLayoutChoice = event.GetSelection();
+    else
+        logbookPlugIn->opt->crewGridLayoutChoiceODT = event.GetSelection();
 }
 
 void LogbookDialog::OnLeftUpStartTime( wxMouseEvent& event )
 {
-	m_textCtrlWatchStartTime->SetSelection(-1,-1);
-	event.Skip();
+    m_textCtrlWatchStartTime->SetSelection( -1,-1 );
+    event.Skip();
 }
 
 void LogbookDialog::OnLeftUpDays( wxMouseEvent& event )
 {
-	m_textCtrlWakeTrip->SetSelection(-1,-1);
-	event.Skip();
+    m_textCtrlWakeTrip->SetSelection( -1,-1 );
+    event.Skip();
 }
 
 void LogbookDialog::OnLeftUpDay( wxMouseEvent& event )
 {
-	m_textCtrlWakeDay->SetSelection(-1,-1);
-	event.Skip();
+    m_textCtrlWakeDay->SetSelection( -1,-1 );
+    event.Skip();
 }
 
 void LogbookDialog::crewAddOnButtonClick( wxCommandEvent& ev )
 {
-	crewList->addCrew(m_gridCrew,m_gridCrewWake);
+    crewList->addCrew( m_gridCrew,m_gridCrewWake );
 }
 
 void LogbookDialog::OnGridCellRightClickWake( wxGridEvent& event )
 {
-	m_gridCrewWake->SetFocus();
-	crewList->rightClickMenu(event.GetRow(),event.GetCol());
-	event.Skip();
+    m_gridCrewWake->SetFocus();
+    crewList->rightClickMenu( event.GetRow(),event.GetCol() );
+    event.Skip();
 }
 
 void LogbookDialog::OnMenuSelectionAsc( wxCommandEvent& event )
 {
-	int col;
+    int col;
 
-	col = m_gridCrew->GetGridCursorCol();
-	sortGrid(m_gridCrew,col,true);
+    col = m_gridCrew->GetGridCursorCol();
+    sortGrid( m_gridCrew,col,true );
 }
 
 void LogbookDialog::OnMenuSelectionDesc( wxCommandEvent& event )
 {
-	int col;
+    int col;
 
-	col = m_gridCrew->GetGridCursorCol();
-	sortGrid(m_gridCrew,col,false);
+    col = m_gridCrew->GetGridCursorCol();
+    sortGrid( m_gridCrew,col,false );
 }
 
 void LogbookDialog::OnGridLabelLeftDClickCrew( wxGridEvent& ev )
 {
-	if(ev.GetCol() == -1) return;
-	int count = 0;
+    if ( ev.GetCol() == -1 ) return;
+    int count = 0;
 
-	for(int i = 0; i < m_gridCrew->GetNumberCols() && count < 2; i++)
-		if(m_gridCrew->GetColumnWidth(i) > 0)
-			count++;
+    for ( int i = 0; i < m_gridCrew->GetNumberCols() && count < 2; i++ )
+        if ( m_gridCrew->GetColumnWidth( i ) > 0 )
+            count++;
 
-	if(count < 2) return;
+    if ( count < 2 ) return;
 
-	m_gridCrew->SetColumnWidth(ev.GetCol(),0);
-	m_gridCrew->Refresh();
+    m_gridCrew->SetColumnWidth( ev.GetCol(),0 );
+    m_gridCrew->Refresh();
 }
 
 void LogbookDialog::OnGridLabelLeftDClickCrewWake( wxGridEvent& ev )
 {
-	if(ev.GetCol() == -1) return;
-	int count = 0;
+    if ( ev.GetCol() == -1 ) return;
+    int count = 0;
 
-	for(int i = 0; i < m_gridCrewWake->GetNumberCols() && count < 2; i++)
-		if(m_gridCrewWake->GetColumnWidth(i) > 0)
-			count++;
-
-	if(count < 2) return;
-	m_gridCrewWake->SetColumnWidth(ev.GetCol(),0);
-	m_gridCrewWake->Refresh();
+    for ( int i = 0; i < m_gridCrewWake->GetNumberCols() && count < 2; i++ )
+        if ( m_gridCrewWake->GetColumnWidth( i ) > 0 )
+            count++;
+
+    if ( count < 2 ) return;
+    m_gridCrewWake->SetColumnWidth( ev.GetCol(),0 );
+    m_gridCrewWake->Refresh();
 }
 
 void LogbookDialog::OnMenuSelectionHiddenCrew( wxCommandEvent& event )
 {
-	for(int i = 0; i < m_gridCrew->GetNumberCols(); i++)
-		if(m_gridCrew->GetColumnWidth(i) == 0)
-		{
-			m_gridCrew->SetColumnWidth(i,1);
-			m_gridCrew->AutoSizeColumn(i,false);
-		}
+    for ( int i = 0; i < m_gridCrew->GetNumberCols(); i++ )
+        if ( m_gridCrew->GetColumnWidth( i ) == 0 )
+        {
+            m_gridCrew->SetColumnWidth( i,1 );
+            m_gridCrew->AutoSizeColumn( i,false );
+        }
 
-	m_gridCrew->Refresh();
+    m_gridCrew->Refresh();
 }
 
 void LogbookDialog::OnMenuSelectionMergeWatch( wxCommandEvent& event )
 {
-	crewList->mergeWatches();
+    crewList->mergeWatches();
 }
 
 void LogbookDialog::OnMenuSelectionSplitWatch( wxCommandEvent& event )
 {
-	crewList->splitWatch();
+    crewList->splitWatch();
 }
 
 void LogbookDialog::OnTextEnterDayWake( wxCommandEvent& event )
 {
-	crewList->enterDay();
+    crewList->enterDay();
 }
 
 void LogbookDialog::OnMenuSelectionDeleteMembers( wxCommandEvent& event )
 {
-	crewList->deleteMembers();
+    crewList->deleteMembers();
 }
 
 void LogbookDialog::OnGridEditorShownCrew( wxGridEvent& ev )
 {
-	if(!this->IsShown()) return;
+    if ( !this->IsShown() ) return;
 
-	selGridRow = ev.GetRow();
-	selGridCol = ev.GetCol();
+    selGridRow = ev.GetRow();
+    selGridCol = ev.GetCol();
 
-	crewList->lastSelectedName      = m_gridCrew->GetCellValue(ev.GetRow(),CrewList::NAME); 
-	crewList->lastSelectedFirstName = m_gridCrew->GetCellValue(ev.GetRow(),CrewList::FIRSTNAME); 
+    crewList->lastSelectedName      = m_gridCrew->GetCellValue( ev.GetRow(),CrewList::NAME );
+    crewList->lastSelectedFirstName = m_gridCrew->GetCellValue( ev.GetRow(),CrewList::FIRSTNAME );
 
-	ev.Skip();
+    ev.Skip();
 }
 
 void LogbookDialog::OnMenuSelectionNewWatchWake( wxCommandEvent& event )
 {
-	crewList->setAsNewWatchbase();
+    crewList->setAsNewWatchbase();
 }
 
 
 void LogbookDialog::crewSaveOnButtonClick( wxCommandEvent& ev )
 {
-	wxString layout;
-	wxString filter = saveDialogFilter;
-	if(m_radioBtnHTMLCrew->GetValue())
-		filter.Prepend(_T("HTML Format(*.html)|*.html|"));
-	else
-		filter.Prepend(_T("Opendocument Text(*.odt)|*.odt|"));
-
-	filter.Replace(_T("Logbook"),_T("CrewList"));
-	wxFileDialog *saveFileDialog = 
-			new wxFileDialog(this, _("Save CrewList File"), _T(""), _T("CrewList"),
-										   filter, 
-										   wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+    wxString layout;
+    wxString filter = saveDialogFilter;
+    if ( m_radioBtnHTMLCrew->GetValue() )
+        filter.Prepend( _T( "HTML Format(*.html)|*.html|" ) );
+    else
+        filter.Prepend( _T( "Opendocument Text(*.odt)|*.odt|" ) );
 
-	if (saveFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    filter.Replace( _T( "Logbook" ),_T( "CrewList" ) );
+    wxFileDialog *saveFileDialog =
+        new wxFileDialog( this, _( "Save CrewList File" ), _T( "" ), _T( "CrewList" ),
+                          filter,
+                          wxFD_SAVE|wxFD_OVERWRITE_PROMPT );
+
+    if ( saveFileDialog->ShowModal() == wxID_CANCEL )
+        return;
 
-	wxString path = saveFileDialog->GetPath();
-	int sel = saveFileDialog->GetFilterIndex();
+    wxString path = saveFileDialog->GetPath();
+    int sel = saveFileDialog->GetFilterIndex();
 
-    layout = crewChoice->GetString(crewChoice->GetSelection());
-    if(logbook->opt->filterLayout[LogbookDialog::CREW])
-        layout.Prepend(logbook->opt->layoutPrefix[LogbookDialog::CREW]);
-
-	switch(sel)
-	{
-	case 0: if(m_radioBtnHTMLCrew->GetValue())
-				crewList->saveHTML(path, layout, false); 
-			else
-				crewList->saveODT(path, layout, true); 
-			break;
-	case 1: crewList->saveODS(path); break;
-	case 2:	crewList->saveXML(path); break;
-	case 3: crewList->saveCSV(path); break;
-	case 4: crewList->backup(path); break;
-	default: wxMessageBox(_T("Not implemented yet"),_T("Information")); break;
-	}
+    layout = crewChoice->GetString( crewChoice->GetSelection() );
+    if ( logbook->opt->filterLayout[LogbookDialog::CREW] )
+        layout.Prepend( logbook->opt->layoutPrefix[LogbookDialog::CREW] );
+
+    switch ( sel )
+    {
+    case 0:
+        if ( m_radioBtnHTMLCrew->GetValue() )
+            crewList->saveHTML( path, layout, false );
+        else
+            crewList->saveODT( path, layout, true );
+        break;
+    case 1:
+        crewList->saveODS( path );
+        break;
+    case 2:
+        crewList->saveXML( path );
+        break;
+    case 3:
+        crewList->saveCSV( path );
+        break;
+    case 4:
+        crewList->backup( path );
+        break;
+    default:
+        wxMessageBox( _T( "Not implemented yet" ),_T( "Information" ) );
+        break;
+    }
 }
 
 void LogbookDialog::crewViewOnButtonClick( wxCommandEvent& ev )
 {
-	if(this->m_radioBtnHTMLCrew->GetValue())
-		crewList->viewHTML(_T(""),crewChoice->GetString(crewChoice->GetSelection()));
-	else
-		crewList->viewODT(_T(""),crewChoice->GetString(crewChoice->GetSelection()));
+    if ( this->m_radioBtnHTMLCrew->GetValue() )
+        crewList->viewHTML( _T( "" ),crewChoice->GetString( crewChoice->GetSelection() ) );
+    else
+        crewList->viewODT( _T( "" ),crewChoice->GetString( crewChoice->GetSelection() ) );
 }
 
-void LogbookDialog::onButtonClickReloadLayoutsCrew(wxCommandEvent &ev)
+void LogbookDialog::onButtonClickReloadLayoutsCrew( wxCommandEvent &ev )
 {
-	loadLayoutChoice(LogbookDialog::CREW,crewList->layout_locn,crewChoice,logbookPlugIn->opt->layoutPrefix[LogbookDialog::CREW]);
+    loadLayoutChoice( LogbookDialog::CREW,crewList->layout_locn,crewChoice,logbookPlugIn->opt->layoutPrefix[LogbookDialog::CREW] );
 }
 
-void LogbookDialog::onButtonClickEditLayoutCrew(wxCommandEvent &ev)
+void LogbookDialog::onButtonClickEditLayoutCrew( wxCommandEvent &ev )
 {
-	int format;
+    int format;
 
-	if(m_radioBtnODTCrew->GetValue())
-		format = ODT;
-	else
-		format = HTML;
+    if ( m_radioBtnODTCrew->GetValue() )
+        format = ODT;
+    else
+        format = HTML;
 
-	showLayoutDialog(LogbookDialog::CREW,crewChoice,crewList->layout_locn, format);
+    showLayoutDialog( LogbookDialog::CREW,crewChoice,crewList->layout_locn, format );
 }
 
-void LogbookDialog::onRadioButtonHTMLCrew(wxCommandEvent &ev)
+void LogbookDialog::onRadioButtonHTMLCrew( wxCommandEvent &ev )
 {
-	crewList->setLayoutLocation(layoutHTML);
-	logbookPlugIn->opt->crewHTML = true;
+    crewList->setLayoutLocation( layoutHTML );
+    logbookPlugIn->opt->crewHTML = true;
 }
 
-void LogbookDialog::onRadioButtonODTCrew(wxCommandEvent &ev)
+void LogbookDialog::onRadioButtonODTCrew( wxCommandEvent &ev )
 {
-	crewList->setLayoutLocation(layoutODT);
-	logbookPlugIn->opt->crewHTML = false;
+    crewList->setLayoutLocation( layoutODT );
+    logbookPlugIn->opt->crewHTML = false;
 }
 
 void LogbookDialog::m_gridCrewOnGridCellChange( wxGridEvent& ev )
 {
-	crewList->changeCrew(m_gridCrew,ev.GetRow(),ev.GetCol(),0);
+    crewList->changeCrew( m_gridCrew,ev.GetRow(),ev.GetCol(),0 );
 }
 
 void LogbookDialog::m_gridCrewOnGridCellRightClick( wxGridEvent& ev )
 {
-	selGridRow = ev.GetRow();
-	selGridCol = ev.GetCol();
+    selGridRow = ev.GetRow();
+    selGridCol = ev.GetCol();
 
-	crewList->lastSelectedName      = m_gridCrew->GetCellValue(selGridRow,CrewList::NAME); 
-	crewList->lastSelectedFirstName = m_gridCrew->GetCellValue(selGridRow,CrewList::FIRSTNAME); 
+    crewList->lastSelectedName      = m_gridCrew->GetCellValue( selGridRow,CrewList::NAME );
+    crewList->lastSelectedFirstName = m_gridCrew->GetCellValue( selGridRow,CrewList::FIRSTNAME );
 
-	m_gridCrew->SetGridCursor(selGridRow,selGridCol);
-	m_gridCrew->PopupMenu( m_menu2, ev.GetPosition() );
+    m_gridCrew->SetGridCursor( selGridRow,selGridCol );
+    m_gridCrew->PopupMenu( m_menu2, ev.GetPosition() );
 }
 
 void LogbookDialog::m_menuItem2OnMenuSelection( wxCommandEvent& ev )
 {
-	crewList->deleteRow(selGridRow);
-	crewList->modified = true;
+    crewList->deleteRow( selGridRow );
+    crewList->modified = true;
 
-	if(m_menu2->IsChecked(MENUCREWONBOARD))
-		crewList->filterCrewMembers();
+    if ( m_menu2->IsChecked( MENUCREWONBOARD ) )
+        crewList->filterCrewMembers();
 }
 
 void LogbookDialog::OnKeyDownCrew( wxKeyEvent& ev )
 {
-	int offset;
-	int col = m_gridCrew->GetGridCursorCol();
-	int row = m_gridCrew->GetGridCursorRow();
-
-	if((ev.GetKeyCode() != WXK_TAB) || (ev.ShiftDown() && ev.GetKeyCode() != WXK_TAB)) 
-		{ ev.Skip(); return; }
-
-	if ((ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || 
-		(ev.GetKeyCode() == WXK_LEFT))
-			offset = -1; 
-
-	if ((!ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || 
-		(ev.GetKeyCode() == WXK_RIGHT))
-			offset = 1; 
-
-	while((col+offset < m_gridCrew->GetNumberCols()-1) && (col+offset > 0))
-	{
-		if(m_gridCrew->GetColSize(col+offset) == 0)
-			col += offset;
-		else
-			break;
-	}
-
-	if(col+offset == 0 && m_gridCrew->GetColSize(0) == 0)
-		col = m_gridCrew->GetNumberCols()-1;
-	if((col+offset == m_gridCrew->GetNumberCols()-1) && (m_gridCrew->GetColSize(col+offset) == 0))
-		col = 0;
-	m_gridCrew->SetGridCursor(row,col);
-	ev.Skip();
+    int offset;
+    int col = m_gridCrew->GetGridCursorCol();
+    int row = m_gridCrew->GetGridCursorRow();
+
+    if ( ( ev.GetKeyCode() != WXK_TAB ) || ( ev.ShiftDown() && ev.GetKeyCode() != WXK_TAB ) )
+    {
+        ev.Skip();
+        return;
+    }
+
+    if ( ( ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) ||
+            ( ev.GetKeyCode() == WXK_LEFT ) )
+        offset = -1;
+
+    if ( ( !ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) ||
+            ( ev.GetKeyCode() == WXK_RIGHT ) )
+        offset = 1;
+
+    while ( ( col+offset < m_gridCrew->GetNumberCols()-1 ) && ( col+offset > 0 ) )
+    {
+        if ( m_gridCrew->GetColSize( col+offset ) == 0 )
+            col += offset;
+        else
+            break;
+    }
+
+    if ( col+offset == 0 && m_gridCrew->GetColSize( 0 ) == 0 )
+        col = m_gridCrew->GetNumberCols()-1;
+    if ( ( col+offset == m_gridCrew->GetNumberCols()-1 ) && ( m_gridCrew->GetColSize( col+offset ) == 0 ) )
+        col = 0;
+    m_gridCrew->SetGridCursor( row,col );
+    ev.Skip();
 }
 
 void LogbookDialog::OnKeyDownWatch( wxKeyEvent& ev )
 {
-	int offset;
-	int col = m_gridCrewWake->GetGridCursorCol();
-	int row = m_gridCrewWake->GetGridCursorRow();
-
-	if((ev.GetKeyCode() != WXK_TAB) || (ev.ShiftDown() && ev.GetKeyCode() != WXK_TAB)) 
-		{ ev.Skip(); return; }
-
-	if ((ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || 
-		(ev.GetKeyCode() == WXK_LEFT))
-			offset = -1; 
-
-	if ((!ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || 
-		(ev.GetKeyCode() == WXK_RIGHT))
-			offset = 1; 
-
-	while((col+offset < m_gridCrewWake->GetNumberCols()-1) && (col+offset > 0))
-	{
-		if(m_gridCrewWake->GetColSize(col+offset) == 0)
-			col += offset;
-		else
-			break;
-	}
-
-	if(col+offset == 0 && m_gridCrewWake->GetColSize(0) == 0)
-		col = m_gridCrewWake->GetNumberCols()-1;
-	if((col+offset == m_gridCrewWake->GetNumberCols()-1) && (m_gridCrewWake->GetColSize(col+offset) == 0))
-		col = 0;
-	m_gridCrewWake->SetGridCursor(row,col);
-	ev.Skip();
+    int offset;
+    int col = m_gridCrewWake->GetGridCursorCol();
+    int row = m_gridCrewWake->GetGridCursorRow();
+
+    if ( ( ev.GetKeyCode() != WXK_TAB ) || ( ev.ShiftDown() && ev.GetKeyCode() != WXK_TAB ) )
+    {
+        ev.Skip();
+        return;
+    }
+
+    if ( ( ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) ||
+            ( ev.GetKeyCode() == WXK_LEFT ) )
+        offset = -1;
+
+    if ( ( !ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) ||
+            ( ev.GetKeyCode() == WXK_RIGHT ) )
+        offset = 1;
+
+    while ( ( col+offset < m_gridCrewWake->GetNumberCols()-1 ) && ( col+offset > 0 ) )
+    {
+        if ( m_gridCrewWake->GetColSize( col+offset ) == 0 )
+            col += offset;
+        else
+            break;
+    }
+
+    if ( col+offset == 0 && m_gridCrewWake->GetColSize( 0 ) == 0 )
+        col = m_gridCrewWake->GetNumberCols()-1;
+    if ( ( col+offset == m_gridCrewWake->GetNumberCols()-1 ) && ( m_gridCrewWake->GetColSize( col+offset ) == 0 ) )
+        col = 0;
+    m_gridCrewWake->SetGridCursor( row,col );
+    ev.Skip();
 }
 
 void LogbookDialog::OnButtonClickWakeClear( wxCommandEvent& event )
 {
-	crewList->clearWake();
-	event.Skip();
+    crewList->clearWake();
+    event.Skip();
 }
 
 void LogbookDialog::OnButtonClickCalculate( wxCommandEvent& event )
 {
-	crewList->Calculate();
+    crewList->Calculate();
 }
 
 void LogbookDialog::OnButtonClickReset( wxCommandEvent& event )
 {
-	crewList->Reset();
+    crewList->Reset();
 }
 
 void LogbookDialog::OnButtonClickDayPlus( wxCommandEvent& event )
 {
-	crewList->dayPlus();
+    crewList->dayPlus();
 }
 
 void LogbookDialog::OnButtonClickNow( wxCommandEvent& event )
 {
-	crewList->dayNow(false);
+    crewList->dayNow( false );
 }
 
 void LogbookDialog::OnLeftDownWatchStartDate( wxMouseEvent& event )
 {
-		crewList->dateTextCtrlClicked();
+    crewList->dateTextCtrlClicked();
 }
 
 void LogbookDialog::OnTextEnterWatchTime( wxCommandEvent& event )
 {
-	crewList->timeTextCtrlTextEntered(event);
+    crewList->timeTextCtrlTextEntered( event );
 }
 
 void LogbookDialog::OnButtonClickDayMinus( wxCommandEvent& event )
 {
-	crewList->dayMinus();
+    crewList->dayMinus();
 }
 
 void LogbookDialog::OnMenuSelectionFlipWatches( wxCommandEvent& event )
 {
-	crewList->flipWatches();
+    crewList->flipWatches();
 }
 
 void LogbookDialog::m_gridCrewWakeOnGridCellChange( wxGridEvent& ev )
 {
 
-	static bool insertCols = false;
+    static bool insertCols = false;
+
+    crewList->changeCrewWake( m_gridCrewWake,ev.GetRow(),ev.GetCol(),&insertCols );
+    m_gridCrewWake->ForceRefresh();
+    if ( ev.GetRow() == 1 || ev.GetRow() == 2 )
+    {
+        ev.Skip();
+        return;
+    }
+
+    if ( ev.GetCol() == 0 && m_gridCrewWake->GetNumberCols() == 1 )
+    {
+        insertCols = true;
+        crewList->insertDefaultCols( &insertCols );
+        insertCols = false;
+        if ( m_gridCrewWake->GetNumberCols() > 1 )
+            m_buttonCalculate->Enable();
+        ev.Skip();
+        return;
+    }
+
+    if ( insertCols )
+    {
+        ev.Skip();
+        return;
+    }
 
-	crewList->changeCrewWake(m_gridCrewWake,ev.GetRow(),ev.GetCol(),&insertCols);
-	m_gridCrewWake->ForceRefresh();
-	if(ev.GetRow() == 1 || ev.GetRow() == 2) { 	ev.Skip(); return; }
-
-	if(ev.GetCol() == 0 && m_gridCrewWake->GetNumberCols() == 1)
-		{
-			insertCols = true;
-			crewList->insertDefaultCols(&insertCols);
-			insertCols = false;
-			if(m_gridCrewWake->GetNumberCols() > 1)
-				m_buttonCalculate->Enable();
-			ev.Skip();
-			return;
-		}
-
-	if(insertCols) { ev.Skip(); return; }
-
-	insertCols = true;
-	m_gridCrewWake->BeginBatch();
-	crewList->updateWatchTime(0,ev.GetCol(),&insertCols);
-	m_gridCrewWake->EndBatch();
-	insertCols = false;
-	m_buttonCalculate->Enable();
+    insertCols = true;
+    m_gridCrewWake->BeginBatch();
+    crewList->updateWatchTime( 0,ev.GetCol(),&insertCols );
+    m_gridCrewWake->EndBatch();
+    insertCols = false;
+    m_buttonCalculate->Enable();
 
-	crewList->updateLine();
+    crewList->updateLine();
 
-	ev.Skip();
+    ev.Skip();
 }
 
 void LogbookDialog::OnGridEditorHiddenWatch( wxGridEvent& event )
 {
-	crewList->watchEditorHidden(event.GetRow(),event.GetCol());
-	event.Skip();
+    crewList->watchEditorHidden( event.GetRow(),event.GetCol() );
+    event.Skip();
 }
 
 void LogbookDialog::OnGridEditorShownWatch( wxGridEvent& event )
 {
-	crewList->watchEditorShown(event.GetRow(), event.GetCol());
-	event.Skip();
+    crewList->watchEditorShown( event.GetRow(), event.GetCol() );
+    event.Skip();
 }
 
 void LogbookDialog::OnMotion( wxMouseEvent& event )
 {
-	crewList->watchEditorHighlight(event);
-	event.Skip();
+    crewList->watchEditorHighlight( event );
+    event.Skip();
 }
 
 void LogbookDialog::OnGridEditorCreatedWatch( wxGridEditorCreatedEvent& event )
 {
-	event.Skip();
-	if(event.GetRow() == 3)
-		crewList->watchEditorShown(event.GetRow(), event.GetCol());
+    event.Skip();
+    if ( event.GetRow() == 3 )
+        crewList->watchEditorShown( event.GetRow(), event.GetCol() );
 }
 
 void LogbookDialog::OnSplitterSashPositionChangedWake( wxSplitterEvent& event )
 {
-	m_gridCrewWake->SetGridCursor(crewList->selRowWake,crewList->selColWake);
+    m_gridCrewWake->SetGridCursor( crewList->selRowWake,crewList->selColWake );
 }
 
 void LogbookDialog::OnGridLabelRightClickWake( wxGridEvent& event )
 {
-	m_gridCrewWake->HideCellEditControl();
-	m_gridCrewWake->SetFocus();
-	event.Skip();
-	crewList->rightClickMenu(0, event.GetCol());
+    m_gridCrewWake->HideCellEditControl();
+    m_gridCrewWake->SetFocus();
+    event.Skip();
+    crewList->rightClickMenu( 0, event.GetCol() );
 }
 
 void LogbookDialog::OnGridLabelLeftClickWake( wxGridEvent& event )
 {
-	m_gridCrewWake->SetFocus();
-	event.Skip();
-	m_gridCrewWake->HideCellEditControl();
+    m_gridCrewWake->SetFocus();
+    event.Skip();
+    m_gridCrewWake->HideCellEditControl();
 }
 
 void LogbookDialog::OnMenuSelectionOnboardCrew( wxCommandEvent& event )
 {
-	m_menu2->Check(MENUCREWONBOARD,true);
-	m_menu2->Check(MENUCREWALL,false);
-	crewList->filterCrewMembers();
+    m_menu2->Check( MENUCREWONBOARD,true );
+    m_menu2->Check( MENUCREWALL,false );
+    crewList->filterCrewMembers();
 }
 
 void LogbookDialog::OnMenuSelectionAllEntriesCrew( wxCommandEvent& event )
 {
-	m_menu2->Check(MENUCREWALL,true);
-	m_menu2->Check(MENUCREWONBOARD,false);
-	crewList->showAllCrewMembers();
+    m_menu2->Check( MENUCREWALL,true );
+    m_menu2->Check( MENUCREWONBOARD,false );
+    crewList->showAllCrewMembers();
 }
 
 /////////////////////////////////////////////////////////////
@@ -5666,1169 +5700,1306 @@
 
 void LogbookDialog::boataddEquipmentButtonOnButtonClick( wxCommandEvent& ev )
 {
-	this->m_toggleBtnShowEquipment->SetValue(true);
-    OnToggleButtonShowEquip(ev);
-	boat->addEquip();
+    this->m_toggleBtnShowEquipment->SetValue( true );
+    OnToggleButtonShowEquip( ev );
+    boat->addEquip();
 }
 
 void LogbookDialog::OnChoiceBoat( wxCommandEvent& event )
 {
-	if(m_radioBtnHTMLBoat->GetValue())
-		logbookPlugIn->opt->boatGridLayoutChoice = event.GetSelection();
-	else
-		logbookPlugIn->opt->boatGridLayoutChoiceODT = event.GetSelection();
-}
-
-void LogbookDialog::OnToggleButtonShowEquip(wxCommandEvent& ev)
-{
-	if(m_toggleBtnShowEquipment->GetValue())
-	{
-		m_toggleBtnShowEquipment->SetLabel(_("Hide Equipment"));
-		m_toggleBtnShowEquipment->Refresh();
-		if(m_splitter1->GetSashPosition() != 100)
-			sashPos = m_panel72->GetSize().GetY();
-		m_splitter1->SetSashPosition(100);
-	}
-	else
-	{
-		m_toggleBtnShowEquipment->SetLabel(_("Show Equipment"));
-		m_toggleBtnShowEquipment->Refresh();
-	    m_splitter1->SetSashPosition(sashPos);
-	}
+    if ( m_radioBtnHTMLBoat->GetValue() )
+        logbookPlugIn->opt->boatGridLayoutChoice = event.GetSelection();
+    else
+        logbookPlugIn->opt->boatGridLayoutChoiceODT = event.GetSelection();
+}
+
+void LogbookDialog::OnToggleButtonShowEquip( wxCommandEvent& ev )
+{
+    if ( m_toggleBtnShowEquipment->GetValue() )
+    {
+        m_toggleBtnShowEquipment->SetLabel( _( "Hide Equipment" ) );
+        m_toggleBtnShowEquipment->Refresh();
+        if ( m_splitter1->GetSashPosition() != 100 )
+            sashPos = m_panel72->GetSize().GetY();
+        m_splitter1->SetSashPosition( 100 );
+    }
+    else
+    {
+        m_toggleBtnShowEquipment->SetLabel( _( "Show Equipment" ) );
+        m_toggleBtnShowEquipment->Refresh();
+        m_splitter1->SetSashPosition( sashPos );
+    }
 }
 
 void LogbookDialog::boatSaveOnButtonClick( wxCommandEvent& ev )
 {
-	wxString filter = saveDialogFilter;
-	wxString layout;
+    wxString filter = saveDialogFilter;
+    wxString layout;
 
-	if(m_radioBtnHTMLBoat->GetValue())
-		filter.Prepend(_T("HTML Format(*.html)|*.html|"));
-	else
-		filter.Prepend(_T("Opendocument Text(*.odt)|*.odt|"));
-	filter.Replace(_T("Logbook"),_T("Boat"));
-	wxFileDialog *saveFileDialog = 
-			new wxFileDialog(this, _("Save Boat File"), _T(""), _T("Boat"),
-										   filter, 
-										   wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+    if ( m_radioBtnHTMLBoat->GetValue() )
+        filter.Prepend( _T( "HTML Format(*.html)|*.html|" ) );
+    else
+        filter.Prepend( _T( "Opendocument Text(*.odt)|*.odt|" ) );
+    filter.Replace( _T( "Logbook" ),_T( "Boat" ) );
+    wxFileDialog *saveFileDialog =
+        new wxFileDialog( this, _( "Save Boat File" ), _T( "" ), _T( "Boat" ),
+                          filter,
+                          wxFD_SAVE|wxFD_OVERWRITE_PROMPT );
 
-	if (saveFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    if ( saveFileDialog->ShowModal() == wxID_CANCEL )
+        return;
 
-	wxString path = saveFileDialog->GetPath();
-	int sel = saveFileDialog->GetFilterIndex();
+    wxString path = saveFileDialog->GetPath();
+    int sel = saveFileDialog->GetFilterIndex();
 
-    layout = boatChoice->GetString(boatChoice->GetSelection());
-    if(logbook->opt->filterLayout[LogbookDialog::BOAT])
-        layout.Prepend(logbook->opt->layoutPrefix[LogbookDialog::BOAT]);
-
-	switch(sel)
-	{
-	case 0: if(m_radioBtnHTMLBoat->GetValue())
-				boat->toHTML(path, layout, true); 
-			else
-				boat->toODT(path, layout, true); 
-		break;
-	case 1: boat->toODS(path); break;
-	case 2:	boat->toXML(path); break;
-	case 3: boat->toCSV(path); break;
-	case 4: boat->backup(path); break;
-	default: wxMessageBox(_T("Not implemented yet"),_T("Information")); break;
-	}
+    layout = boatChoice->GetString( boatChoice->GetSelection() );
+    if ( logbook->opt->filterLayout[LogbookDialog::BOAT] )
+        layout.Prepend( logbook->opt->layoutPrefix[LogbookDialog::BOAT] );
+
+    switch ( sel )
+    {
+    case 0:
+        if ( m_radioBtnHTMLBoat->GetValue() )
+            boat->toHTML( path, layout, true );
+        else
+            boat->toODT( path, layout, true );
+        break;
+    case 1:
+        boat->toODS( path );
+        break;
+    case 2:
+        boat->toXML( path );
+        break;
+    case 3:
+        boat->toCSV( path );
+        break;
+    case 4:
+        boat->backup( path );
+        break;
+    default:
+        wxMessageBox( _T( "Not implemented yet" ),_T( "Information" ) );
+        break;
+    }
 }
 
 void LogbookDialog::boatViewOnButtonClick( wxCommandEvent& ev )
 {
-	if(this->m_radioBtnHTMLBoat->GetValue())
-		boat->viewHTML(_T(""),boatChoice->GetString(boatChoice->GetSelection()),false);
-	else
-		boat->viewODT(_T(""),boatChoice->GetString(boatChoice->GetSelection()),false);
+    if ( this->m_radioBtnHTMLBoat->GetValue() )
+        boat->viewHTML( _T( "" ),boatChoice->GetString( boatChoice->GetSelection() ),false );
+    else
+        boat->viewODT( _T( "" ),boatChoice->GetString( boatChoice->GetSelection() ),false );
 }
 
-void LogbookDialog::onButtonClickReloadLayoutsBoat(wxCommandEvent & ev)
+void LogbookDialog::onButtonClickReloadLayoutsBoat( wxCommandEvent & ev )
 {
-	loadLayoutChoice(LogbookDialog::BOAT,boat->layout_locn,boatChoice,logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT]);
+    loadLayoutChoice( LogbookDialog::BOAT,boat->layout_locn,boatChoice,logbookPlugIn->opt->layoutPrefix[LogbookDialog::BOAT] );
 }
 
-void LogbookDialog::onButtonClickEditLayoutBoat(wxCommandEvent &ev)
+void LogbookDialog::onButtonClickEditLayoutBoat( wxCommandEvent &ev )
 {
-	int format;
+    int format;
 
-	if(m_radioBtnODTBoat->GetValue())
-		format = ODT;
-	else
-		format = HTML;
+    if ( m_radioBtnODTBoat->GetValue() )
+        format = ODT;
+    else
+        format = HTML;
 
-	showLayoutDialog(LogbookDialog::BOAT,boatChoice,boat->layout_locn, format);
+    showLayoutDialog( LogbookDialog::BOAT,boatChoice,boat->layout_locn, format );
 }
 
-void LogbookDialog::onRadioButtonHTMLBoat(wxCommandEvent &ev)
+void LogbookDialog::onRadioButtonHTMLBoat( wxCommandEvent &ev )
 {
-	boat->setLayoutLocation(layoutHTML);
-	logbookPlugIn->opt->boatHTML = true;
+    boat->setLayoutLocation( layoutHTML );
+    logbookPlugIn->opt->boatHTML = true;
 }
 
-void LogbookDialog::onRadioButtonODTBoat(wxCommandEvent &ev)
+void LogbookDialog::onRadioButtonODTBoat( wxCommandEvent &ev )
 {
-	boat->setLayoutLocation(layoutODT);
-	logbookPlugIn->opt->boatHTML = false;
+    boat->setLayoutLocation( layoutODT );
+    logbookPlugIn->opt->boatHTML = false;
 }
 
 void LogbookDialog::m_gridEquipmentOnGridCellChange( wxGridEvent& ev )
 {
-	boat->cellChanged(ev.GetRow(),ev.GetCol());
+    boat->cellChanged( ev.GetRow(),ev.GetCol() );
 }
 
 void LogbookDialog::m_gridEquipmentOnGridCellRightClick( wxGridEvent& ev )
 {
-	selGridRow = ev.GetRow();
-	selGridCol = ev.GetCol();
+    selGridRow = ev.GetRow();
+    selGridCol = ev.GetCol();
 
-	m_gridEquipment->PopupMenu( m_menu3, ev.GetPosition() ); 
+    m_gridEquipment->PopupMenu( m_menu3, ev.GetPosition() );
 }
 
 void LogbookDialog::boatNameOnTextEnter( wxCommandEvent& ev )
 {
-	boat->modified = true;
-	ev.Skip();
+    boat->modified = true;
+    ev.Skip();
 }
 
 void LogbookDialog::m_menuItem3OnMenuSelection( wxCommandEvent& ev )
 {
-	boat->deleteRow(selGridRow);
-	boat->modified = true;
+    boat->deleteRow( selGridRow );
+    boat->modified = true;
 }
 
-wxDateTime LogbookDialog::getDateTo(wxString filename)
+wxDateTime LogbookDialog::getDateTo( wxString filename )
 {
-	wxDateTime dt;
-	dt = dt.Now();
-	wxString from, to, token, year, month, day;
-	long tday;
-	long tmonth;
-	long tyear;
-
-	to = filename.substr(filename.find_first_of('_')+1);
-	to = to.substr(0,to.find_first_of('_')+1);
-	to = to.RemoveLast();
-	wxStringTokenizer tkz(to,_T("-"));
-	year = tkz.GetNextToken();
-	month = tkz.GetNextToken();
-	day = tkz.GetNextToken();
-	day.ToLong(&tday);
-	month.ToLong(&tmonth);
-	year.ToLong(&tyear);
-	dt.SetYear((int)tyear);
-	dt.SetMonth((wxDateTime::Month)(tmonth-1));
-	dt.SetDay((int)tday);
+    wxDateTime dt;
+    dt = dt.Now();
+    wxString from, to, token, year, month, day;
+    long tday;
+    long tmonth;
+    long tyear;
+
+    to = filename.substr( filename.find_first_of( '_' )+1 );
+    to = to.substr( 0,to.find_first_of( '_' )+1 );
+    to = to.RemoveLast();
+    wxStringTokenizer tkz( to,_T( "-" ) );
+    year = tkz.GetNextToken();
+    month = tkz.GetNextToken();
+    day = tkz.GetNextToken();
+    day.ToLong( &tday );
+    month.ToLong( &tmonth );
+    year.ToLong( &tyear );
+    dt.SetYear( ( int )tyear );
+    dt.SetMonth( ( wxDateTime::Month )( tmonth-1 ) );
+    dt.SetDay( ( int )tday );
 
-	return dt;
+    return dt;
 }
 
 ////////////////////////////////////////////////////////////
 //	 Maintenance
 ////////////////////////////////////////////////////////////
-void LogbookDialog::onButtobClickAddLineService(wxCommandEvent &ev)
+void LogbookDialog::onButtobClickAddLineService( wxCommandEvent &ev )
 {
-	maintenance->addLine();
-	maintenance->modified=true;
+    maintenance->addLine();
+    maintenance->modified=true;
 }
 
 void LogbookDialog::OnChoiceService( wxCommandEvent& event )
 {
-	if(m_radioBtnHTMLService->GetValue())
-		logbookPlugIn->opt->serviceGridLayoutChoice = event.GetSelection();
-	else
-		logbookPlugIn->opt->serviceGridLayoutChoiceODT = event.GetSelection();
+    if ( m_radioBtnHTMLService->GetValue() )
+        logbookPlugIn->opt->serviceGridLayoutChoice = event.GetSelection();
+    else
+        logbookPlugIn->opt->serviceGridLayoutChoiceODT = event.GetSelection();
 }
 
 void LogbookDialog::OnGridLabelLeftClickService( wxGridEvent& event )
 {
-	int row, col;
-	row = event.GetRow();
-	col = event.GetCol();
+    int row, col;
+    row = event.GetRow();
+    col = event.GetCol();
 
-	this->m_gridMaintanence->SetFocus();
+    this->m_gridMaintanence->SetFocus();
 
-	if(row != -1 || (row == -1 && col == -1)) { event.Skip(); return; }
+    if ( row != -1 || ( row == -1 && col == -1 ) )
+    {
+        event.Skip();
+        return;
+    }
 
-	this->m_gridMaintanence->SetGridCursor(0,col);
-	static bool ascending = true;
-	this->sortGrid(this->m_gridMaintanence,event.GetCol(),ascending);
-	ascending = !ascending;
+    this->m_gridMaintanence->SetGridCursor( 0,col );
+    static bool ascending = true;
+    this->sortGrid( this->m_gridMaintanence,event.GetCol(),ascending );
+    ascending = !ascending;
 
-	maintenance->checkService(m_gridGlobal->GetNumberRows()-1);
+    maintenance->checkService( m_gridGlobal->GetNumberRows()-1 );
 }
 
-void LogbookDialog::onButtobClickSaveService(wxCommandEvent & ev)
+void LogbookDialog::onButtobClickSaveService( wxCommandEvent & ev )
 {
-	wxString layout;
-	wxString filter = _T("");
-	if(m_radioBtnHTMLService->GetValue())
-		filter = _T("HTML Format(*.html)|*.html");
-	else
-		filter = _T("Opendocument Text(*.odt)|*.odt");
-
-	wxFileDialog *saveFileDialog = 
-			new wxFileDialog(this, _("Save Service File"), _T(""), _T("Service"),
-										   filter, 
-										   wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+    wxString layout;
+    wxString filter = _T( "" );
+    if ( m_radioBtnHTMLService->GetValue() )
+        filter = _T( "HTML Format(*.html)|*.html" );
+    else
+        filter = _T( "Opendocument Text(*.odt)|*.odt" );
 
-	if (saveFileDialog->ShowModal() == wxID_CANCEL)
-            return;
-	wxString path = saveFileDialog->GetPath();
-	int sel = saveFileDialog->GetFilterIndex();
+    wxFileDialog *saveFileDialog =
+        new wxFileDialog( this, _( "Save Service File" ), _T( "" ), _T( "Service" ),
+                          filter,
+                          wxFD_SAVE|wxFD_OVERWRITE_PROMPT );
 
-    layout = m_choiceSelectLayoutService->GetString(m_choiceSelectLayoutService->GetSelection());
-    if(logbook->opt->filterLayout[LogbookDialog::GSERVICE])
-        layout.Prepend(logbook->opt->layoutPrefix[LogbookDialog::GSERVICE]);
+    if ( saveFileDialog->ShowModal() == wxID_CANCEL )
+        return;
+    wxString path = saveFileDialog->GetPath();
+    int sel = saveFileDialog->GetFilterIndex();
 
-	switch(sel)
-	{
-	case 0: if(m_radioBtnHTMLService->GetValue())
-				maintenance->toHTML(0, path, layout, 2);
-			else
-				maintenance->toODT(0, path, layout, 2); 
-			break;
-	default: wxMessageBox(_T("Not implemented yet"),_T("Information")); break;
-	}
-	delete saveFileDialog;
+    layout = m_choiceSelectLayoutService->GetString( m_choiceSelectLayoutService->GetSelection() );
+    if ( logbook->opt->filterLayout[LogbookDialog::GSERVICE] )
+        layout.Prepend( logbook->opt->layoutPrefix[LogbookDialog::GSERVICE] );
+
+    switch ( sel )
+    {
+    case 0:
+        if ( m_radioBtnHTMLService->GetValue() )
+            maintenance->toHTML( 0, path, layout, 2 );
+        else
+            maintenance->toODT( 0, path, layout, 2 );
+        break;
+    default:
+        wxMessageBox( _T( "Not implemented yet" ),_T( "Information" ) );
+        break;
+    }
+    delete saveFileDialog;
 }
 
-void LogbookDialog::onButtonClickReloadLayoutsServiceHTML(wxCommandEvent &ev)
+void LogbookDialog::onButtonClickReloadLayoutsServiceHTML( wxCommandEvent &ev )
 {
-	maintenance->setLayoutLocation();
+    maintenance->setLayoutLocation();
 }
 
-void LogbookDialog::onGridCellLeftClickService(wxGridEvent &ev)
+void LogbookDialog::onGridCellLeftClickService( wxGridEvent &ev )
 {
-	if(!this->IsShown()) return;
-	maintenance->selectedRow = ev.GetRow();
-	maintenance->selectedCol = ev.GetCol();
+    if ( !this->IsShown() ) return;
+    maintenance->selectedRow = ev.GetRow();
+    maintenance->selectedCol = ev.GetCol();
 
-	if((maintenance->selectedCol == maintenance->WARN || maintenance->selectedCol == maintenance->URGENT) && 
-		m_gridMaintanence->GetCellValue(maintenance->selectedRow, maintenance->IF) == maintenance->m_choices[8])
-	{
-		 maintenance->showDateDialog(maintenance->selectedRow,maintenance->selectedCol,m_gridMaintanence);
-		 maintenance->cellCollChanged(maintenance->selectedCol,maintenance->selectedRow);
-		 maintenance->checkService(m_gridGlobal->GetNumberRows()-1);
-	}
-	ev.Skip();
+    if ( ( maintenance->selectedCol == maintenance->WARN || maintenance->selectedCol == maintenance->URGENT ) &&
+            m_gridMaintanence->GetCellValue( maintenance->selectedRow, maintenance->IF ) == maintenance->m_choices[8] )
+    {
+        maintenance->showDateDialog( maintenance->selectedRow,maintenance->selectedCol,m_gridMaintanence );
+        maintenance->cellCollChanged( maintenance->selectedCol,maintenance->selectedRow );
+        maintenance->checkService( m_gridGlobal->GetNumberRows()-1 );
+    }
+    ev.Skip();
 
-	if(ev.GetCol() == maintenance->IF)
-		this->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpService ));
+    if ( ev.GetCol() == maintenance->IF )
+        this->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpService ) );
 
-	m_gridMaintanence->SetGridCursor(maintenance->selectedRow,maintenance->selectedCol);
+    m_gridMaintanence->SetGridCursor( maintenance->selectedRow,maintenance->selectedCol );
 }
 
-void LogbookDialog::OnComboUpService(wxCommandEvent& event)
+void LogbookDialog::OnComboUpService( wxCommandEvent& event )
 {
-	this->Disconnect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpService ));
+    this->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpService ) );
 #ifdef __WXOSX__
-	m_gridMaintanence->SetCellValue(event.GetString(),maintenance->selectedRow,maintenance->selectedCol);
-	maintenance->cellCollChanged(maintenance->selectedCol,maintenance->selectedRow);
+    m_gridMaintanence->SetCellValue( event.GetString(),maintenance->selectedRow,maintenance->selectedCol );
+    maintenance->cellCollChanged( maintenance->selectedCol,maintenance->selectedRow );
 #if wxCHECK_VERSION(2,9,0)
-	wxUIActionSimulator sim;
-	sim.MouseClick();
+    wxUIActionSimulator sim;
+    sim.MouseClick();
 #endif
 #endif
-	m_gridMaintanence->SetGridCursor(maintenance->selectedRow,maintenance->selectedCol+1);
+    m_gridMaintanence->SetGridCursor( maintenance->selectedRow,maintenance->selectedCol+1 );
 }
 
-void LogbookDialog::onButtonClickEditLayoutODTService(wxCommandEvent &ev)
+void LogbookDialog::onButtonClickEditLayoutODTService( wxCommandEvent &ev )
 {
-	int format;
+    int format;
 
-	if(m_radioBtnODTService->GetValue())
-		format = ODT;
-	else
-		format = HTML;
+    if ( m_radioBtnODTService->GetValue() )
+        format = ODT;
+    else
+        format = HTML;
 
-	showLayoutDialog(LogbookDialog::GSERVICE,m_choiceSelectLayoutService,maintenance->layout_locnService, format);
+    showLayoutDialog( LogbookDialog::GSERVICE,m_choiceSelectLayoutService,maintenance->layout_locnService, format );
 }
 
 void LogbookDialog::onGridCellServiceChange( wxGridEvent& ev )
 {
-	maintenance->modified = true;
-	maintenance->cellCollChanged(ev.GetCol(), ev.GetRow());
-	if(ev.GetCol() == maintenance->IF|| ev.GetCol() == maintenance->WARN || 
-		ev.GetCol() == maintenance->URGENT || ev.GetCol() == maintenance->ACTIVE)
-			maintenance->checkService(m_gridGlobal->GetNumberRows()-1);
+    maintenance->modified = true;
+    maintenance->cellCollChanged( ev.GetCol(), ev.GetRow() );
+    if ( ev.GetCol() == maintenance->IF|| ev.GetCol() == maintenance->WARN ||
+            ev.GetCol() == maintenance->URGENT || ev.GetCol() == maintenance->ACTIVE )
+        maintenance->checkService( m_gridGlobal->GetNumberRows()-1 );
 }
 
-void LogbookDialog::onGridCellServiceSelected(wxGridEvent &ev)
+void LogbookDialog::onGridCellServiceSelected( wxGridEvent &ev )
 {
-	maintenance->cellSelected(ev.GetCol(), ev.GetRow());
-	lastRowSelectedService = ev.GetRow();
+    maintenance->cellSelected( ev.GetCol(), ev.GetRow() );
+    lastRowSelectedService = ev.GetRow();
 
-	ev.Skip();
+    ev.Skip();
 }
 
-void LogbookDialog::onMenuSelectionServiceOK(wxCommandEvent &ev)
+void LogbookDialog::onMenuSelectionServiceOK( wxCommandEvent &ev )
 {
-	maintenance->setRowDone(maintenance->selectedRow);
-	maintenance->checkService(m_gridGlobal->GetNumberRows()-1);
-	maintenance->grid->Refresh();
+    maintenance->setRowDone( maintenance->selectedRow );
+    maintenance->checkService( m_gridGlobal->GetNumberRows()-1 );
+    maintenance->grid->Refresh();
 }
 
 void LogbookDialog::onMenuSelectionServiceDelete( wxCommandEvent& ev )
 {
-	m_gridMaintanence->SetCellValue(maintenance->m_YesNo[1],maintenance->selectedRow,Maintenance::ACTIVE);
-	maintenance->checkService(m_gridGlobal->GetNumberRows()-1);
+    m_gridMaintanence->SetCellValue( maintenance->m_YesNo[1],maintenance->selectedRow,Maintenance::ACTIVE );
+    maintenance->checkService( m_gridGlobal->GetNumberRows()-1 );
 
-	m_gridMaintanence->DeleteRows(maintenance->selectedRow);
-	maintenance->checkService(m_gridGlobal->GetNumberRows()-1);
+    m_gridMaintanence->DeleteRows( maintenance->selectedRow );
+    maintenance->checkService( m_gridGlobal->GetNumberRows()-1 );
 
-	maintenance->modified = true;
+    maintenance->modified = true;
 }
 
-void LogbookDialog::onGridCellRightClickService(wxGridEvent &ev)
+void LogbookDialog::onGridCellRightClickService( wxGridEvent &ev )
 {
-	maintenance->selectedRow = ev.GetRow();
-	maintenance->selectedCol = ev.GetCol();
-	m_gridMaintanence->PopupMenu( m_menu7, ev.GetPosition() );
+    maintenance->selectedRow = ev.GetRow();
+    maintenance->selectedCol = ev.GetCol();
+    m_gridMaintanence->PopupMenu( m_menu7, ev.GetPosition() );
 }
 
-void LogbookDialog::onRadioButtonHTMLService(wxCommandEvent &ev)
+void LogbookDialog::onRadioButtonHTMLService( wxCommandEvent &ev )
 {
-	maintenance->setLayoutLocation();
-	logbookPlugIn->opt->serviceHTML = true;
+    maintenance->setLayoutLocation();
+    logbookPlugIn->opt->serviceHTML = true;
 }
 
-void LogbookDialog::onRadioButtonODTService(wxCommandEvent &ev)
+void LogbookDialog::onRadioButtonODTService( wxCommandEvent &ev )
 {
-	maintenance->setLayoutLocation();	
-	logbookPlugIn->opt->serviceHTML = false;
+    maintenance->setLayoutLocation();
+    logbookPlugIn->opt->serviceHTML = false;
 }
 
-void LogbookDialog::onButtonClickViewService(wxCommandEvent &ev)
+void LogbookDialog::onButtonClickViewService( wxCommandEvent &ev )
 {
-	if(this->m_radioBtnHTMLService->GetValue())
-		maintenance->viewHTML(SERVICE,_T(""),
-		m_choiceSelectLayoutService->GetString(m_choiceSelectLayoutService->GetSelection()),false);
-	else
-		maintenance->viewODT(SERVICE,_T(""),
-		m_choiceSelectLayoutService->GetString(m_choiceSelectLayoutService->GetSelection()),true);
+    if ( this->m_radioBtnHTMLService->GetValue() )
+        maintenance->viewHTML( SERVICE,_T( "" ),
+                               m_choiceSelectLayoutService->GetString( m_choiceSelectLayoutService->GetSelection() ),false );
+    else
+        maintenance->viewODT( SERVICE,_T( "" ),
+                              m_choiceSelectLayoutService->GetString( m_choiceSelectLayoutService->GetSelection() ),true );
 }
 
 void LogbookDialog::OnKeyDownService( wxKeyEvent& ev )
 {
 }
 
-void LogbookDialog::onMenuSelectionServiceBuyParts(wxCommandEvent &ev)
+void LogbookDialog::onMenuSelectionServiceBuyParts( wxCommandEvent &ev )
 {
-	maintenance->buyParts(0);
+    maintenance->buyParts( 0 );
 }
 
 ///////////////////// Repairs ////////////////////////
 
-void LogbookDialog::onButtobClickAddLineRepairs(wxCommandEvent &ev)
+void LogbookDialog::onButtobClickAddLineRepairs( wxCommandEvent &ev )
 {
-	maintenance->addLineRepairs();
-	maintenance->modifiedR = true;
+    maintenance->addLineRepairs();
+    maintenance->modifiedR = true;
 }
 
 void LogbookDialog::OnChoiceRepairs( wxCommandEvent& event )
 {
-	if(m_radioBtnHTMLRepairs->GetValue())
-		logbookPlugIn->opt->repairsGridLayoutChoice = event.GetSelection();
-	else
-		logbookPlugIn->opt->repairsGridLayoutChoiceODT = event.GetSelection();
+    if ( m_radioBtnHTMLRepairs->GetValue() )
+        logbookPlugIn->opt->repairsGridLayoutChoice = event.GetSelection();
+    else
+        logbookPlugIn->opt->repairsGridLayoutChoiceODT = event.GetSelection();
 }
 
 void LogbookDialog::OnGridLabelLeftClickRepairs( wxGridEvent& event )
 {
-	int row, col;
-	row = event.GetRow();
-	col = event.GetCol();
+    int row, col;
+    row = event.GetRow();
+    col = event.GetCol();
 
-	this->m_gridMaintanenceRepairs->SetFocus();
+    this->m_gridMaintanenceRepairs->SetFocus();
 
-	if(row != -1 || (row == -1 && col == -1)) { event.Skip(); return; }
+    if ( row != -1 || ( row == -1 && col == -1 ) )
+    {
+        event.Skip();
+        return;
+    }
 
-	this->m_gridMaintanenceRepairs->SetGridCursor(0,col);
-	static bool ascending = true;
-	this->sortGrid(this->m_gridMaintanenceRepairs,event.GetCol(),ascending);
-	ascending = !ascending;
+    this->m_gridMaintanenceRepairs->SetGridCursor( 0,col );
+    static bool ascending = true;
+    this->sortGrid( this->m_gridMaintanenceRepairs,event.GetCol(),ascending );
+    ascending = !ascending;
 
-	maintenance->checkRepairs();
+    maintenance->checkRepairs();
 }
 
 void LogbookDialog::onGridCellRepairsSelected( wxGridEvent& ev )
 {
-	if(!this->IsShown()) return;
-	maintenance->selectedRowRepairs = ev.GetRow();
-	maintenance->selectedColRepairs = ev.GetCol();
-	if(m_gridMaintanenceRepairs->GetRowHeight(lastRowSelectedRepairs) == 170)
-		m_gridMaintanenceRepairs->AutoSizeRow(lastRowSelectedRepairs,false);
+    if ( !this->IsShown() ) return;
+    maintenance->selectedRowRepairs = ev.GetRow();
+    maintenance->selectedColRepairs = ev.GetCol();
+    if ( m_gridMaintanenceRepairs->GetRowHeight( lastRowSelectedRepairs ) == 170 )
+        m_gridMaintanenceRepairs->AutoSizeRow( lastRowSelectedRepairs,false );
 
-	if(ev.GetCol() == maintenance->RTEXT)
-		m_gridMaintanenceRepairs->SetRowHeight(ev.GetRow(),170);
+    if ( ev.GetCol() == maintenance->RTEXT )
+        m_gridMaintanenceRepairs->SetRowHeight( ev.GetRow(),170 );
 
-	ev.Skip();
-	lastRowSelectedRepairs = maintenance->selectedRowRepairs;
+    ev.Skip();
+    lastRowSelectedRepairs = maintenance->selectedRowRepairs;
 
-	if(maintenance->selectedColRepairs == maintenance->RPRIORITY)
-		this->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpRepairs ));
+    if ( maintenance->selectedColRepairs == maintenance->RPRIORITY )
+        this->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpRepairs ) );
 
-	m_gridMaintanenceRepairs->SetGridCursor(maintenance->selectedRowRepairs,maintenance->selectedColRepairs);
+    m_gridMaintanenceRepairs->SetGridCursor( maintenance->selectedRowRepairs,maintenance->selectedColRepairs );
 }
 
-void LogbookDialog::OnComboUpRepairs(wxCommandEvent& event)
+void LogbookDialog::OnComboUpRepairs( wxCommandEvent& event )
 {
-	this->Disconnect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpRepairs ));
+    this->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpRepairs ) );
 #ifdef __WXOSX__
-	m_gridMaintanenceRepairs->SetCellValue(event.GetString(),maintenance->selectedRowRepairs,maintenance->selectedColRepairs);
-	maintenance->checkRepairs();
+    m_gridMaintanenceRepairs->SetCellValue( event.GetString(),maintenance->selectedRowRepairs,maintenance->selectedColRepairs );
+    maintenance->checkRepairs();
 #if wxCHECK_VERSION(2,9,0)
-	wxUIActionSimulator sim;
-	sim.MouseClick();
+    wxUIActionSimulator sim;
+    sim.MouseClick();
 #endif
 #endif
-	m_gridMaintanenceRepairs->SetGridCursor(maintenance->selectedRowRepairs,maintenance->selectedColRepairs+1);
+    m_gridMaintanenceRepairs->SetGridCursor( maintenance->selectedRowRepairs,maintenance->selectedColRepairs+1 );
 }
 
 void LogbookDialog::onGridCellRepairsChange( wxGridEvent& ev )
 {
-	maintenance->checkRepairs();
-	maintenance->modifiedR = true;
-	ev.Skip();
+    maintenance->checkRepairs();
+    maintenance->modifiedR = true;
+    ev.Skip();
 }
 
-void LogbookDialog::onMenuSelectionRepairsOK(wxCommandEvent &ev)
+void LogbookDialog::onMenuSelectionRepairsOK( wxCommandEvent &ev )
 {
-	maintenance->setRepairDone(maintenance->selectedRowRepairs);
+    maintenance->setRepairDone( maintenance->selectedRowRepairs );
 }
 
-void LogbookDialog::onMenuSelectionRepairsDelete(wxCommandEvent &ev)
+void LogbookDialog::onMenuSelectionRepairsDelete( wxCommandEvent &ev )
 {
-	m_gridMaintanenceRepairs->DeleteRows(maintenance->selectedRowRepairs);
-	maintenance->modifiedR = true;
+    m_gridMaintanenceRepairs->DeleteRows( maintenance->selectedRowRepairs );
+    maintenance->modifiedR = true;
 }
 
-void LogbookDialog::onMenuSelectionRepairsBuyParts(wxCommandEvent &ev)
+void LogbookDialog::onMenuSelectionRepairsBuyParts( wxCommandEvent &ev )
 {
-	maintenance->buyParts(1);
+    maintenance->buyParts( 1 );
 }
 
 void LogbookDialog::onButtobClickSaveRepairs( wxCommandEvent& event )
 {
-	wxString layout;
-	wxString filter = _T("");
-	if(m_radioBtnHTMLRepairs->GetValue())
-		filter = _T("HTML Format(*.html)|*.html");
-	else
-		filter = _T("Opendocument Text(*.odt)|*.odt");
-
-	wxFileDialog *saveFileDialog = 
-			new wxFileDialog(this, _("Save Repairs File"), _T(""), _T("Repairs"),
-										   filter, 
-										   wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+    wxString layout;
+    wxString filter = _T( "" );
+    if ( m_radioBtnHTMLRepairs->GetValue() )
+        filter = _T( "HTML Format(*.html)|*.html" );
+    else
+        filter = _T( "Opendocument Text(*.odt)|*.odt" );
 
-	if (saveFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    wxFileDialog *saveFileDialog =
+        new wxFileDialog( this, _( "Save Repairs File" ), _T( "" ), _T( "Repairs" ),
+                          filter,
+                          wxFD_SAVE|wxFD_OVERWRITE_PROMPT );
+
+    if ( saveFileDialog->ShowModal() == wxID_CANCEL )
+        return;
 
-	wxString path = saveFileDialog->GetPath();
-	int sel = saveFileDialog->GetFilterIndex();
+    wxString path = saveFileDialog->GetPath();
+    int sel = saveFileDialog->GetFilterIndex();
 
-    layout = m_choiceSelectLayoutRepairs->GetString(m_choiceSelectLayoutRepairs->GetSelection());
-    if(logbook->opt->filterLayout[LogbookDialog::GREPAIRS])
-        layout.Prepend(logbook->opt->layoutPrefix[LogbookDialog::GREPAIRS]);
-
-	switch(sel)
-	{
-	case 0: if(m_radioBtnHTMLRepairs->GetValue())
-				maintenance->toHTML(1, path, layout, 2);
-			else
-				maintenance->toODT(1, path, layout, 2); 
-			break;
-
-	default: wxMessageBox(_T("Not implemented yet"),_T("Information")); break;
-	}
-	delete saveFileDialog;
+    layout = m_choiceSelectLayoutRepairs->GetString( m_choiceSelectLayoutRepairs->GetSelection() );
+    if ( logbook->opt->filterLayout[LogbookDialog::GREPAIRS] )
+        layout.Prepend( logbook->opt->layoutPrefix[LogbookDialog::GREPAIRS] );
+
+    switch ( sel )
+    {
+    case 0:
+        if ( m_radioBtnHTMLRepairs->GetValue() )
+            maintenance->toHTML( 1, path, layout, 2 );
+        else
+            maintenance->toODT( 1, path, layout, 2 );
+        break;
+
+    default:
+        wxMessageBox( _T( "Not implemented yet" ),_T( "Information" ) );
+        break;
+    }
+    delete saveFileDialog;
 }
 
 void LogbookDialog::onButtonClickReloadLayoutsRepairsHTML( wxCommandEvent& event )
 {
-	maintenance->setLayoutLocation();
+    maintenance->setLayoutLocation();
 }
 void LogbookDialog::onButtonClickEditLayoutODTRepairs( wxCommandEvent& event )
 {
-	int format;
+    int format;
 
-	if(m_radioBtnODTRepairs->GetValue())
-		format = ODT;
-	else
-		format = HTML;
+    if ( m_radioBtnODTRepairs->GetValue() )
+        format = ODT;
+    else
+        format = HTML;
 
-	showLayoutDialog(LogbookDialog::GREPAIRS,m_choiceSelectLayoutRepairs,maintenance->layout_locnRepairs, format);
+    showLayoutDialog( LogbookDialog::GREPAIRS,m_choiceSelectLayoutRepairs,maintenance->layout_locnRepairs, format );
 }
 
 void LogbookDialog::onRadioButtonHTMLRepairs( wxCommandEvent& event )
 {
-	maintenance->setLayoutLocation();
-	logbookPlugIn->opt->repairsHTML = true;
+    maintenance->setLayoutLocation();
+    logbookPlugIn->opt->repairsHTML = true;
 }
 void LogbookDialog::onRadioButtonODTRepairs( wxCommandEvent& event )
 {
-	maintenance->setLayoutLocation();
-	logbookPlugIn->opt->repairsHTML = false;
+    maintenance->setLayoutLocation();
+    logbookPlugIn->opt->repairsHTML = false;
 }
 void LogbookDialog::onButtonClickViewRepairs( wxCommandEvent& event )
 {
-	if(this->m_radioBtnHTMLRepairs->GetValue())
-		maintenance->viewHTML(REPAIRS,_T(""),
-		m_choiceSelectLayoutRepairs->GetString(m_choiceSelectLayoutRepairs->GetSelection()),false);
-	else
-		maintenance->viewODT(REPAIRS,_T(""),
-		m_choiceSelectLayoutRepairs->GetString(m_choiceSelectLayoutRepairs->GetSelection()),true);
+    if ( this->m_radioBtnHTMLRepairs->GetValue() )
+        maintenance->viewHTML( REPAIRS,_T( "" ),
+                               m_choiceSelectLayoutRepairs->GetString( m_choiceSelectLayoutRepairs->GetSelection() ),false );
+    else
+        maintenance->viewODT( REPAIRS,_T( "" ),
+                              m_choiceSelectLayoutRepairs->GetString( m_choiceSelectLayoutRepairs->GetSelection() ),true );
 }
 
 void LogbookDialog::onGridCellRightClickRepairs( wxGridEvent& ev )
 {
-	maintenance->selectedRowRepairs = ev.GetRow();
-	maintenance->selectedColRepairs = ev.GetCol();
-	m_gridMaintanenceRepairs->PopupMenu( m_menu71, ev.GetPosition() );
+    maintenance->selectedRowRepairs = ev.GetRow();
+    maintenance->selectedColRepairs = ev.GetCol();
+    m_gridMaintanenceRepairs->PopupMenu( m_menu71, ev.GetPosition() );
 }
 
 void LogbookDialog::OnKeyDownRepairs( wxKeyEvent& ev )
 {
 
-	wxTextCtrl *ctrl = (wxTextCtrl*)ev.GetEventObject();
+    wxTextCtrl *ctrl = ( wxTextCtrl* )ev.GetEventObject();
+
+    if ( ev.ShiftDown() && ev.GetKeyCode() == WXK_RETURN )
+    {
+        if ( maintenance->selectedColRepairs != maintenance->RTEXT ) return;
+        if ( ev.GetEventObject()->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+            ctrl->WriteText( wxT( "\n" ) );
+        return;
+    }
+
+    if ( ev.GetKeyCode() == WXK_RETURN )
+    {
+        ev.Skip();
+        m_gridMaintanenceRepairs->AutoSizeRow( maintenance->selectedRowRepairs,false );
+        lastRowSelectedRepairs= maintenance->selectedRowRepairs;
+        m_gridMaintanenceRepairs->Refresh();
+        return;
+    }
+
+    if ( ( ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) || ( ev.GetKeyCode() == WXK_LEFT ) )
+    {
+        if ( maintenance->selectedColRepairs == 0 )
+        {
+            maintenance->selectedColRepairs = m_gridMaintanenceRepairs->GetNumberCols()-1;
+            m_gridMaintanenceRepairs->SetGridCursor( maintenance->selectedRowRepairs,maintenance->selectedColRepairs );
+            m_gridMaintanenceRepairs->MakeCellVisible( maintenance->selectedRowRepairs,maintenance->selectedColRepairs );
+        }
+        else
+            ev.Skip();
+        return;
+    }
 
-	if (ev.ShiftDown() && ev.GetKeyCode() == WXK_RETURN)
-	{	
-		if(maintenance->selectedColRepairs != maintenance->RTEXT) return;
-		if(ev.GetEventObject()->IsKindOf(CLASSINFO(wxTextCtrl)))	
-			ctrl->WriteText( wxT("\n") );
-		return;
-	}
-
-	if (ev.GetKeyCode() == WXK_RETURN)
-	{	
-		ev.Skip();
-		m_gridMaintanenceRepairs->AutoSizeRow(maintenance->selectedRowRepairs,false);
-		lastRowSelectedRepairs= maintenance->selectedRowRepairs;
-		m_gridMaintanenceRepairs->Refresh();
-		return;
-	}
-
-	if ((ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || (ev.GetKeyCode() == WXK_LEFT))
-	{	
-		if(maintenance->selectedColRepairs == 0)
-		{
-			maintenance->selectedColRepairs = m_gridMaintanenceRepairs->GetNumberCols()-1;
-			m_gridMaintanenceRepairs->SetGridCursor(maintenance->selectedRowRepairs,maintenance->selectedColRepairs);
-			m_gridMaintanenceRepairs->MakeCellVisible(maintenance->selectedRowRepairs,maintenance->selectedColRepairs);
-		}
-		else
-			ev.Skip();
-		return;
-	}
-	
-	if (ev.GetKeyCode() == WXK_TAB || ev.GetKeyCode() == WXK_RIGHT)
-	{	
-		if(maintenance->selectedColRepairs == m_gridMaintanenceRepairs->GetNumberCols()-1)
-		{
-			maintenance->selectedColRepairs = 0;
-			m_gridMaintanenceRepairs->SetGridCursor(maintenance->selectedRowRepairs,maintenance->selectedColRepairs);
-			m_gridMaintanenceRepairs->MakeCellVisible(maintenance->selectedRowRepairs,maintenance->selectedColRepairs);
-		}
-		else
-			ev.Skip();
-		return;
-	}
-    else 
-	{
+    if ( ev.GetKeyCode() == WXK_TAB || ev.GetKeyCode() == WXK_RIGHT )
+    {
+        if ( maintenance->selectedColRepairs == m_gridMaintanenceRepairs->GetNumberCols()-1 )
+        {
+            maintenance->selectedColRepairs = 0;
+            m_gridMaintanenceRepairs->SetGridCursor( maintenance->selectedRowRepairs,maintenance->selectedColRepairs );
+            m_gridMaintanenceRepairs->MakeCellVisible( maintenance->selectedRowRepairs,maintenance->selectedColRepairs );
+        }
+        else
+            ev.Skip();
+        return;
+    }
+    else
+    {
         ev.Skip () ;
-	}
+    }
 }
 
 ///////////////////// BuyParts ////////////////////////
 
 void LogbookDialog::onGridCellRightClickBuyParts( wxGridEvent& ev )
 {
-	maintenance->selectedRowBuyParts = ev.GetRow();
-	maintenance->selectedColBuyParts = ev.GetCol();
-	m_gridMaintenanceBuyParts->PopupMenu( m_menu711, ev.GetPosition() );
+    maintenance->selectedRowBuyParts = ev.GetRow();
+    maintenance->selectedColBuyParts = ev.GetCol();
+    m_gridMaintenanceBuyParts->PopupMenu( m_menu711, ev.GetPosition() );
 }
 
 void LogbookDialog::OnChoiceBuyParts( wxCommandEvent& event )
 {
-	if(m_radioBtnHTMLBuyParts->GetValue())
-		logbookPlugIn->opt->buypartsGridLayoutChoice = event.GetSelection();
-	else
-		logbookPlugIn->opt->buypartsGridLayoutChoiceODT = event.GetSelection();
+    if ( m_radioBtnHTMLBuyParts->GetValue() )
+        logbookPlugIn->opt->buypartsGridLayoutChoice = event.GetSelection();
+    else
+        logbookPlugIn->opt->buypartsGridLayoutChoiceODT = event.GetSelection();
 }
 
 void LogbookDialog::OnGridLabelLeftClickBuyParts( wxGridEvent& event )
 {
-	int row, col;
-	row = event.GetRow();
-	col = event.GetCol();
+    int row, col;
+    row = event.GetRow();
+    col = event.GetCol();
 
-	this->m_gridMaintenanceBuyParts->SetFocus();
+    this->m_gridMaintenanceBuyParts->SetFocus();
 
-	if(row != -1 || (row == -1 && col == -1)) { event.Skip(); return; }
+    if ( row != -1 || ( row == -1 && col == -1 ) )
+    {
+        event.Skip();
+        return;
+    }
 
-	this->m_gridMaintenanceBuyParts->SetGridCursor(0,col);
-	static bool ascending = true;
-	this->sortGrid(this->m_gridMaintenanceBuyParts,event.GetCol(),ascending);
-	ascending = !ascending;
+    this->m_gridMaintenanceBuyParts->SetGridCursor( 0,col );
+    static bool ascending = true;
+    this->sortGrid( this->m_gridMaintenanceBuyParts,event.GetCol(),ascending );
+    ascending = !ascending;
 
-	maintenance->checkBuyParts();
+    maintenance->checkBuyParts();
 }
 
-void LogbookDialog::onGridCellLeftClickBuyParts(wxGridEvent& ev)
+void LogbookDialog::onGridCellLeftClickBuyParts( wxGridEvent& ev )
 {
-	if(!this->IsShown()) return;
-	maintenance->selectedColBuyParts = ev.GetCol();
-	maintenance->selectedRowBuyParts = ev.GetRow();
+    if ( !this->IsShown() ) return;
+    maintenance->selectedColBuyParts = ev.GetCol();
+    maintenance->selectedRowBuyParts = ev.GetRow();
 
-	if(ev.GetCol() == maintenance->DATE)
-		 maintenance->showDateDialog(ev.GetRow(),ev.GetCol(),m_gridMaintenanceBuyParts);
+    if ( ev.GetCol() == maintenance->DATE )
+        maintenance->showDateDialog( ev.GetRow(),ev.GetCol(),m_gridMaintenanceBuyParts );
 
-	ev.Skip();
+    ev.Skip();
 
-	if(ev.GetCol() == maintenance->PRIORITY)
-		this->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpBuyParts ));
+    if ( ev.GetCol() == maintenance->PRIORITY )
+        this->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpBuyParts ) );
 
-	m_gridMaintenanceBuyParts->SetGridCursor(maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts);
+    m_gridMaintenanceBuyParts->SetGridCursor( maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts );
 }
 
-void LogbookDialog::OnComboUpBuyParts(wxCommandEvent& event)
+void LogbookDialog::OnComboUpBuyParts( wxCommandEvent& event )
 {
-	this->Disconnect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpBuyParts ));
+    this->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( LogbookDialog::OnComboUpBuyParts ) );
 #ifdef __WXOSX__
-	m_gridMaintenanceBuyParts->SetCellValue(event.GetString(),maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts);
-	maintenance->checkBuyParts();
+    m_gridMaintenanceBuyParts->SetCellValue( event.GetString(),maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts );
+    maintenance->checkBuyParts();
 #if wxCHECK_VERSION(2,9,0)
-	wxUIActionSimulator sim;
-	sim.MouseClick();
+    wxUIActionSimulator sim;
+    sim.MouseClick();
 #endif
 #endif
-	m_gridMaintenanceBuyParts->SetGridCursor(maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts);
+    m_gridMaintenanceBuyParts->SetGridCursor( maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts );
 }
 
-void LogbookDialog::onMenuSelectionBuyPartsDelete(wxCommandEvent &ev)
+void LogbookDialog::onMenuSelectionBuyPartsDelete( wxCommandEvent &ev )
 {
-    m_gridMaintenanceBuyParts->DeleteRows(maintenance->selectedRowBuyParts);
-	maintenance->modifiedB = true;
+    m_gridMaintenanceBuyParts->DeleteRows( maintenance->selectedRowBuyParts );
+    maintenance->modifiedB = true;
 }
 
-void LogbookDialog::onButtobClickAddLineBuyParts(wxCommandEvent &ev)
+void LogbookDialog::onButtobClickAddLineBuyParts( wxCommandEvent &ev )
 {
-	maintenance->addLineBuyParts();
-	maintenance->modifiedB = true;
+    maintenance->addLineBuyParts();
+    maintenance->modifiedB = true;
 }
 
-void LogbookDialog::onGridCellChangeBuyParts(wxGridEvent &ev)
+void LogbookDialog::onGridCellChangeBuyParts( wxGridEvent &ev )
 {
-	maintenance->checkBuyParts();
-	maintenance->modifiedB = true;
-	ev.Skip();
+    maintenance->checkBuyParts();
+    maintenance->modifiedB = true;
+    ev.Skip();
 }
 void LogbookDialog::onButtobClickSaveBuyParts( wxCommandEvent& event )
 {
-	wxString layout;
-	wxString filter = _T("");
-	if(m_radioBtnHTMLBuyParts->GetValue())
-		filter = _T("HTML Format(*.html)|*.html");
-	else
-		filter = _T("Opendocument Text(*.odt)|*.odt");
-
-	wxFileDialog *saveFileDialog = 
-			new wxFileDialog(this, _("Save BuyParts File"), _T(""), _T("BuyParts"),
-										   filter, 
-										   wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+    wxString layout;
+    wxString filter = _T( "" );
+    if ( m_radioBtnHTMLBuyParts->GetValue() )
+        filter = _T( "HTML Format(*.html)|*.html" );
+    else
+        filter = _T( "Opendocument Text(*.odt)|*.odt" );
 
-	if (saveFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    wxFileDialog *saveFileDialog =
+        new wxFileDialog( this, _( "Save BuyParts File" ), _T( "" ), _T( "BuyParts" ),
+                          filter,
+                          wxFD_SAVE|wxFD_OVERWRITE_PROMPT );
+
+    if ( saveFileDialog->ShowModal() == wxID_CANCEL )
+        return;
+
+    wxString path = saveFileDialog->GetPath();
+    int sel = saveFileDialog->GetFilterIndex();
 
-	wxString path = saveFileDialog->GetPath();
-	int sel = saveFileDialog->GetFilterIndex();
+    layout = m_choiceSelectLayoutBuyParts->GetString( m_choiceSelectLayoutBuyParts->GetSelection() );
+    if ( logbook->opt->filterLayout[LogbookDialog::GBUYPARTS] )
+        layout.Prepend( logbook->opt->layoutPrefix[LogbookDialog::GBUYPARTS] );
+
+    switch ( sel )
+    {
+    case 0:
+        if ( m_radioBtnHTMLBuyParts->GetValue() )
+            maintenance->toHTML( 2, path, layout, 2 );
+        else
+            maintenance->toODT( 2, path, layout, 2 );
+        break;
 
-    layout = m_choiceSelectLayoutBuyParts->GetString(m_choiceSelectLayoutBuyParts->GetSelection());
-    if(logbook->opt->filterLayout[LogbookDialog::GBUYPARTS])
-        layout.Prepend(logbook->opt->layoutPrefix[LogbookDialog::GBUYPARTS]);
-
-	switch(sel)
-	{
-	case 0: if(m_radioBtnHTMLBuyParts->GetValue())
-				maintenance->toHTML(2, path, layout, 2);
-			else
-				maintenance->toODT(2, path, layout, 2); 
-			break;
-
-	default: wxMessageBox(_T("Not implemented yet"),_T("Information")); break;
-	}
-	delete saveFileDialog;
+    default:
+        wxMessageBox( _T( "Not implemented yet" ),_T( "Information" ) );
+        break;
+    }
+    delete saveFileDialog;
 }
 
 void LogbookDialog::onButtonClickReloadLayoutsBuyPartsHTML( wxCommandEvent& event )
 {
-	maintenance->setLayoutLocation();
+    maintenance->setLayoutLocation();
 }
 
 void LogbookDialog::onButtonClickEditLayoutODTBuyParts( wxCommandEvent& event )
 {
-	int format;
+    int format;
 
-	if(m_radioBtnODTBuyParts->GetValue())
-		format = ODT;
-	else
-		format = HTML;
+    if ( m_radioBtnODTBuyParts->GetValue() )
+        format = ODT;
+    else
+        format = HTML;
 
-	showLayoutDialog(LogbookDialog::GBUYPARTS,m_choiceSelectLayoutBuyParts,maintenance->layout_locnBuyParts, format);
+    showLayoutDialog( LogbookDialog::GBUYPARTS,m_choiceSelectLayoutBuyParts,maintenance->layout_locnBuyParts, format );
 }
 
 void LogbookDialog::onRadioButtonHTMLBuyParts( wxCommandEvent& event )
 {
-	maintenance->setLayoutLocation();
-	logbookPlugIn->opt->buypartsHTML = true;
+    maintenance->setLayoutLocation();
+    logbookPlugIn->opt->buypartsHTML = true;
 }
 
 void LogbookDialog::onRadioButtonODTBuyParts( wxCommandEvent& event )
 {
-	maintenance->setLayoutLocation();
-	logbookPlugIn->opt->buypartsHTML = false;
+    maintenance->setLayoutLocation();
+    logbookPlugIn->opt->buypartsHTML = false;
 }
 
 void LogbookDialog::onButtonClickViewBuyParts( wxCommandEvent& event )
 {
-	if(this->m_radioBtnHTMLBuyParts->GetValue())
-		maintenance->viewHTML(BUYPARTS,_T(""),
-		m_choiceSelectLayoutBuyParts->GetString(m_choiceSelectLayoutBuyParts->GetSelection()),false);
-	else
-		maintenance->viewODT(BUYPARTS,_T(""),
-		m_choiceSelectLayoutBuyParts->GetString(m_choiceSelectLayoutBuyParts->GetSelection()),true);
-}
-
-void LogbookDialog::onGridCellSelectedBuyParts(wxGridEvent &ev)
-{
-	maintenance->selectedRowBuyParts = ev.GetRow();
-	maintenance->selectedColBuyParts = ev.GetCol();
-
-	m_gridMaintenanceBuyParts->AutoSizeRow(lastRowSelectedBuyParts,false);
-	if(ev.GetCol() == maintenance->PARTS)
-		m_gridMaintenanceBuyParts->SetRowHeight(ev.GetRow(),170);
-
-	maintenance->checkBuyParts();
-	m_gridMaintenanceBuyParts->Refresh();
-	lastRowSelectedBuyParts = ev.GetRow();
-	ev.Skip();
+    if ( this->m_radioBtnHTMLBuyParts->GetValue() )
+        maintenance->viewHTML( BUYPARTS,_T( "" ),
+                               m_choiceSelectLayoutBuyParts->GetString( m_choiceSelectLayoutBuyParts->GetSelection() ),false );
+    else
+        maintenance->viewODT( BUYPARTS,_T( "" ),
+                              m_choiceSelectLayoutBuyParts->GetString( m_choiceSelectLayoutBuyParts->GetSelection() ),true );
+}
+
+void LogbookDialog::onGridCellSelectedBuyParts( wxGridEvent &ev )
+{
+    maintenance->selectedRowBuyParts = ev.GetRow();
+    maintenance->selectedColBuyParts = ev.GetCol();
+
+    m_gridMaintenanceBuyParts->AutoSizeRow( lastRowSelectedBuyParts,false );
+    if ( ev.GetCol() == maintenance->PARTS )
+        m_gridMaintenanceBuyParts->SetRowHeight( ev.GetRow(),170 );
+
+    maintenance->checkBuyParts();
+    m_gridMaintenanceBuyParts->Refresh();
+    lastRowSelectedBuyParts = ev.GetRow();
+    ev.Skip();
 }
 
 void LogbookDialog::OnKeyDownBuyParts( wxKeyEvent& ev )
 {
 
-	wxTextCtrl *ctrl = (wxTextCtrl*)ev.GetEventObject();
+    wxTextCtrl *ctrl = ( wxTextCtrl* )ev.GetEventObject();
+
+    if ( ev.ShiftDown() && ev.GetKeyCode() == WXK_RETURN )
+    {
+        if ( maintenance->selectedColBuyParts != maintenance->PARTS ) return;
+        if ( ev.GetEventObject()->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+            ctrl->WriteText( wxT( "\n" ) );
+        return;
+    }
+
+    if ( ev.GetKeyCode() == WXK_RETURN )
+    {
+        ev.Skip();
+        m_gridMaintenanceBuyParts->AutoSizeRow( maintenance->selectedRowBuyParts,false );
+        lastRowSelectedBuyParts = maintenance->selectedRow;
+        m_gridMaintanence->Refresh();
+        return;
+    }
+
+    if ( ( ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) || ( ev.GetKeyCode() == WXK_LEFT ) )
+    {
+        if ( maintenance->selectedColBuyParts == 0 )
+        {
+            maintenance->selectedColBuyParts = m_gridMaintenanceBuyParts->GetNumberCols()-1;
+            m_gridMaintenanceBuyParts->SetGridCursor( maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts );
+            m_gridMaintenanceBuyParts->MakeCellVisible( maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts );
+        }
+        else
+            ev.Skip();
+        return;
+    }
 
-	if (ev.ShiftDown() && ev.GetKeyCode() == WXK_RETURN)
-	{	
-		if(maintenance->selectedColBuyParts != maintenance->PARTS) return;
-		if(ev.GetEventObject()->IsKindOf(CLASSINFO(wxTextCtrl)))	
-			ctrl->WriteText( wxT("\n") );
-		return;
-	}
-
-	if (ev.GetKeyCode() == WXK_RETURN)
-	{	
-		ev.Skip();
-		m_gridMaintenanceBuyParts->AutoSizeRow(maintenance->selectedRowBuyParts,false);
-		lastRowSelectedBuyParts = maintenance->selectedRow;
-		m_gridMaintanence->Refresh();
-		return;
-	}
-
-	if ((ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || (ev.GetKeyCode() == WXK_LEFT))
-	{	
-		if(maintenance->selectedColBuyParts == 0)
-		{
-			maintenance->selectedColBuyParts = m_gridMaintenanceBuyParts->GetNumberCols()-1;
-			m_gridMaintenanceBuyParts->SetGridCursor(maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts);
-			m_gridMaintenanceBuyParts->MakeCellVisible(maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts);
-		}
-		else
-			ev.Skip();
-		return;
-	}
-	
-	if (ev.GetKeyCode() == WXK_TAB || ev.GetKeyCode() == WXK_RIGHT)
-	{	
-		if(maintenance->selectedColBuyParts == m_gridMaintenanceBuyParts->GetNumberCols()-1)
-		{
-			maintenance->selectedColBuyParts = 0;
-			m_gridMaintenanceBuyParts->SetGridCursor(maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts);
-			m_gridMaintenanceBuyParts->MakeCellVisible(maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts);
-		}
-		else
-			ev.Skip();
-		return;
-	}
-    else 
-	{
+    if ( ev.GetKeyCode() == WXK_TAB || ev.GetKeyCode() == WXK_RIGHT )
+    {
+        if ( maintenance->selectedColBuyParts == m_gridMaintenanceBuyParts->GetNumberCols()-1 )
+        {
+            maintenance->selectedColBuyParts = 0;
+            m_gridMaintenanceBuyParts->SetGridCursor( maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts );
+            m_gridMaintenanceBuyParts->MakeCellVisible( maintenance->selectedRowBuyParts,maintenance->selectedColBuyParts );
+        }
+        else
+            ev.Skip();
+        return;
+    }
+    else
+    {
         ev.Skip () ;
-	}
+    }
 }
 
 void LogbookDialog::onGridEditorHidden( wxGridEvent& ev )
 {
-	ev.Skip();
+    ev.Skip();
 }
 void LogbookDialog::onGridEditorShow( wxGridEvent& ev )
 {
-	ev.Skip();
+    ev.Skip();
 }
 
 ////////////////////////////////////////////////////////////
 //    OverView
 ////////////////////////////////////////////////////////////
-void LogbookDialog::onButtonClickSelectLogbook(wxCommandEvent & ec)
+void LogbookDialog::onButtonClickSelectLogbook( wxCommandEvent & ec )
 {
-	overview->selectLogbook();		
+    overview->selectLogbook();
 }
 
 void LogbookDialog::OnChoiceBoatOverview( wxCommandEvent& event )
 {
-	if(m_radioBtnHTMLOverview->GetValue())
-		logbookPlugIn->opt->overviewGridLayoutChoice = event.GetSelection();
-	else
-		logbookPlugIn->opt->overviewGridLayoutChoiceODT = event.GetSelection();
+    if ( m_radioBtnHTMLOverview->GetValue() )
+        logbookPlugIn->opt->overviewGridLayoutChoice = event.GetSelection();
+    else
+        logbookPlugIn->opt->overviewGridLayoutChoiceODT = event.GetSelection();
 }
 
 void LogbookDialog::OnGridLabelLeftDClickOverview( wxGridEvent& ev )
 {
-	if(ev.GetCol() == -1) return;
-	int count = 0;
+    if ( ev.GetCol() == -1 ) return;
+    int count = 0;
 
-	for(int i = 0; i < m_gridOverview->GetNumberCols() && count < 2; i++)
-		if(m_gridOverview->GetColumnWidth(i) > 0)
-			count++;
-
-	if(count < 2) return;
-	m_gridOverview->SetColumnWidth(ev.GetCol(),0);
-	m_gridOverview->Refresh();	
+    for ( int i = 0; i < m_gridOverview->GetNumberCols() && count < 2; i++ )
+        if ( m_gridOverview->GetColumnWidth( i ) > 0 )
+            count++;
+
+    if ( count < 2 ) return;
+    m_gridOverview->SetColumnWidth( ev.GetCol(),0 );
+    m_gridOverview->Refresh();
 }
 
 void LogbookDialog::OnKeyDownOverview( wxKeyEvent& ev )
 {
-	int offset;
-	int col = m_gridOverview->GetGridCursorCol();
-	int row = m_gridOverview->GetGridCursorRow();
-
-	if((ev.GetKeyCode() != WXK_TAB) || (ev.ShiftDown() && ev.GetKeyCode() != WXK_TAB)) 
-		{ ev.Skip(); return; }
-
-	if ((ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || 
-		(ev.GetKeyCode() == WXK_LEFT))
-			offset = -1; 
-
-	if ((!ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB) || 
-		(ev.GetKeyCode() == WXK_RIGHT))
-			offset = 1; 
-
-	while((col+offset < m_gridOverview->GetNumberCols()-1) && (col+offset > 0))
-	{
-		if(m_gridOverview->GetColSize(col+offset) == 0)
-			col += offset;
-		else
-			break;
-	}
-
-	if(col+offset == 0 && m_gridOverview->GetColSize(0) == 0)
-		col = m_gridOverview->GetNumberCols()-1;
-	if((col+offset == m_gridOverview->GetNumberCols()-1) && (m_gridOverview->GetColSize(col+offset) == 0))
-		col = 0;
-	m_gridOverview->SetGridCursor(row,col);
-	ev.Skip();
+    int offset;
+    int col = m_gridOverview->GetGridCursorCol();
+    int row = m_gridOverview->GetGridCursorRow();
+
+    if ( ( ev.GetKeyCode() != WXK_TAB ) || ( ev.ShiftDown() && ev.GetKeyCode() != WXK_TAB ) )
+    {
+        ev.Skip();
+        return;
+    }
+
+    if ( ( ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) ||
+            ( ev.GetKeyCode() == WXK_LEFT ) )
+        offset = -1;
+
+    if ( ( !ev.ShiftDown() && ev.GetKeyCode() == WXK_TAB ) ||
+            ( ev.GetKeyCode() == WXK_RIGHT ) )
+        offset = 1;
+
+    while ( ( col+offset < m_gridOverview->GetNumberCols()-1 ) && ( col+offset > 0 ) )
+    {
+        if ( m_gridOverview->GetColSize( col+offset ) == 0 )
+            col += offset;
+        else
+            break;
+    }
+
+    if ( col+offset == 0 && m_gridOverview->GetColSize( 0 ) == 0 )
+        col = m_gridOverview->GetNumberCols()-1;
+    if ( ( col+offset == m_gridOverview->GetNumberCols()-1 ) && ( m_gridOverview->GetColSize( col+offset ) == 0 ) )
+        col = 0;
+    m_gridOverview->SetGridCursor( row,col );
+    ev.Skip();
 }
 
-void LogbookDialog::OnMenuSelectionHideColumnOverView(wxCommandEvent& ev)
+void LogbookDialog::OnMenuSelectionHideColumnOverView( wxCommandEvent& ev )
 {
-	m_gridOverview->SetColumnWidth(m_gridOverview->GetCursorColumn(),0);
-	m_gridOverview->Refresh();	
+    m_gridOverview->SetColumnWidth( m_gridOverview->GetCursorColumn(),0 );
+    m_gridOverview->Refresh();
 }
 
 void LogbookDialog::OnButtonClickOverviewSave( wxCommandEvent& ev )
 {
-	wxString layout;
-	wxString filter = _T("");
-	if(m_radioBtnHTMLOverview->GetValue())
-		filter = _T("HTML Format(*.html)|*.html");
-	else
-		filter = _T("Opendocument Text(*.odt)|*.odt");
-
-	wxFileDialog *saveFileDialog = 
-			new wxFileDialog(this, _("Save Overview File"), _T(""), _T("Overview"),
-										   filter, 
-										   wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
+    wxString layout;
+    wxString filter = _T( "" );
+    if ( m_radioBtnHTMLOverview->GetValue() )
+        filter = _T( "HTML Format(*.html)|*.html" );
+    else
+        filter = _T( "Opendocument Text(*.odt)|*.odt" );
 
-	if (saveFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    wxFileDialog *saveFileDialog =
+        new wxFileDialog( this, _( "Save Overview File" ), _T( "" ), _T( "Overview" ),
+                          filter,
+                          wxFD_SAVE|wxFD_OVERWRITE_PROMPT );
 
-	wxString path = saveFileDialog->GetPath();
-	int sel = saveFileDialog->GetFilterIndex();
+    if ( saveFileDialog->ShowModal() == wxID_CANCEL )
+        return;
+
+    wxString path = saveFileDialog->GetPath();
+    int sel = saveFileDialog->GetFilterIndex();
+
+    layout = overviewChoice->GetString( overviewChoice->GetSelection() );
+    if ( logbook->opt->filterLayout[LogbookDialog::OVERVIEW] )
+        layout.Prepend( logbook->opt->layoutPrefix[LogbookDialog::OVERVIEW] );
+
+    switch ( sel )
+    {
+    case 0:
+        if ( m_radioBtnHTMLOverview->GetValue() )
+            overview->toHTML( path, layout, 2 );
+        else
+            overview->toODT( path, layout, 2 );
+        break;
 
-    layout = overviewChoice->GetString(overviewChoice->GetSelection());
-    if(logbook->opt->filterLayout[LogbookDialog::OVERVIEW])
-        layout.Prepend(logbook->opt->layoutPrefix[LogbookDialog::OVERVIEW]);
-
-	switch(sel)
-	{
-	case 0: if(m_radioBtnHTMLOverview->GetValue())
-				overview->toHTML(path, layout, 2);
-			else
-				overview->toODT(path, layout, 2); 
-			break;
-
-	default: wxMessageBox(_T("Not implemented yet"),_T("Information")); break;
-	}
-	delete saveFileDialog;
+    default:
+        wxMessageBox( _T( "Not implemented yet" ),_T( "Information" ) );
+        break;
+    }
+    delete saveFileDialog;
 }
 
 void LogbookDialog::onButtonReloadLayoutOverView( wxCommandEvent& ev )
 {
-	overview->setLayoutLocation();
+    overview->setLayoutLocation();
 }
 
 void LogbookDialog::onButtonClickEditLayoutOverview( wxCommandEvent& ev )
 {
-	int format;
+    int format;
 
-	if(this->m_radioBtnODTOverview->GetValue())
-		format = ODT;
-	else
-		format = HTML;
+    if ( this->m_radioBtnODTOverview->GetValue() )
+        format = ODT;
+    else
+        format = HTML;
 
-	showLayoutDialog(LogbookDialog::OVERVIEW,overviewChoice,overview->layout_locn, format);
+    showLayoutDialog( LogbookDialog::OVERVIEW,overviewChoice,overview->layout_locn, format );
 }
 
 void LogbookDialog::onRadioButtonHTMLOverview( wxCommandEvent& ev )
 {
-	overview->setLayoutLocation();
-	logbookPlugIn->opt->overviewHTML = true;
+    overview->setLayoutLocation();
+    logbookPlugIn->opt->overviewHTML = true;
 }
 
 void LogbookDialog::onRadioButtonODTOverView( wxCommandEvent& ev )
 {
-	overview->setLayoutLocation();
+    overview->setLayoutLocation();
     logbookPlugIn->opt->overviewHTML = false;
 }
 
 void LogbookDialog::OnButtonClickOverView( wxCommandEvent& ev )
 {
-	if(m_radioBtnHTMLOverview->GetValue())
-		overview->viewHTML(_T(""),
-		overviewChoice->GetString(overviewChoice->GetSelection()),false);
-	else
-		overview->viewODT(_T(""),
-		overviewChoice->GetString(overviewChoice->GetSelection()),true);
+    if ( m_radioBtnHTMLOverview->GetValue() )
+        overview->viewHTML( _T( "" ),
+                            overviewChoice->GetString( overviewChoice->GetSelection() ),false );
+    else
+        overview->viewODT( _T( "" ),
+                           overviewChoice->GetString( overviewChoice->GetSelection() ),true );
 }
 
 void LogbookDialog::OnGridCellRightClickOverview( wxGridEvent& ev )
 {
-	m_gridOverview->SetGridCursor(ev.GetRow(),ev.GetCol());
-	overview->setSelectedRow(ev.GetRow());
-	m_gridOverview->PopupMenu( m_menuOverView, ev.GetPosition() );
+    m_gridOverview->SetGridCursor( ev.GetRow(),ev.GetCol() );
+    overview->setSelectedRow( ev.GetRow() );
+    m_gridOverview->PopupMenu( m_menuOverView, ev.GetPosition() );
 }
 
 void LogbookDialog::OnGridLabelLeftClickOverview( wxGridEvent& ev )
 {
 }
 
-void LogbookDialog::OnRadioButtonActuellLogbook(wxCommandEvent & ev)
+void LogbookDialog::OnRadioButtonActualLogbook( wxCommandEvent & ev )
 {
-	overview->refresh();
+    overview->refresh();
 }
 
-void LogbookDialog::OnRadioButtonAllLogbooks(wxCommandEvent &ev)
+void LogbookDialog::OnRadioButtonAllLogbooks( wxCommandEvent &ev )
 {
-	overview->refresh();
+    overview->refresh();
 }
 
 void LogbookDialog::OnMenuSelectionGotoRoute( wxCommandEvent& ev )
 {
-	overview->gotoRoute();
+    overview->gotoRoute();
 }
 
-bool LogbookDialog::myParseDate(wxString s, wxDateTime &dt)
+bool LogbookDialog::myParseDate( wxString s, wxDateTime &dt )
 {
-	long day;
-	long month;
-	long year;
-	unsigned int i;
+    long day;
+    long month;
+    long year;
+    unsigned int i;
 
-	if(s.IsEmpty()) return false;
+    if ( s.IsEmpty() ) return false;
 //	wxMessageBox(s+LogbookDialog::datePattern);
-	for(i = 0; i < s.Length(); i++)
-	{
-		if(s.at(i) < '0' || s.at(i) > '9')
-		{
-			dateSeparator = (wxChar)s.at(i);
-			break;
-		}
-	}
+    for ( i = 0; i < s.Length(); i++ )
+    {
+        if ( s.at( i ) < '0' || s.at( i ) > '9' )
+        {
+            dateSeparator = ( wxChar )s.at( i );
+            break;
+        }
+    }
 
-	i = 0;
+    i = 0;
 #if wxCHECK_VERSION(2,9,0)
-	wxString temp = s.substr(0,s.find_first_of((char*)&dateSeparator));
+    wxString temp = s.substr( 0,s.find_first_of( ( char* )&dateSeparator ) );
 #else
-	wxString temp = s.substr(0,s.find_first_of(dateSeparator));
+    wxString temp = s.substr( 0,s.find_first_of( dateSeparator ) );
 #endif
-	wxChar c;
-	c = (wxChar) LogbookDialog::datePattern.GetChar(i);
-	switch(c)
-		{
-		case 'd': temp.ToLong(&day); i += 3;
-			break;
-		case 'm': temp.ToLong(&month); i += 3;
-			break;
-		case 'y': temp.ToLong(&year); i += 5;
-			break;
-		}
+    wxChar c;
+    c = ( wxChar ) LogbookDialog::datePattern.GetChar( i );
+    switch ( c )
+    {
+    case 'd':
+        temp.ToLong( &day );
+        i += 3;
+        break;
+    case 'm':
+        temp.ToLong( &month );
+        i += 3;
+        break;
+    case 'y':
+        temp.ToLong( &year );
+        i += 5;
+        break;
+    }
 #if wxCHECK_VERSION(2,9,0)
-	temp = s.substr(s.find_first_of((char*)&dateSeparator)+1,s.find_last_of((char*)&dateSeparator)-2);
+    temp = s.substr( s.find_first_of( ( char* )&dateSeparator )+1,s.find_last_of( ( char* )&dateSeparator )-2 );
 #else
-	temp = s.substr(s.find_first_of(dateSeparator)+1,s.find_last_of(dateSeparator)-2);
+    temp = s.substr( s.find_first_of( dateSeparator )+1,s.find_last_of( dateSeparator )-2 );
 #endif
-	c = LogbookDialog::datePattern.GetChar(i);
-	switch(c)
-		{
-		case 'd': temp.ToLong(&day); i += 3;
-			break;
-		case 'm': temp.ToLong(&month); i += 3;
-			break;
-		case 'y': temp.ToLong(&year); i += 5;
-			break;
-		}
+    c = LogbookDialog::datePattern.GetChar( i );
+    switch ( c )
+    {
+    case 'd':
+        temp.ToLong( &day );
+        i += 3;
+        break;
+    case 'm':
+        temp.ToLong( &month );
+        i += 3;
+        break;
+    case 'y':
+        temp.ToLong( &year );
+        i += 5;
+        break;
+    }
 #if wxCHECK_VERSION(2,9,0)
-	temp = s.substr(s.find_last_of((char*)&dateSeparator)+1);
+    temp = s.substr( s.find_last_of( ( char* )&dateSeparator )+1 );
 #else
-	temp = s.substr(s.find_last_of(dateSeparator)+1);
+    temp = s.substr( s.find_last_of( dateSeparator )+1 );
 #endif
-	c = LogbookDialog::datePattern.GetChar(i);
-	switch(c)
-		{
-		case 'd': temp.ToLong(&day); i += 3;
-			break;
-		case 'm': temp.ToLong(&month); i += 3;
-			break;
-		case 'y': temp.ToLong(&year); i += 5;
-			break;
-		}
+    c = LogbookDialog::datePattern.GetChar( i );
+    switch ( c )
+    {
+    case 'd':
+        temp.ToLong( &day );
+        i += 3;
+        break;
+    case 'm':
+        temp.ToLong( &month );
+        i += 3;
+        break;
+    case 'y':
+        temp.ToLong( &year );
+        i += 5;
+        break;
+    }
 #ifdef __WXOSX__
-    s = wxString::Format(_T("%i/%i/%i"),(wchar_t)month,(wchar_t)day,(wchar_t)year);
+    s = wxString::Format( _T( "%i/%i/%i" ),( wchar_t )month,( wchar_t )day,( wchar_t )year );
 #else
-	s = wxString::Format(_T("%i/%i/%i"),(int)month,(int)day,(int)year);
+    s = wxString::Format( _T( "%i/%i/%i" ),( int )month,( int )day,( int )year );
 #endif
 #if wxCHECK_VERSION(2, 9, 0)
     wxString::const_iterator end;
-    if(!dt.ParseFormat(s, "%m/%d/%Y", &end))
-		return false;
+    if ( !dt.ParseFormat( s, "%m/%d/%Y", &end ) )
+        return false;
     else if ( end == s.end() )
         return true;
-	else
-		wxMessageBox(_T("Parse Error myParseDate ")+wxString(end, s.end()));// left over ...	
+    else
+        wxMessageBox( _T( "Parse Error myParseDate " )+wxString( end, s.end() ) ); // left over ...
     return false;
 #else
-	s = wxString::Format(_T("%i/%i/%i"),month,day,year);
-	if(dt.ParseFormat(s, _T("%m/%d/%Y")))
-		return true;
-	else
-		return false;
+    s = wxString::Format( _T( "%i/%i/%i" ),month,day,year );
+    if ( dt.ParseFormat( s, _T( "%m/%d/%Y" ) ) )
+        return true;
+    else
+        return false;
 #endif
 }
 
-bool LogbookDialog::myParseTime(wxString s, wxDateTime& dt)
-{
-	//bool correction = false;
-	
-	if(!s.Contains(_T(":"))) return false;
-
-/*	if((int) s.GetChar(0) == 19979 || (int) s.GetChar(0) == 19978 )  // chinese time starts with this two chars
-	{																 // ParseTime will not handle this correct
-		if((int) s.GetChar(0) == 19979)  // is it like 'F with a broken arm' ?
-			correction = true;           // It's a PM-Time, needs correction
-		unsigned int i;
-		for( i = 0; i < s.Len(); i++) // eleminate leading chars
-			if(s.at(i) >= '0' && s.at(i) <= '9')
-				break;
-		if(i > 0)
-			s = s.Remove(0,i);
-	}
-*/	
-	wxString am = wxEmptyString,pm = wxEmptyString;
-	wxDateTime::GetAmPmStrings(&am,&pm);
-	
-	wxStringTokenizer tkz(s,_T(":"));
-	wxDateTime::wxDateTime_t hour = wxAtoi(tkz.GetNextToken());
-	wxDateTime::wxDateTime_t minute = wxAtoi(tkz.GetNextToken());
-	wxDateTime::wxDateTime_t sec = 0;
-	if(tkz.HasMoreTokens())
-	  sec = wxAtoi(tkz.GetNextToken());
-	
-	if(!pm.IsEmpty() && (s.Contains(pm) && hour != 12))
-	  hour += 12;
-	else if(!am.IsEmpty() && (s.Contains(am) && hour == 12))
-	  hour -= 12;	
-	
-	dt.Set(hour,minute,sec);
-/*	  
-
-	s = s.Upper();
-wxString::const_iterator end;
-if ( !dt.ParseTime(s, &end) )
-c = false;
-else if ( end == s.end() )
-c = true;	
-*/
-/*	c = dt.ParseTime(s);
-	if(correction) // make correction for PM 
-	{
-	        if(hour != 12)
-		{
-		  wxTimeSpan diff(12); 
-		  dt.Add(diff);
-		}
-	}*/
-    return true;
-}
+bool LogbookDialog::myParseTime( wxString s, wxDateTime& dt )
+{
+    //bool correction = false;
+
+    if ( !s.Contains( _T( ":" ) ) ) return false;
+
+    /*	if((int) s.GetChar(0) == 19979 || (int) s.GetChar(0) == 19978 )  // chinese time starts with this two chars
+    	{																 // ParseTime will not handle this correct
+    		if((int) s.GetChar(0) == 19979)  // is it like 'F with a broken arm' ?
+    			correction = true;           // It's a PM-Time, needs correction
+    		unsigned int i;
+    		for( i = 0; i < s.Len(); i++) // eleminate leading chars
+    			if(s.at(i) >= '0' && s.at(i) <= '9')
+    				break;
+    		if(i > 0)
+    			s = s.Remove(0,i);
+    	}
+    */
+    wxString am = wxEmptyString,pm = wxEmptyString;
+    wxDateTime::GetAmPmStrings( &am,&pm );
+
+    wxStringTokenizer tkz( s,_T( ":" ) );
+    wxDateTime::wxDateTime_t hour = wxAtoi( tkz.GetNextToken() );
+    wxDateTime::wxDateTime_t minute = wxAtoi( tkz.GetNextToken() );
+    wxDateTime::wxDateTime_t sec = 0;
+    if ( tkz.HasMoreTokens() )
+        sec = wxAtoi( tkz.GetNextToken() );
+
+    if ( !pm.IsEmpty() && ( s.Contains( pm ) && hour != 12 ) )
+        hour += 12;
+    else if ( !am.IsEmpty() && ( s.Contains( am ) && hour == 12 ) )
+        hour -= 12;
+
+    dt.Set( hour,minute,sec );
+    /*
+
+    	s = s.Upper();
+    wxString::const_iterator end;
+    if ( !dt.ParseTime(s, &end) )
+    c = false;
+    else if ( end == s.end() )
+    c = true;
+    */
+    /*	c = dt.ParseTime(s);
+    	if(correction) // make correction for PM
+    	{
+    	        if(hour != 12)
+    		{
+    		  wxTimeSpan diff(12);
+    		  dt.Add(diff);
+    		}
+    	}*/
+    return true;
+}
+
+
+wxString LogbookDialog::datePattern = _T( "" );
+wxChar   LogbookDialog::dateSeparator = 0;
+void LogbookDialog::setDatePattern()
+{
+    wxDateTime dt;
+    dt.Set( 14, ( wxDateTime::Month ) 11, 2011 );
+    wxString s = dt.FormatDate();
+
+    for ( unsigned int i = 0; i < s.Length(); i++ )
+        if ( s.at( i ) < '0' || s.at( i ) > '9' )
+            LogbookDialog::dateSeparator = s.at( i );
+
+    if ( s.Length() > 8 ) // Format for locale year can be 2 digits or 4 digits.
+    {
+        int i = 0;
+        if ( s.SubString( i,1 ) == _T( "14" ) )
+        {
+            LogbookDialog::datePattern = _T( "dd" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,1 ) == _T( "12" ) )
+        {
+            LogbookDialog::datePattern = _T( "mm" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,3 ) == _T( "2011" ) )
+        {
+            LogbookDialog::datePattern = _T( "yyyy" ) + wxString( dateSeparator );
+            i += 5;
+        }
+
+        if ( s.SubString( i,i+1 ) == _T( "14" ) )
+        {
+            LogbookDialog::datePattern += _T( "dd" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,i+1 ) == _T( "12" ) )
+        {
+            LogbookDialog::datePattern += _T( "mm" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,i+3 ) == _T( "2011" ) )
+        {
+            LogbookDialog::datePattern += _T( "yyyy" ) + wxString( dateSeparator );
+            i += 5;
+        }
+
+        if ( s.SubString( i,i+1 ) == _T( "14" ) )
+        {
+            LogbookDialog::datePattern += _T( "dd" );
+            i += 3;
+        }
+        if ( s.SubString( i,i+1 ) == _T( "12" ) )
+        {
+            LogbookDialog::datePattern += _T( "mm" );
+            i += 3;
+        }
+        if ( s.SubString( i,i+3 ) == _T( "2011" ) )
+        {
+            LogbookDialog::datePattern += _T( "yyyy" );
+            i += 5;
+        }
+    }
+    else
+    {
+        int i = 0;
+        if ( s.SubString( i,1 ) == _T( "14" ) )
+        {
+            LogbookDialog::datePattern = _T( "dd" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,1 ) == _T( "12" ) )
+        {
+            LogbookDialog::datePattern = _T( "mm" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,1 ) == _T( "11" ) )
+        {
+            LogbookDialog::datePattern = _T( "yyyy" ) + wxString( dateSeparator );
+            i += 3;
+        }
 
+        if ( s.SubString( i,i+1 ) == _T( "14" ) )
+        {
+            LogbookDialog::datePattern += _T( "dd" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,i+1 ) == _T( "12" ) )
+        {
+            LogbookDialog::datePattern += _T( "mm" ) + wxString( dateSeparator );
+            i += 3;
+        }
+        if ( s.SubString( i,i+1 ) == _T( "11" ) )
+        {
+            LogbookDialog::datePattern += _T( "yyyy" ) + wxString( dateSeparator );
+            i += 3;
+        }
 
-wxString LogbookDialog::datePattern = _T("");
-wxChar   LogbookDialog::dateSeparator = 0;
-void LogbookDialog::setDatePattern()
-{
-	wxDateTime dt;
-	dt.Set( 14, (wxDateTime::Month) 11, 2011);
-	wxString s = dt.FormatDate();
-
-	for(unsigned int i = 0; i < s.Length(); i++)
-		if(s.at(i) < '0' || s.at(i) > '9')
-			LogbookDialog::dateSeparator = s.at(i);
-
-	int i = 0;
-	if(s.SubString(i,1) == _T("14"))
-		{ LogbookDialog::datePattern = _T("dd") + wxString(dateSeparator); i += 3; }
-	if(s.SubString(i,1) == _T("12"))
-		{ LogbookDialog::datePattern = _T("mm") + wxString(dateSeparator); i += 3; }
-	if(s.SubString(i,3) == _T("2011"))
-		{ LogbookDialog::datePattern = _T("yyyy") + wxString(dateSeparator); i += 5; }
-
-	if(s.SubString(i,i+1) == _T("14"))
-		{ LogbookDialog::datePattern += _T("dd") + wxString(dateSeparator);  i += 3; }
-	if(s.SubString(i,i+1) == _T("12"))
-		{ LogbookDialog::datePattern += _T("mm") + wxString(dateSeparator);  i += 3; }
-    if(s.SubString(i,i+3) == _T("2011"))
-		{ datePattern += _T("yyyy") + wxString(dateSeparator);  i += 5; }
-
-	if(s.SubString(i,i+1) == _T("14"))
-		{ LogbookDialog::datePattern += _T("dd");  i += 3; }
-	if(s.SubString(i,i+1) == _T("12"))
-		{ LogbookDialog::datePattern += _T("mm");  i += 3; }
-    if(s.SubString(i,i+3) == _T("2011"))
-		{ LogbookDialog::datePattern += _T("yyyy");  i += 5; }
+        if ( s.SubString( i,i+1 ) == _T( "14" ) )
+        {
+            LogbookDialog::datePattern += _T( "dd" );
+            i += 3;
+        }
+        if ( s.SubString( i,i+1 ) == _T( "12" ) )
+        {
+            LogbookDialog::datePattern += _T( "mm" );
+            i += 3;
+        }
+        if ( s.SubString( i,i+1 ) == _T( "11" ) )
+        {
+            LogbookDialog::datePattern += _T( "yyyy" );
+            i += 3;
+        }
+    }
 }
 
 ////////////////////////////////////////////////////////////
@@ -6836,8 +7007,8 @@
 ///////////////////////////////////////////////////////////
 void LogbookDialog::declareExportHeader()
 {
-	content=
-_T("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\
+    content=
+        _T( "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\
 <office:document-content xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\" xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\" xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\" xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\" xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\" xmlns:presentation=\"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0\" xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\" xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\" xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\" xmlns:math=\"http://www.w3.org/1998/Math/MathML\" xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\" xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\" xmlns:ooo=\"http://openoffice.org/2004/office\" xmlns:ooow=\"http://openoffice.org/2004/writer\" xmlns:oooc=\"http://openoffice.org/2004/calc\" xmlns:dom=\"http://www.w3.org/2001/xml-events\" xmlns:xforms=\"http://www.w3.org/2002/xforms\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:rpt=\"http://openoffice.org/2005/report\" xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\" xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\" xmlns:field=\"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0\" office:version=\"1.2\" grddl:transformation=\"http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl\">\
 <office:scripts />\
 <office:font-face-decls>\
@@ -6867,12 +7038,12 @@
 <office:spreadsheet>\
 <table:table table:name=\"Logbook\" table:style-name=\"ta1\" table:print=\"false\">\
 <table:table-column table:style-name=\"co1\" table:number-columns-repeated=\"33\" table:default-cell-style-name=\"Default\" />\
-");
-	contentEnd=_T("</table:table></office:spreadsheet></office:body></office:document-content>\
- ");
+" );
+    contentEnd=_T( "</table:table></office:spreadsheet></office:body></office:document-content>\
+ " );
 
-	manifest=
-_T("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\
+    manifest=
+        _T( "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\
 <manifest:manifest xmlns:manifest=\"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0\">\
 <manifest:file-entry manifest:media-type=\"application/vnd.oasis.opendocument.spreadsheet\" manifest:version=\"1.2\" manifest:full-path=\"/\" />\
 <manifest:file-entry manifest:media-type=\"\" manifest:full-path=\"Configurations2/statusbar/\" />\
@@ -6892,10 +7063,10 @@
 <manifest:file-entry manifest:media-type=\"\" manifest:full-path=\"Thumbnails/thumbnail.png\" />\
 <manifest:file-entry manifest:media-type=\"\" manifest:full-path=\"Thumbnails/\" />\
 <manifest:file-entry manifest:media-type=\"text/xml\" manifest:full-path=\"settings.xml\" />\
-</manifest:manifest>");
+</manifest:manifest>" );
 
-	styles =_T(
-"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\
+    styles =_T(
+                "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\
 <office:document-styles xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\" xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\" xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\" xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\" xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\" xmlns:presentation=\"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0\" xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\" xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\" xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\" xmlns:math=\"http://www.w3.org/1998/Math/MathML\" xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\" xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\" xmlns:ooo=\"http://openoffice.org/2004/office\" xmlns:ooow=\"http://openoffice.org/2004/writer\" xmlns:oooc=\"http://openoffice.org/2004/calc\" xmlns:dom=\"http://www.w3.org/2001/xml-events\" xmlns:rpt=\"http://openoffice.org/2005/report\" xmlns:of=\"urn:oasis:names:tc:opendocument:xmlns:of:1.2\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\" xmlns:grddl=\"http://www.w3.org/2003/g/data-view#\" office:version=\"1.2\" grddl:transformation=\"http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl\">\
 <office:font-face-decls>\
 <style:font-face style:name=\"Arial\" svg:font-family=\"Arial\" style:font-family-generic=\"swiss\" style:font-pitch=\"variable\" />\
@@ -7003,10 +7174,10 @@
 </style:master-page>\
 </office:master-styles>\
 </office:document-styles>\
-");
+" );
 
-	meta = _T(
-"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\
+    meta = _T(
+               "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\
 <office:document-meta xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" office:version=\"1.1\">\
 <office:meta>\
 <meta:generator>OpenCPN-Logbook</meta:generator>\
@@ -7014,10 +7185,10 @@
 <dc:date>2010-11-19T20:43:36Z</dc:date>\
 <meta:editing-duration>PT0S</meta:editing-duration>\
 </office:meta>\
-</office:document-meta>");
+</office:document-meta>" );
 
-	xmlHead =_T(
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
+    xmlHead =_T(
+                 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\
 <?mso-application progid=\"Excel.Sheet\"?>\
 <Workbook xmlns:c=\"urn:schemas-microsoft-com:office:component:spreadsheet\" xmlns:html=\"http://www.w3.org/TR/REC-html40\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:x2=\"http://schemas.microsoft.com/office/excel/2003/xml\" xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\">\
 <OfficeDocumentSettings xmlns=\"urn:schemas-microsoft-com:office:office\">\
@@ -7058,25 +7229,25 @@
 </Styles>\
 <ss:Worksheet ss:Name=\"Tabelle1\">\
 <Table ss:StyleID=\"ta1\">\
-<Column ss:Span=\"1\" ss:Width=\"64.2614\"/>");
-xmlEnd =_T(
-"</Table>\
+<Column ss:Span=\"1\" ss:Width=\"64.2614\"/>" );
+    xmlEnd =_T(
+                "</Table>\
 <x:WorksheetOptions/>\
 </ss:Worksheet>\
-</Workbook>");
+</Workbook>" );
 
-kmlHead =_T("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n\
+    kmlHead =_T( "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n\
 <kml xmlns=\"http://www.opengis.net/kml/2.2\">\n\
     <Document>\n\
-    <name>#TITLE#</name>\n");
+    <name>#TITLE#</name>\n" );
 
-kmlFolder = _T("	<Folder>\n\
+    kmlFolder = _T( "	<Folder>\n\
         <name>#NAME#</name>\n\
-        <description></description>\n");
+        <description></description>\n" );
 
-kmlEndFolder = _T("		</Folder>\n");
+    kmlEndFolder = _T( "		</Folder>\n" );
 
-kmlBody =_T("        <Placemark>\n\
+    kmlBody =_T( "        <Placemark>\n\
             <name>#NAME#</name>\n\
             <description>#DESCRIPTION#</description>\n\
                 <Style>\n\
@@ -7089,12 +7260,12 @@
                 <Point>\n\
                     <coordinates>#POSITION#</coordinates>\n\
                 </Point>\n\
-            </Placemark>\n");
-kmlEnd =_T("    </Folder>\n\
+            </Placemark>\n" );
+    kmlEnd =_T( "    </Folder>\n\
     </Document>\n\
-</kml>");
+</kml>" );
 
-kmlLine =  _T("\
+    kmlLine =  _T( "\
     <Style id=\"LineRoute\">\n\
         <LineStyle>\n\
               <color>#LTRANS##LCOLORR#</color>\n\
@@ -7106,9 +7277,9 @@
               <color>#LTRANS##LCOLORT#</color>\n\
                 <width>#LWIDTH#</width>\n\
         </LineStyle>\n\
-    </Style>\n");
+    </Style>\n" );
 
-kmlPathHeader = _T("\
+    kmlPathHeader = _T( "\
     <Placemark>\n\
         <name>#NAME#</name>\n\
         <styleUrl>#LINE#</styleUrl>\n\
@@ -7116,11 +7287,11 @@
         <extrude>0</extrude>\n\
         <tessellate>0</tessellate>\n\
         <altitudeMode>relativeToGround</altitudeMode>\n\
-        <coordinates>");
+        <coordinates>" );
 
-kmlPathFooter=_T("            </coordinates>\n\
+    kmlPathFooter=_T( "            </coordinates>\n\
     </LineString>\n\
-    </Placemark>\n");
+    </Placemark>\n" );
 }
 
 /////////////////////////////////////////////////////////
@@ -7128,28 +7299,28 @@
 /////////////////////////////////////////////////////////
 RouteDialog::RouteDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxFlexGridSizer* fgSizer17;
-	fgSizer17 = new wxFlexGridSizer( 2, 1, 0, 0 );
-	fgSizer17->SetFlexibleDirection( wxBOTH );
-	fgSizer17->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_listCtrlRoute = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxSize( 250,250 ), wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_SORT_ASCENDING|wxHSCROLL );
-	fgSizer17->Add( m_listCtrlRoute, 0, wxALL, 5 );
-	
-	m_sdbSizer6 = new wxStdDialogButtonSizer();
-	m_sdbSizer6OK = new wxButton( this, wxID_OK );
-	m_sdbSizer6->AddButton( m_sdbSizer6OK );
-	m_sdbSizer6Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer6->AddButton( m_sdbSizer6Cancel );
-	m_sdbSizer6->Realize();
-	fgSizer17->Add( m_sdbSizer6, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( fgSizer17 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxFlexGridSizer* fgSizer17;
+    fgSizer17 = new wxFlexGridSizer( 2, 1, 0, 0 );
+    fgSizer17->SetFlexibleDirection( wxBOTH );
+    fgSizer17->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_listCtrlRoute = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxSize( 250,250 ), wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_SORT_ASCENDING|wxHSCROLL );
+    fgSizer17->Add( m_listCtrlRoute, 0, wxALL, 5 );
+
+    m_sdbSizer6 = new wxStdDialogButtonSizer();
+    m_sdbSizer6OK = new wxButton( this, wxID_OK );
+    m_sdbSizer6->AddButton( m_sdbSizer6OK );
+    m_sdbSizer6Cancel = new wxButton( this, wxID_CANCEL );
+    m_sdbSizer6->AddButton( m_sdbSizer6Cancel );
+    m_sdbSizer6->Realize();
+    fgSizer17->Add( m_sdbSizer6, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( fgSizer17 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
 }
 
 RouteDialog::~RouteDialog()
@@ -7161,125 +7332,125 @@
 #include "folder.xpm"
 LayoutDialog::LayoutDialog( wxWindow* parent, wxString location, wxChoice* choice, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	wxFlexGridSizer* fgSizer25;
-	fgSizer25 = new wxFlexGridSizer( 2, 1, 0, 0 );
-	fgSizer25->SetFlexibleDirection( wxBOTH );
-	fgSizer25->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxFlexGridSizer* fgSizer23;
-	fgSizer23 = new wxFlexGridSizer( 6, 3, 0, 0 );
-	fgSizer23->SetFlexibleDirection( wxBOTH );
-	fgSizer23->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer23->Add( 10, 0, 1, wxEXPAND, 5 );
-	
-	m_radioBtnEdit = new wxRadioButton( this, wxID_ANY, _("Edit Layout"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnEdit->SetValue( true ); 
-	fgSizer23->Add( m_radioBtnEdit, 0, wxALL, 5 );
-	
-	
-	fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_radioBtnFilter = new wxRadioButton( this, wxID_ANY, _("Filter Layout by"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer23->Add( m_radioBtnFilter, 0, wxALL, 5 );
-	
-	wxArrayString m_choice15Choices;
-	m_choice15 = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( 60,-1 ), m_choice15Choices, 0 );
-	m_choice15->SetSelection( 0 );
-	fgSizer23->Add( m_choice15, 0, wxALL, 0 );
-	
-	
-	fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_radioBtnRename = new wxRadioButton( this, wxID_ANY, _("Rename Layout"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer23->Add( m_radioBtnRename, 0, wxALL, 5 );
-	
-	m_textCtrlRename = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxPoint( -1,-1 ), wxSize( 150,-1 ), 0 );
-	fgSizer23->Add( m_textCtrlRename, 0, wxALL, 0 );
-	
-	
-	fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_radioBtnDelete = new wxRadioButton( this, wxID_ANY, _("Delete Layout"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer23->Add( m_radioBtnDelete, 0, wxALL, 5 );
-	
-	
-	fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_radioBtnEmail = new wxRadioButton( this, wxID_ANY, _("Send Layout by email"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer23->Add( m_radioBtnEmail, 0, wxALL, 5 );
-	
-	
-	fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer23->Add( 0, 30, 1, wxEXPAND, 5 );
-	
-	m_radioBtnInstall = new wxRadioButton( this, wxID_ANY, _("Install single Layout"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer23->Add( m_radioBtnInstall, 0, wxALL, 5 );
-	
-	m_bpButtonLoadLayout = new wxBitmapButton( this, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	fgSizer23->Add( m_bpButtonLoadLayout, 0, wxALL, 0 );
-	
-	fgSizer25->Add( fgSizer23, 1, wxEXPAND, 5 );
-	
-	m_sdbSizer3 = new wxStdDialogButtonSizer();
-	m_sdbSizer3OK = new wxButton( this, wxID_OK );
-	m_sdbSizer3->AddButton( m_sdbSizer3OK );
-	m_sdbSizer3Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer3->AddButton( m_sdbSizer3Cancel );
-	m_sdbSizer3->Realize();
-	fgSizer25->Add( m_sdbSizer3, 0, wxALIGN_CENTER, 5 );
-	
-	this->SetSizer( fgSizer25 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
+    wxFlexGridSizer* fgSizer25;
+    fgSizer25 = new wxFlexGridSizer( 2, 1, 0, 0 );
+    fgSizer25->SetFlexibleDirection( wxBOTH );
+    fgSizer25->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxFlexGridSizer* fgSizer23;
+    fgSizer23 = new wxFlexGridSizer( 6, 3, 0, 0 );
+    fgSizer23->SetFlexibleDirection( wxBOTH );
+    fgSizer23->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer23->Add( 10, 0, 1, wxEXPAND, 5 );
+
+    m_radioBtnEdit = new wxRadioButton( this, wxID_ANY, _( "Edit Layout" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnEdit->SetValue( true );
+    fgSizer23->Add( m_radioBtnEdit, 0, wxALL, 5 );
+
+
+    fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_radioBtnFilter = new wxRadioButton( this, wxID_ANY, _( "Filter Layout by" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer23->Add( m_radioBtnFilter, 0, wxALL, 5 );
+
+    wxArrayString m_choice15Choices;
+    m_choice15 = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( 60,-1 ), m_choice15Choices, 0 );
+    m_choice15->SetSelection( 0 );
+    fgSizer23->Add( m_choice15, 0, wxALL, 0 );
+
+
+    fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_radioBtnRename = new wxRadioButton( this, wxID_ANY, _( "Rename Layout" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer23->Add( m_radioBtnRename, 0, wxALL, 5 );
+
+    m_textCtrlRename = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxPoint( -1,-1 ), wxSize( 150,-1 ), 0 );
+    fgSizer23->Add( m_textCtrlRename, 0, wxALL, 0 );
+
+
+    fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_radioBtnDelete = new wxRadioButton( this, wxID_ANY, _( "Delete Layout" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer23->Add( m_radioBtnDelete, 0, wxALL, 5 );
+
+
+    fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_radioBtnEmail = new wxRadioButton( this, wxID_ANY, _( "Send Layout by email" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer23->Add( m_radioBtnEmail, 0, wxALL, 5 );
+
+
+    fgSizer23->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer23->Add( 0, 30, 1, wxEXPAND, 5 );
+
+    m_radioBtnInstall = new wxRadioButton( this, wxID_ANY, _( "Install single Layout" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer23->Add( m_radioBtnInstall, 0, wxALL, 5 );
+
+    m_bpButtonLoadLayout = new wxBitmapButton( this, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    fgSizer23->Add( m_bpButtonLoadLayout, 0, wxALL, 0 );
+
+    fgSizer25->Add( fgSizer23, 1, wxEXPAND, 5 );
+
+    m_sdbSizer3 = new wxStdDialogButtonSizer();
+    m_sdbSizer3OK = new wxButton( this, wxID_OK );
+    m_sdbSizer3->AddButton( m_sdbSizer3OK );
+    m_sdbSizer3Cancel = new wxButton( this, wxID_CANCEL );
+    m_sdbSizer3->AddButton( m_sdbSizer3Cancel );
+    m_sdbSizer3->Realize();
+    fgSizer25->Add( m_sdbSizer3, 0, wxALIGN_CENTER, 5 );
+
+    this->SetSizer( fgSizer25 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
     m_choice15->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LayoutDialog::OnChoice ), NULL, this );
     m_textCtrlRename->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LayoutDialog::OnText ), NULL, this );
-	m_bpButtonLoadLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LayoutDialog::OnButtonClickLoadLayout ), NULL, this );
+    m_bpButtonLoadLayout->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LayoutDialog::OnButtonClickLoadLayout ), NULL, this );
 
-	layoutFileName= _T("");
-	dialog = (LogbookDialog* )parent;
+    layoutFileName= _T( "" );
+    dialog = ( LogbookDialog* )parent;
 
 }
 
 LayoutDialog::~LayoutDialog()
 {
-	// Disconnect Events
-	m_choice15->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LayoutDialog::OnChoice ), NULL, this );
+    // Disconnect Events
+    m_choice15->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LayoutDialog::OnChoice ), NULL, this );
     m_textCtrlRename->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LayoutDialog::OnText ), NULL, this );
     m_bpButtonLoadLayout->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LayoutDialog::OnButtonClickLoadLayout ), NULL, this );
-	
+
 }
 
 void LayoutDialog::OnButtonClickLoadLayout( wxCommandEvent& event )
 {
-	wxFileDialog dlg(this);
-	if(	dlg.ShowModal() == wxID_OK)
-	{
-		layoutPath = dlg.GetPath();
-		layoutFileName = dlg.GetFilename();
-	}
+    wxFileDialog dlg( this );
+    if (	dlg.ShowModal() == wxID_OK )
+    {
+        layoutPath = dlg.GetPath();
+        layoutFileName = dlg.GetFilename();
+    }
 }
 
 void LayoutDialog::OnChoice( wxCommandEvent& event )
 {
-    m_radioBtnFilter->SetValue(true);
+    m_radioBtnFilter->SetValue( true );
 }
 
 void LayoutDialog::OnText( wxCommandEvent& event )
 {
-    m_radioBtnRename->SetValue(true);
+    m_radioBtnRename->SetValue( true );
 }
 
 ////////////////////////////////////////////////////
@@ -7287,15 +7458,15 @@
 ////////////////////////////////////////////////////
 SelectLogbook::SelectLogbook( wxWindow* parent, wxString path, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->path = path;
-	this->parent = (LogbookDialog*)parent;
+    this->path = path;
+    this->parent = ( LogbookDialog* )parent;
+
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer23;
-	bSizer23 = new wxBoxSizer( wxVERTICAL );
+    wxBoxSizer* bSizer23;
+    bSizer23 = new wxBoxSizer( wxVERTICAL );
 
-	m_grid13 = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_grid13 = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
     // Grid
     m_grid13->CreateGrid( 0, 4 );
@@ -7312,10 +7483,10 @@
     m_grid13->EnableDragColMove( false );
     m_grid13->EnableDragColSize( true );
     m_grid13->SetColLabelSize( 30 );
-    m_grid13->SetColLabelValue( 0, _("Logbook") );
-    m_grid13->SetColLabelValue( 1, _("First/Last Entry") );
-    m_grid13->SetColLabelValue( 2, _("Description") );
-    m_grid13->SetColLabelValue( 3, _("File") );
+    m_grid13->SetColLabelValue( 0, _( "Logbook" ) );
+    m_grid13->SetColLabelValue( 1, _( "First/Last Entry" ) );
+    m_grid13->SetColLabelValue( 2, _( "Description" ) );
+    m_grid13->SetColLabelValue( 3, _( "File" ) );
     m_grid13->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
     // Rows
@@ -7329,20 +7500,20 @@
     m_grid13->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
     bSizer23->Add( m_grid13, 1, wxALL|wxEXPAND, 5 );
 
-	m_sdbSizer4 = new wxStdDialogButtonSizer();
-	m_sdbSizer4OK = new wxButton( this, wxID_OK );
-	m_sdbSizer4->AddButton( m_sdbSizer4OK );
-	m_sdbSizer4Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer4->AddButton( m_sdbSizer4Cancel );
-	m_sdbSizer4->Realize();
-	bSizer23->Add( m_sdbSizer4, 0, wxALIGN_CENTER, 5 );
-	
-	this->SetSizer( bSizer23 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
+    m_sdbSizer4 = new wxStdDialogButtonSizer();
+    m_sdbSizer4OK = new wxButton( this, wxID_OK );
+    m_sdbSizer4->AddButton( m_sdbSizer4OK );
+    m_sdbSizer4Cancel = new wxButton( this, wxID_CANCEL );
+    m_sdbSizer4->AddButton( m_sdbSizer4Cancel );
+    m_sdbSizer4->Realize();
+    bSizer23->Add( m_sdbSizer4, 0, wxALIGN_CENTER, 5 );
+
+    this->SetSizer( bSizer23 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
 
-	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( SelectLogbook::OnInit ) );
+    this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( SelectLogbook::OnInit ) );
     m_grid13->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( SelectLogbook::OnCellSelecttion ), NULL, this );
     m_grid13->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( SelectLogbook::OnGridCellChange ), NULL, this );
     m_grid13->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( SelectLogbook::OnKeyDown ), NULL, this );
@@ -7358,15 +7529,15 @@
 
 void SelectLogbook::OnKeyDown( wxKeyEvent& event )
 {
-    wxTextCtrl *ctrl = (wxTextCtrl*)event.GetEventObject();
-    if (event.ShiftDown() && event.GetKeyCode() == WXK_RETURN)
+    wxTextCtrl *ctrl = ( wxTextCtrl* )event.GetEventObject();
+    if ( event.ShiftDown() && event.GetKeyCode() == WXK_RETURN )
     {
-        if(event.GetEventObject()->IsKindOf(CLASSINFO(wxTextCtrl)))
-                ctrl->WriteText( wxT("\n") );
+        if ( event.GetEventObject()->IsKindOf( CLASSINFO( wxTextCtrl ) ) )
+            ctrl->WriteText( wxT( "\n" ) );
         return;
     }
 
-    if (event.GetKeyCode() == WXK_RETURN)
+    if ( event.GetKeyCode() == WXK_RETURN )
     {
         m_grid13->AutoSize();
         this->Layout();
@@ -7379,16 +7550,16 @@
     static int lastrow = -1;
     selRow = event.GetRow();
 
-    if(lastrow != -1)
+    if ( lastrow != -1 )
         m_grid13->AutoSize();
 
-    if(event.GetCol() == 2 &&
-        (m_grid13->GetRowHeight(selRow) < 120 && !m_grid13->GetCellValue(selRow,event.GetCol()).Contains(_("Active Logbook"))))
+    if ( event.GetCol() == 2 &&
+            ( m_grid13->GetRowHeight( selRow ) < 120 && !m_grid13->GetCellValue( selRow,event.GetCol() ).Contains( _( "Active Logbook" ) ) ) )
     {
-        m_grid13->SetRowHeight(selRow,100);
-        m_grid13->SetColSize(2,250);
+        m_grid13->SetRowHeight( selRow,100 );
+        m_grid13->SetColSize( 2,250 );
         m_grid13->ForceRefresh();
-        m_grid13->MakeCellVisible(selRow,event.GetCol());
+        m_grid13->MakeCellVisible( selRow,event.GetCol() );
         this->Layout();
         lastrow = selRow;
     }
@@ -7404,17 +7575,17 @@
 {
     static bool autosize = false;
 
-    if(!autosize && (event.GetRow() == selRow && event.GetCol() == 2))
+    if ( !autosize && ( event.GetRow() == selRow && event.GetCol() == 2 ) )
     {
         autosize = true;
-        wxString f = m_grid13->GetCellValue(selRow,3);
-        wxTextFile text(f);
+        wxString f = m_grid13->GetCellValue( selRow,3 );
+        wxTextFile text( f );
         text.Open();
 
-        wxString str = _T("#1.2#\t")+m_grid13->GetCellValue(selRow,2);
-        str = parent->replaceDangerChar(str);
-        text.RemoveLine(0);
-        text.InsertLine(str,0);
+        wxString str = _T( "#1.2#\t" )+m_grid13->GetCellValue( selRow,2 );
+        str = parent->replaceDangerChar( str );
+        text.RemoveLine( 0 );
+        text.InsertLine( str,0 );
         text.Write();
 //		wxMessageBox(wxString::Format(_T("%i %s %s %i"),u,f,str,h));
         text.Close();
@@ -7425,104 +7596,104 @@
     event.Skip();
 }
 
-void SelectLogbook::OnInit(wxInitDialogEvent& ev)
+void SelectLogbook::OnInit( wxInitDialogEvent& ev )
 {
-	wxString filename;
-	wxDateTime dtfrom, dtto;
-	wxListItem itemCol;
-	wxString routeFrom, routeTo, description;
-    	selRow = -1;
-    	bool back = false;
-
-    	m_grid13->SetSelectionMode(wxGrid::wxGridSelectRows);
-
-	wxDir::GetAllFiles(path,&files,_T("*logbook.txt"),wxDIR_FILES);
-
-	for(unsigned int i = 0; i < files.Count(); i++)
-	{
-		wxFileName fn(files[i]);
-		filename = fn.GetName();
-
-		description = routeFrom = routeTo = wxEmptyString;
-
-
-		if(filename == _T("logbook"))
-			back = true;
-		else
-            		back = false;
-
-        	wxTextFile text(files[i]);
-        	text.Open();
-        	if(text.GetLineCount() > 1)
-		{
-            		wxString z = text.GetFirstLine();
-            		if(!z.IsEmpty())
-            		{
-                		wxStringTokenizer header(z,_T("\t"));
-                		header.GetNextToken();
-                		description = header.GetNextToken();
-                		description = parent->restoreDangerChar(description);
-                		wxString t = text.GetNextLine();
-                		wxStringTokenizer tk(t,_T("\t"));
-                		routeFrom = tk.GetNextToken();
-                		int month = wxAtoi(tk.GetNextToken());
-                		int day = wxAtoi(tk.GetNextToken());
-                		int year = wxAtoi(tk.GetNextToken());
-                		dtfrom.Set(day,(wxDateTime::Month) month, year);
-            		}
-
-            		wxString last = text.GetLastLine();
-            		if(!last.IsEmpty())
-            		{
-                		wxStringTokenizer ll(last,_T("\t"));
-                		routeTo = ll.GetNextToken();
-                		int monthTo = wxAtoi(ll.GetNextToken());
-                		int dayTo = wxAtoi(ll.GetNextToken());
-                		int yearTo = wxAtoi(ll.GetNextToken());
-                		dtto.Set(dayTo,(wxDateTime::Month) monthTo, yearTo);
-            		}
-		}
-
-        	m_grid13->AppendRows();
-        	if(back)
-        	{
-            		for(int col = 0; col < m_grid13->GetNumberCols(); col++)
-                    		m_grid13->SetCellBackgroundColour(wxColour(_T("Green")),i,col);
-
-                	description = _("Active Logbook");
-                	m_grid13->SetReadOnly(i,2);
-        	}
-        	m_grid13->SetReadOnly(i,0);
-        	m_grid13->SetReadOnly(i,1);
-        	m_grid13->SetReadOnly(i,3);
-        	if(text.GetLineCount() > 1)
-        	{
-            		m_grid13->SetCellValue(i,0,routeFrom+_T(" -> ")+routeTo);
-            		if(dtfrom.IsValid() && dtto.IsValid())
-                		m_grid13->SetCellValue(i,1,
-
-            		wxString::Format(_T("%s - %s"),dtfrom.Format(parent->logbookPlugIn->opt->sdateformat).c_str(),dtto.Format(parent->logbookPlugIn->opt->sdateformat).c_str()));
-        	}
-        	m_grid13->SetCellValue(i,2,description);
-        	m_grid13->SetCellEditor(i,2,new wxGridCellAutoWrapStringEditor);
-        	m_grid13->SetCellValue(i,3,files[i]);
+    wxString filename;
+    wxDateTime dtfrom, dtto;
+    wxListItem itemCol;
+    wxString routeFrom, routeTo, description;
+    selRow = -1;
+    bool back = false;
+
+    m_grid13->SetSelectionMode( wxGrid::wxGridSelectRows );
+
+    unsigned int i = wxDir::GetAllFiles( path,&files,_T( "*logbook.txt" ),wxDIR_FILES );
+
+    for ( i = 0; i < files.Count(); i++ )
+    {
+        wxFileName fn( files[i] );
+        filename = fn.GetName();
+
+        description = routeFrom = routeTo = wxEmptyString;
+
+
+        if ( filename == _T( "logbook" ) )
+            back = true;
+        else
+            back = false;
+
+        wxTextFile text( files[i] );
+        text.Open();
+        if ( text.GetLineCount() > 1 )
+        {
+            wxString z = text.GetFirstLine();
+            if ( !z.IsEmpty() )
+            {
+                wxStringTokenizer header( z,_T( "\t" ) );
+                header.GetNextToken();
+                description = header.GetNextToken();
+                description = parent->restoreDangerChar( description );
+                wxString t = text.GetNextLine();
+                wxStringTokenizer tk( t,_T( "\t" ) );
+                routeFrom = tk.GetNextToken();
+                int month = wxAtoi( tk.GetNextToken() );
+                int day = wxAtoi( tk.GetNextToken() );
+                int year = wxAtoi( tk.GetNextToken() );
+                dtfrom.Set( day,( wxDateTime::Month ) month, year );
+            }
+
+            wxString last = text.GetLastLine();
+            if ( !last.IsEmpty() )
+            {
+                wxStringTokenizer ll( last,_T( "\t" ) );
+                routeTo = ll.GetNextToken();
+                int monthTo = wxAtoi( ll.GetNextToken() );
+                int dayTo = wxAtoi( ll.GetNextToken() );
+                int yearTo = wxAtoi( ll.GetNextToken() );
+                dtto.Set( dayTo,( wxDateTime::Month ) monthTo, yearTo );
+            }
+        }
+
+        m_grid13->AppendRows();
+        if ( back )
+        {
+            for ( int col = 0; col < m_grid13->GetNumberCols(); col++ )
+                m_grid13->SetCellBackgroundColour( wxColour( _T( "Green" ) ),i,col );
 
-        	text.Close();
-	}
+            description = _( "Active Logbook" );
+            m_grid13->SetReadOnly( i,2 );
+        }
+        m_grid13->SetReadOnly( i,0 );
+        m_grid13->SetReadOnly( i,1 );
+        m_grid13->SetReadOnly( i,3 );
+        if ( text.GetLineCount() > 1 )
+        {
+            m_grid13->SetCellValue( i,0,routeFrom+_T( " -> " )+routeTo );
+            if ( dtfrom.IsValid() && dtto.IsValid() )
+                m_grid13->SetCellValue( i,1,
+
+                                        wxString::Format( _T( "%s - %s" ),dtfrom.Format( parent->logbookPlugIn->opt->sdateformat ).c_str(),dtto.Format( parent->logbookPlugIn->opt->sdateformat ).c_str() ) );
+        }
+        m_grid13->SetCellValue( i,2,description );
+        m_grid13->SetCellEditor( i,2,new wxGridCellAutoWrapStringEditor );
+        m_grid13->SetCellValue( i,3,files[i] );
 
-	m_grid13->AutoSize();
+        text.Close();
+    }
+
+    m_grid13->AutoSize();
 }
 
 //////////////////////////// myGridStringTable /////////
-WX_DEFINE_OBJARRAY(myGridStringArray)
+WX_DEFINE_OBJARRAY( myGridStringArray )
 
 myGridStringTable::myGridStringTable()
-        : wxGridTableBase()
+    : wxGridTableBase()
 {
 }
 
 myGridStringTable::myGridStringTable( int numRows, int numCols )
-        : wxGridTableBase()
+    : wxGridTableBase()
 {
     m_data.Alloc( numRows );
 
@@ -7552,28 +7723,28 @@
 
 wxString myGridStringTable::GetValue( int row, int col )
 {
-    wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+    wxCHECK_MSG( ( row < GetNumberRows() ) && ( col < GetNumberCols() ),
                  wxEmptyString,
-                 _T("invalid row or column index in myGridStringTable") );
+                 _T( "invalid row or column index in myGridStringTable" ) );
 
     return m_data[row][col];
 }
 
 void myGridStringTable::SetValue( int row, int col, const wxString& value )
 {
-    wxCHECK_RET( (row < GetNumberRows()) && (col < GetNumberCols()),
-                 _T("invalid row or column index in myGridStringTable") );
+    wxCHECK_RET( ( row < GetNumberRows() ) && ( col < GetNumberCols() ),
+                 _T( "invalid row or column index in myGridStringTable" ) );
 
     m_data[row][col] = value;
 }
 
 bool myGridStringTable::IsEmptyCell( int row, int col )
 {
-    wxCHECK_MSG( (row < GetNumberRows()) && (col < GetNumberCols()),
+    wxCHECK_MSG( ( row < GetNumberRows() ) && ( col < GetNumberCols() ),
                  true,
-                  _T("invalid row or column index in myGridStringTable") );
+                 _T( "invalid row or column index in myGridStringTable" ) );
 
-    return (m_data[row][col] == wxEmptyString);
+    return ( m_data[row][col] == wxEmptyString );
 }
 
 void myGridStringTable::Clear()
@@ -7629,8 +7800,8 @@
 {
     size_t curNumRows = m_data.GetCount();
     size_t curNumCols = ( curNumRows > 0
-                         ? m_data[0].GetCount()
-                         : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+                          ? m_data[0].GetCount()
+                          : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
 
     wxArrayString sa;
     if ( curNumCols > 0 )
@@ -7661,10 +7832,10 @@
     {
         wxFAIL_MSG( wxString::Format
                     (
-                        wxT("Called myGridStringTable::DeleteRows(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu rows"),
-                        (unsigned long)pos,
-                        (unsigned long)numRows,
-                        (unsigned long)curNumRows
+                        wxT( "Called myGridStringTable::DeleteRows(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu rows" ),
+                        ( unsigned long )pos,
+                        ( unsigned long )numRows,
+                        ( unsigned long )curNumRows
                     ) );
 
         return false;
@@ -7703,8 +7874,8 @@
 
     size_t curNumRows = m_data.GetCount();
     size_t curNumCols = ( curNumRows > 0
-                         ? m_data[0].GetCount()
-                         : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
+                          ? m_data[0].GetCount()
+                          : ( GetView() ? GetView()->GetNumberCols() : 0 ) );
 
     if ( pos >= curNumCols )
     {
@@ -7752,7 +7923,7 @@
     {
         // TODO: something better than this ?
         //
-        wxFAIL_MSG( wxT("Unable to append cols to a grid table with no rows.\nCall AppendRows() first") );
+        wxFAIL_MSG( wxT( "Unable to append cols to a grid table with no rows.\nCall AppendRows() first" ) );
         return false;
     }
 #endif
@@ -7786,10 +7957,10 @@
     {
         wxFAIL_MSG( wxString::Format
                     (
-                        wxT("Called myGridStringTable::DeleteCols(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu cols"),
-                        (unsigned long)pos,
-                        (unsigned long)numCols,
-                        (unsigned long)curNumCols
+                        wxT( "Called myGridStringTable::DeleteCols(pos=%lu, N=%lu)\nPos value is invalid for present table with %lu cols" ),
+                        ( unsigned long )pos,
+                        ( unsigned long )numCols,
+                        ( unsigned long )curNumCols
                     ) );
         return false;
     }
@@ -7842,7 +8013,7 @@
 
 wxString myGridStringTable::GetRowLabelValue( int row )
 {
-    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
+    if ( row > ( int )( m_rowLabels.GetCount() ) - 1 )
     {
         // using default label
         //
@@ -7856,7 +8027,7 @@
 
 wxString myGridStringTable::GetColLabelValue( int col )
 {
-    if ( col > (int)(m_colLabels.GetCount()) - 1 )
+    if ( col > ( int )( m_colLabels.GetCount() ) - 1 )
     {
         // using default label
         //
@@ -7870,14 +8041,14 @@
 
 void myGridStringTable::SetRowLabelValue( int row, const wxString& value )
 {
-    if ( row > (int)(m_rowLabels.GetCount()) - 1 )
+    if ( row > ( int )( m_rowLabels.GetCount() ) - 1 )
     {
         int n = m_rowLabels.GetCount();
         int i;
 
         for ( i = n; i <= row; i++ )
         {
-            m_rowLabels.Add( wxGridTableBase::GetRowLabelValue(i) );
+            m_rowLabels.Add( wxGridTableBase::GetRowLabelValue( i ) );
         }
     }
 
@@ -7886,14 +8057,14 @@
 
 void myGridStringTable::SetColLabelValue( int col, const wxString& value )
 {
-    if ( col > (int)(m_colLabels.GetCount()) - 1 )
+    if ( col > ( int )( m_colLabels.GetCount() ) - 1 )
     {
         int n = m_colLabels.GetCount();
         int i;
 
         for ( i = n; i <= col; i++ )
         {
-            m_colLabels.Add( wxGridTableBase::GetColLabelValue(i) );
+            m_colLabels.Add( wxGridTableBase::GetColLabelValue( i ) );
         }
     }
 
@@ -7905,122 +8076,122 @@
 ////////////////////////////////////////////////////////////////////
 ColdFinger::ColdFinger( LogbookDialog* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	dialog =  parent;
+    dialog =  parent;
+
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer27;
-	bSizer27 = new wxBoxSizer( wxVERTICAL );
-	
-	m_splitter2 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
-	m_splitter2->Connect( wxEVT_IDLE, wxIdleEventHandler( ColdFinger::m_splitter2OnIdle ), NULL, this );
-	
-	m_panel18 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer30;
-	bSizer30 = new wxBoxSizer( wxVERTICAL );
-	
-	m_treeCtrl3 = new wxTreeCtrl( m_panel18, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxTR_EDIT_LABELS );
-	m_menu9 = new wxMenu();
-	wxMenuItem* m_menuItem24;
-	m_menuItem24 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _("Add Item") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu9->Append( m_menuItem24 );
-	
-	wxMenuItem* m_menuItem25;
-	m_menuItem25 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _("Delete Item") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu9->Append( m_menuItem25 );
-	
-	wxMenuItem* m_menuItem26;
-	m_menuItem26 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _("Rename Item") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu9->Append( m_menuItem26 );
-	
-	m_menu9->AppendSeparator();
-	
-	wxMenuItem* m_menuItem27;
-	m_menuItem27 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _("Add Treenode") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu9->Append( m_menuItem27 );
-	
-	wxMenuItem* m_menuItem28;
-	m_menuItem28 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _("Delete Treenode") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu9->Append( m_menuItem28 );
-	
-	
-	bSizer30->Add( m_treeCtrl3, 1, wxALL|wxEXPAND, 5 );
-	
-	m_panel18->SetSizer( bSizer30 );
-	m_panel18->Layout();
-	bSizer30->Fit( m_panel18 );
-	m_panel19 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer31;
-	bSizer31 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText97 = new wxStaticText( m_panel19, wxID_ANY, _("Text"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText97->Wrap( -1 );
-	m_staticText97->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_staticText97, 0, wxALL|wxEXPAND, 5 );
-	
-	m_textCtrl73 = new wxTextCtrl( m_panel19, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	bSizer31->Add( m_textCtrl73, 1, wxALL|wxEXPAND, 5 );
-	
-	m_panel19->SetSizer( bSizer31 );
-	m_panel19->Layout();
-	bSizer31->Fit( m_panel19 );
-	m_splitter2->SplitVertically( m_panel18, m_panel19, 0 );
-	bSizer27->Add( m_splitter2, 1, wxEXPAND, 5 );
-	
-	m_sdbSizer8 = new wxStdDialogButtonSizer();
-	m_sdbSizer8OK = new wxButton( this, wxID_OK );
-	m_sdbSizer8->AddButton( m_sdbSizer8OK );
-	m_sdbSizer8Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer8->AddButton( m_sdbSizer8Cancel );
-	m_sdbSizer8->Realize();
-	bSizer27->Add( m_sdbSizer8, 0, wxALIGN_CENTER, 5 );
-	
-	this->SetSizer( bSizer27 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ColdFinger::OnCloseCold ) );
-	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( ColdFinger::OnInitDialog ) );
-	m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( ColdFinger::OnTreeBeginDragCold ), NULL, this );
-	m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler( ColdFinger::OnTreeEndDragCold ), NULL, this );
-	m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEventHandler( ColdFinger::OnTreeItemRightClickCold ), NULL, this );
-	m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( ColdFinger::OnTreeSelChanged ), NULL, this );
-	this->Connect( m_menuItem24->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionAddCold ) );
-	this->Connect( m_menuItem25->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionDeleteCold ) );
-	this->Connect( m_menuItem26->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionRenameCold ) );
-	this->Connect( m_menuItem27->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionaddNodeCold ) );
-	this->Connect( m_menuItem28->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuTreeSelectionDeleteNodeCold ) );
-	m_textCtrl73->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ColdFinger::OnTextCold ), NULL, this );
-	m_sdbSizer8OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnOKButtonClickCold ), NULL, this );
-	m_sdbSizer8Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnCancelButtonClickCold ), NULL, this );
+    wxBoxSizer* bSizer27;
+    bSizer27 = new wxBoxSizer( wxVERTICAL );
 
-	init();
+    m_splitter2 = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3D );
+    m_splitter2->Connect( wxEVT_IDLE, wxIdleEventHandler( ColdFinger::m_splitter2OnIdle ), NULL, this );
+
+    m_panel18 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer30;
+    bSizer30 = new wxBoxSizer( wxVERTICAL );
+
+    m_treeCtrl3 = new wxTreeCtrl( m_panel18, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxTR_EDIT_LABELS );
+    m_menu9 = new wxMenu();
+    wxMenuItem* m_menuItem24;
+    m_menuItem24 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _( "Add Item" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu9->Append( m_menuItem24 );
+
+    wxMenuItem* m_menuItem25;
+    m_menuItem25 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _( "Delete Item" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu9->Append( m_menuItem25 );
+
+    wxMenuItem* m_menuItem26;
+    m_menuItem26 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _( "Rename Item" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu9->Append( m_menuItem26 );
+
+    m_menu9->AppendSeparator();
+
+    wxMenuItem* m_menuItem27;
+    m_menuItem27 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _( "Add Treenode" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu9->Append( m_menuItem27 );
+
+    wxMenuItem* m_menuItem28;
+    m_menuItem28 = new wxMenuItem( m_menu9, wxID_ANY, wxString( _( "Delete Treenode" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu9->Append( m_menuItem28 );
+
+
+    bSizer30->Add( m_treeCtrl3, 1, wxALL|wxEXPAND, 5 );
+
+    m_panel18->SetSizer( bSizer30 );
+    m_panel18->Layout();
+    bSizer30->Fit( m_panel18 );
+    m_panel19 = new wxPanel( m_splitter2, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer31;
+    bSizer31 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText97 = new wxStaticText( m_panel19, wxID_ANY, _( "Text" ), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticText97->Wrap( -1 );
+    m_staticText97->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer31->Add( m_staticText97, 0, wxALL|wxEXPAND, 5 );
+
+    m_textCtrl73 = new wxTextCtrl( m_panel19, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
+    bSizer31->Add( m_textCtrl73, 1, wxALL|wxEXPAND, 5 );
+
+    m_panel19->SetSizer( bSizer31 );
+    m_panel19->Layout();
+    bSizer31->Fit( m_panel19 );
+    m_splitter2->SplitVertically( m_panel18, m_panel19, 0 );
+    bSizer27->Add( m_splitter2, 1, wxEXPAND, 5 );
+
+    m_sdbSizer8 = new wxStdDialogButtonSizer();
+    m_sdbSizer8OK = new wxButton( this, wxID_OK );
+    m_sdbSizer8->AddButton( m_sdbSizer8OK );
+    m_sdbSizer8Cancel = new wxButton( this, wxID_CANCEL );
+    m_sdbSizer8->AddButton( m_sdbSizer8Cancel );
+    m_sdbSizer8->Realize();
+    bSizer27->Add( m_sdbSizer8, 0, wxALIGN_CENTER, 5 );
+
+    this->SetSizer( bSizer27 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ColdFinger::OnCloseCold ) );
+    this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( ColdFinger::OnInitDialog ) );
+    m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( ColdFinger::OnTreeBeginDragCold ), NULL, this );
+    m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler( ColdFinger::OnTreeEndDragCold ), NULL, this );
+    m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEventHandler( ColdFinger::OnTreeItemRightClickCold ), NULL, this );
+    m_treeCtrl3->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( ColdFinger::OnTreeSelChanged ), NULL, this );
+    this->Connect( m_menuItem24->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionAddCold ) );
+    this->Connect( m_menuItem25->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionDeleteCold ) );
+    this->Connect( m_menuItem26->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionRenameCold ) );
+    this->Connect( m_menuItem27->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionaddNodeCold ) );
+    this->Connect( m_menuItem28->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuTreeSelectionDeleteNodeCold ) );
+    m_textCtrl73->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ColdFinger::OnTextCold ), NULL, this );
+    m_sdbSizer8OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnOKButtonClickCold ), NULL, this );
+    m_sdbSizer8Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnCancelButtonClickCold ), NULL, this );
+
+    init();
 }
 
 ColdFinger::~ColdFinger()
 {
-	writeTextblocks();
+    writeTextblocks();
 
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ColdFinger::OnCloseCold ) );
-	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( ColdFinger::OnInitDialog ) );
-	m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( ColdFinger::OnTreeBeginDragCold ), NULL, this );
-	m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler( ColdFinger::OnTreeEndDragCold ), NULL, this );
-	m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEventHandler( ColdFinger::OnTreeItemRightClickCold ), NULL, this );
-	m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( ColdFinger::OnTreeSelChanged ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionAddCold ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionDeleteCold ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionRenameCold ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionaddNodeCold ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuTreeSelectionDeleteNodeCold ) );
-	m_textCtrl73->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ColdFinger::OnTextCold ), NULL, this );
-	m_sdbSizer8OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnOKButtonClickCold ), NULL, this );
-	m_sdbSizer8Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnCancelButtonClickCold ), NULL, this );
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ColdFinger::OnCloseCold ) );
+    this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( ColdFinger::OnInitDialog ) );
+    m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_BEGIN_DRAG, wxTreeEventHandler( ColdFinger::OnTreeBeginDragCold ), NULL, this );
+    m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_END_DRAG, wxTreeEventHandler( ColdFinger::OnTreeEndDragCold ), NULL, this );
+    m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, wxTreeEventHandler( ColdFinger::OnTreeItemRightClickCold ), NULL, this );
+    m_treeCtrl3->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( ColdFinger::OnTreeSelChanged ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionAddCold ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionDeleteCold ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionRenameCold ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuSelectionaddNodeCold ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( ColdFinger::OnMenuTreeSelectionDeleteNodeCold ) );
+    m_textCtrl73->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( ColdFinger::OnTextCold ), NULL, this );
+    m_sdbSizer8OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnOKButtonClickCold ), NULL, this );
+    m_sdbSizer8Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ColdFinger::OnCancelButtonClickCold ), NULL, this );
 
-	delete m_menu9;
+    delete m_menu9;
 }
 
 void ColdFinger::OnCloseCold( wxCloseEvent& event )
@@ -8031,1504 +8202,1515 @@
 //		writeTextblocks();
 //	}
 
-	retItem = NULL;
-	Hide();
-	EndModal(wxID_CANCEL);
+    retItem = NULL;
+    Hide();
+    EndModal( wxID_CANCEL );
 }
 
 void ColdFinger::OnOKButtonClickCold( wxCommandEvent& event )
 {
 
-	if(modified)
-	{
-		((myTreeItem*)m_treeCtrl3->GetItemData(m_treeCtrl3->GetSelection()))->text = m_textCtrl73->GetValue();
-		writeTextblocks();
-	}
-
-	retItem = (myTreeItem*)m_treeCtrl3->GetItemData(m_treeCtrl3->GetSelection());
-	if(retItem->type == NODE)
-		retItem = NULL;
+    if ( modified )
+    {
+        ( ( myTreeItem* )m_treeCtrl3->GetItemData( m_treeCtrl3->GetSelection() ) )->text = m_textCtrl73->GetValue();
+        writeTextblocks();
+    }
+
+    retItem = ( myTreeItem* )m_treeCtrl3->GetItemData( m_treeCtrl3->GetSelection() );
+    if ( retItem->type == NODE )
+        retItem = NULL;
 
-	Hide();
-	EndModal(wxID_OK);
+    Hide();
+    EndModal( wxID_OK );
 }
 
 void ColdFinger::OnCancelButtonClickCold( wxCommandEvent& ev )
 {
-	OnCloseCold( (wxCloseEvent&)ev );
+    OnCloseCold( ( wxCloseEvent& )ev );
 }
 
 #include "xmblue.xpm"
 #include <wx/imaglist.h>
 void ColdFinger::init()
 {
-	imageList = new wxImageList();
-	imageList->Create(16,16);
-	fo = imageList->Add(wxBitmap (folder));
-	it = imageList->Add(wxBitmap (xmblue));
-	m_treeCtrl3->SetImageList(imageList);
-
-	dataPath = *(dialog->pHome_Locn);
-	dataPath += _T("data");
-	dataPath += wxFileName::GetPathSeparator();
-	dataPath += _T("Textblocks.xml");
-
-	loadTextBlocks();
-
-	if(!m_treeCtrl3->GetRootItem().IsOk())
-	{
-		myTreeItem *item = new myTreeItem(NODE,_("Textblocks"),
-			_("Help\n-----\n\nOpen treenode\n  \'Texts when using this Dialog only\'\n  and select e.g. \'Remarks\'\n\nRightclick in TreeView for menu\n\nAdd a item and rename it\n   USE UNIQUE NAMES FOR ITEMS !\n\nInsert text\n\nIn \'Texts when using this Dialog only\' you can insert/delete treenodes only\n\nUse Drag \'n Drop to move item from/to menu\n\nsee next treenodes for more help"),_T(""),_T(""),_T(""),_T(""),0,0,false,true,false);
-		selectedItem = m_treeCtrl3->AddRoot(item->name,fo,-1,item);
-		m_textCtrl73->SetValue(item->text);
-
-		item = new myTreeItem(NODE,_T(""),_("The itemname is shown in the rightcklick-menu of the following Columns\nBy clicking on it the text is inserted\n\n")+
-            dialog->m_gridGlobal->GetColLabelValue(LogbookHTML::REMARKS)+_T("\n")+
-            dialog->m_gridWeather->GetColLabelValue(LogbookHTML::WEATHER)+_T("\n")+
-            dialog->m_gridWeather->GetColLabelValue(LogbookHTML::VISIBILITY)+_T("\n")+
-            dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::SAILS)+_T("\n")+
-            dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::REEF)+_T("\n")+
-            dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MREMARKS)
-			,_T(""),_T(""),_T(""),_T(""),-1,0,false,false,true);
-		wxTreeItemId menu = this->m_treeCtrl3->AppendItem(selectedItem,_("Texts for Rightclick-Menu"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),0,LogbookHTML::REMARKS,false,false,true);
-        wxTreeItemId test = this->m_treeCtrl3->AppendItem(menu,dialog->m_gridGlobal->GetColLabelValue(LogbookHTML::REMARKS)+_T(" (")+
-			dialog->m_notebook8->GetPageText(0)+_T(")"),-fo,-1,item);
-
-		item = new myTreeItem(ITEM,_T(""),_("Sails up\nEngine stopped\n\nDemo - Rightclick-Menu \'use Testextblocks\' for help"),_T(""),_T(""),_T(""),_T(""),0,LogbookHTML::REMARKS,true,false,true);
-		this->m_treeCtrl3->AppendItem(test,_("Demo Sails up"),it,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),1,LogbookHTML::WEATHER,false,false,true);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridWeather->GetColLabelValue(LogbookHTML::WEATHER)+_T(" (")+
-			dialog->m_notebook8->GetPageText(1)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),1,LogbookHTML::VISIBILITY,false,false,true);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridWeather->GetColLabelValue(LogbookHTML::VISIBILITY)+_T(" (")+
-			dialog->m_notebook8->GetPageText(1)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),2,LogbookHTML::SAILS,false,false,true);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::SAILS)+_T(" (")+
-			dialog->m_notebook8->GetPageText(2)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),2,LogbookHTML::REEF,false,false,true);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::REEF)+_T(" (")+
-			dialog->m_notebook8->GetPageText(2)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),2,LogbookHTML::MREMARKS,false,false,true);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MREMARKS)+_T(" (")+
-			dialog->m_notebook8->GetPageText(2)+_T(")"),fo,-1,item);
+    imageList = new wxImageList();
+    imageList->Create( 16,16 );
+    fo = imageList->Add( wxBitmap ( folder ) );
+    it = imageList->Add( wxBitmap ( xmblue ) );
+    m_treeCtrl3->SetImageList( imageList );
+
+    dataPath = dialog->Home_Locn;
+    dataPath += _T( "Textblocks.xml" );
+
+    loadTextBlocks();
+
+    if ( !m_treeCtrl3->GetRootItem().IsOk() )
+    {
+        myTreeItem *item = new myTreeItem( NODE,_( "Textblocks" ),
+                                           _( "Help\n-----\n\nOpen treenode\n  \'Texts when using this Dialog only\'\n  and select e.g. \'Remarks\'\n\nRightclick in TreeView for menu\n\nAdd a item and rename it\n   USE UNIQUE NAMES FOR ITEMS !\n\nInsert text\n\nIn \'Texts when using this Dialog only\' you can insert/delete treenodes only\n\nUse Drag \'n Drop to move item from/to menu\n\nsee next treenodes for more help" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,0,false,true,false );
+        selectedItem = m_treeCtrl3->AddRoot( item->name,fo,-1,item );
+        m_textCtrl73->SetValue( item->text );
+
+        item = new myTreeItem( NODE,_T( "" ),_( "The itemname is shown in the rightcklick-menu of the following Columns\nBy clicking on it the text is inserted\n\n" )+
+                               dialog->m_gridGlobal->GetColLabelValue( LogbookHTML::REMARKS )+_T( "\n" )+
+                               dialog->m_gridWeather->GetColLabelValue( LogbookHTML::WEATHER )+_T( "\n" )+
+                               dialog->m_gridWeather->GetColLabelValue( LogbookHTML::VISIBILITY )+_T( "\n" )+
+                               dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::SAILS )+_T( "\n" )+
+                               dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::REEF )+_T( "\n" )+
+                               dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MREMARKS )
+                               ,_T( "" ),_T( "" ),_T( "" ),_T( "" ),-1,0,false,false,true );
+        wxTreeItemId menu = this->m_treeCtrl3->AppendItem( selectedItem,_( "Texts for Rightclick-Menu" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,LogbookHTML::REMARKS,false,false,true );
+        wxTreeItemId test = this->m_treeCtrl3->AppendItem( menu,dialog->m_gridGlobal->GetColLabelValue( LogbookHTML::REMARKS )+_T( " (" )+
+                            dialog->m_notebook8->GetPageText( 0 )+_T( ")" ),-fo,-1,item );
+
+        item = new myTreeItem( ITEM,_T( "" ),_( "Sails up\nEngine stopped\n\nDemo - Rightclick-Menu \'use Testextblocks\' for help" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,LogbookHTML::REMARKS,true,false,true );
+        this->m_treeCtrl3->AppendItem( test,_( "Demo Sails up" ),it,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),1,LogbookHTML::WEATHER,false,false,true );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridWeather->GetColLabelValue( LogbookHTML::WEATHER )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 1 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),1,LogbookHTML::VISIBILITY,false,false,true );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridWeather->GetColLabelValue( LogbookHTML::VISIBILITY )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 1 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),2,LogbookHTML::SAILS,false,false,true );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::SAILS )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 2 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),2,LogbookHTML::REEF,false,false,true );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::REEF )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 2 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),2,LogbookHTML::MREMARKS,false,false,true );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MREMARKS )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 2 )+_T( ")" ),fo,-1,item );
 
 /////////////////// in dialog only ////////////
-		item = new myTreeItem(NODE,_T(""),_("These texts are inserted into the grid-colmn\nby calling this dialog\n\nSelect Item\nClick OK-Button\n\nUse Drag \'n Drop to place a item in menu"),_T(""),_T(""),_T(""),_T(""),-2,0,false,false,false);
-		menu = this->m_treeCtrl3->AppendItem(selectedItem,_("Texts when using this Dialog only"),fo,0,item);
+        item = new myTreeItem( NODE,_T( "" ),_( "These texts are inserted into the grid-colmn\nby calling this dialog\n\nSelect Item\nClick OK-Button\n\nUse Drag \'n Drop to place a item in menu" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),-2,0,false,false,false );
+        menu = this->m_treeCtrl3->AppendItem( selectedItem,_( "Texts when using this Dialog only" ),fo,0,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,LogbookHTML::REMARKS,false,true,false );
+        test = this->m_treeCtrl3->AppendItem( menu,dialog->m_gridGlobal->GetColLabelValue( LogbookHTML::REMARKS )+_T( " (" )+
+                                              dialog->m_notebook8->GetPageText( 0 )+_T( ")" ),-fo,-1,item );
+
+        item = new myTreeItem( ITEM,_T( "" ),_( "Engine stopped\n\nDemo - Rightclick-Menu \'use Testextblocks\' for help" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,LogbookHTML::REMARKS,true,true,false );
+        this->m_treeCtrl3->AppendItem( test,_( "Demo Engine stopped" ),it,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),1,LogbookHTML::WEATHER,false,true,false );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridWeather->GetColLabelValue( LogbookHTML::WEATHER )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 1 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),1,LogbookHTML::VISIBILITY,false,true,false );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridWeather->GetColLabelValue( LogbookHTML::VISIBILITY )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 1 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),2,LogbookHTML::SAILS,false,true,false );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::SAILS )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 2 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),2,LogbookHTML::REEF,false,true,false );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::REEF )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 2 )+_T( ")" ),fo,-1,item );
+
+        item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),2,LogbookHTML::MREMARKS,false,true,false );
+        this->m_treeCtrl3->AppendItem( menu,dialog->m_gridMotorSails->GetColLabelValue( LogbookHTML::MREMARKS )+_T( " (" )+
+                                       dialog->m_notebook8->GetPageText( 2 )+_T( ")" ),fo,-1,item );
+
+        modified = true;
+        this->writeTextblocks();
+    }
+    else
+    {
+        modified = false;
+    }
 
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),0,LogbookHTML::REMARKS,false,true,false);
-        test = this->m_treeCtrl3->AppendItem(menu,dialog->m_gridGlobal->GetColLabelValue(LogbookHTML::REMARKS)+_T(" (")+
-			dialog->m_notebook8->GetPageText(0)+_T(")"),-fo,-1,item);
-
-		item = new myTreeItem(ITEM,_T(""),_("Engine stopped\n\nDemo - Rightclick-Menu \'use Testextblocks\' for help"),_T(""),_T(""),_T(""),_T(""),0,LogbookHTML::REMARKS,true,true,false);
-		this->m_treeCtrl3->AppendItem(test,_("Demo Engine stopped"),it,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),1,LogbookHTML::WEATHER,false,true,false);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridWeather->GetColLabelValue(LogbookHTML::WEATHER)+_T(" (")+
-			dialog->m_notebook8->GetPageText(1)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),1,LogbookHTML::VISIBILITY,false,true,false);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridWeather->GetColLabelValue(LogbookHTML::VISIBILITY)+_T(" (")+
-			dialog->m_notebook8->GetPageText(1)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),2,LogbookHTML::SAILS,false,true,false);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::SAILS)+_T(" (")+
-			dialog->m_notebook8->GetPageText(2)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),2,LogbookHTML::REEF,false,true,false);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::REEF)+_T(" (")+
-			dialog->m_notebook8->GetPageText(2)+_T(")"),fo,-1,item);
-
-		item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),2,LogbookHTML::MREMARKS,false,true,false);
-        this->m_treeCtrl3->AppendItem(menu,dialog->m_gridMotorSails->GetColLabelValue(LogbookHTML::MREMARKS)+_T(" (")+
-			dialog->m_notebook8->GetPageText(2)+_T(")"),fo,-1,item);
-		
-		modified = true;
-		this->writeTextblocks();
-	}
-	else
-	{
-		modified = false;
-	}
-
-	selectedItem = m_treeCtrl3->GetRootItem();
-	m_treeCtrl3->SetFocus();
-	m_treeCtrl3->SelectItem(selectedItem);
-	m_treeCtrl3->Expand(selectedItem);
-	retItem = NULL;
+    selectedItem = m_treeCtrl3->GetRootItem();
+    m_treeCtrl3->SetFocus();
+    m_treeCtrl3->SelectItem( selectedItem );
+    m_treeCtrl3->Expand( selectedItem );
+    retItem = NULL;
 }
 
-void ColdFinger::OnInitDialog(wxInitDialogEvent& event)
+void ColdFinger::OnInitDialog( wxInitDialogEvent& event )
 {
 
 }
 
 void ColdFinger::OnTreeSelChanged( wxTreeEvent& event )
-{   
-	if(modified && selectedItem.IsOk())
-		((myTreeItem*)m_treeCtrl3->GetItemData(selectedItem))->text = m_textCtrl73->GetValue();
+{
+    if ( modified && selectedItem.IsOk() )
+        ( ( myTreeItem* )m_treeCtrl3->GetItemData( selectedItem ) )->text = m_textCtrl73->GetValue();
 
-	wxString t = ((myTreeItem*)m_treeCtrl3->GetItemData(event.GetItem()))->text;
-	selectedItem = event.GetItem();
+    wxString t = ( ( myTreeItem* )m_treeCtrl3->GetItemData( event.GetItem() ) )->text;
+    selectedItem = event.GetItem();
 
-	m_textCtrl73->SetValue(t);
-	modified = false;
+    m_textCtrl73->SetValue( t );
+    modified = false;
 }
 
 void ColdFinger::OnMenuSelectionaddNodeCold( wxCommandEvent& event )
 {
-	static int i = 1;
-	wxTreeItemId parent;
+    static int i = 1;
+    wxTreeItemId parent;
+
+    myTreeItem *item = new myTreeItem( NODE,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),fo,0,true,true,false );
+
+    if ( ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( selectedItem ) )->type ==  ITEM )
+        parent = this->m_treeCtrl3->GetItemParent( selectedItem );
+    else
+        parent = selectedItem;
+
+    myTreeItem* parentdata = ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( parent ) );
+    item->grid		 = parentdata->grid;
+    item->gridcol	 = parentdata->gridcol;
+    item->add		 = true;
+    item->deleteable = true;
+    item->menu       = parentdata->menu;
+
+    selectedItem = m_treeCtrl3->AppendItem( parent,wxString::Format( _( "New Node%i" ),i++ ),fo,-1,item );
+    m_treeCtrl3->SelectItem( selectedItem );
+    m_treeCtrl3->EditLabel( selectedItem );
+    modified = true;
+}
+
+void ColdFinger::OnMenuTreeSelectionDeleteNodeCold( wxCommandEvent& event )
+{
+    if ( m_treeCtrl3->GetSelection() == m_treeCtrl3->GetRootItem() ) return;
+    if ( ( ( myTreeItem* )m_treeCtrl3->GetItemData( selectedItem ) )->deleteable == false ||
+            ( ( myTreeItem* )m_treeCtrl3->GetItemData( selectedItem ) )->type == ITEM )
+        return;
+
+    m_treeCtrl3->Delete( selectedItem );
+    selectedItem = m_treeCtrl3->GetItemParent( selectedItem );
+    modified = true;
+}
+
+void ColdFinger::OnMenuSelectionAddCold( wxCommandEvent& event )
+{
+    static int i = 1;
+    wxTreeItemId parent;
+
+    myTreeItem *item = new myTreeItem( ITEM,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),it,0,true,true,false );
+
+    if ( ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( m_treeCtrl3->GetSelection() ) )->type ==  ITEM )
+        parent = this->m_treeCtrl3->GetItemParent( selectedItem );
+    else
+        parent = selectedItem;
+
+    myTreeItem* parentdata = ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( parent ) );
+    item->grid		 = parentdata->grid;
+    item->gridcol	 = parentdata->gridcol;
+    item->add		 = true;
+    item->deleteable = true;
+    item->menu       = parentdata->menu;
+
+    selectedItem = m_treeCtrl3->AppendItem( parent,wxString::Format( _( "New Item%i" ),i++ ),it,-1,item );
+    m_treeCtrl3->SelectItem( selectedItem );
+    m_treeCtrl3->EditLabel( selectedItem );
+    modified = true;
+}
+
+void ColdFinger::OnTreeItemRightClickCold( wxTreeEvent& event )
+{
+    if ( event.GetItem() == this->m_treeCtrl3->GetRootItem() ) return;
+
+
+    selectedItem = event.GetItem();
+    m_treeCtrl3->SelectItem( selectedItem );
+
+    myTreeItem* item = ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( selectedItem ) );
+
+    if ( item->grid == -1 || item->grid == -2 ) return;
+
+    if ( item->deleteable == false )
+        m_menu9->Enable( m_menu9->FindItem( _( "Delete Treenode" ) ),false );
+    else
+        m_menu9->Enable( m_menu9->FindItem( _( "Delete Treenode" ) ),true );
+
+    if ( item->add == false )
+        m_menu9->Enable( m_menu9->FindItem( _( "Add Treenode" ) ),false );
+    else
+        m_menu9->Enable( m_menu9->FindItem( _( "Add Treenode" ) ),true );
+
+    m_treeCtrl3->PopupMenu( m_menu9 );
+}
+
+void ColdFinger::OnMenuSelectionDeleteCold( wxCommandEvent& event )
+{
+    if ( ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( selectedItem ) )->deleteable == false ||
+            ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( selectedItem ) )->type == NODE ) return;
+
+    if ( selectedItem != m_treeCtrl3->GetRootItem() )
+    {
+        m_treeCtrl3->Delete( selectedItem );
+        selectedItem = m_treeCtrl3->GetItemParent( selectedItem );
+        modified = true;
+    }
+}
+
+void ColdFinger::OnMenuSelectionRenameCold( wxCommandEvent& event )
+{
+    modified = true;
+    m_treeCtrl3->EditLabel( m_treeCtrl3->GetSelection() );
+}
+
+void ColdFinger::OnTextCold( wxCommandEvent& event )
+{
+    modified = true;
+}
+
+void ColdFinger::writeTextblocks()
+{
+    if ( !modified )
+        return;
+
+    TiXmlDocument doc( dataPath.mb_str( wxConvUTF8 ) );
+
+    TiXmlDeclaration* decl = new TiXmlDeclaration( "1.0", "UTF-8", "" );
+    doc.LinkEndChild( decl );
+
+    myTreeItem* item;
+    item = ( myTreeItem* ) m_treeCtrl3->GetItemData( m_treeCtrl3->GetRootItem() );
+
+    TiXmlElement *root = new TiXmlElement( "TextblocksXML" );
+    doc.LinkEndChild( root );
+
+    root->SetAttribute( "Name",item->name.mb_str( wxConvUTF8 ) );
+    root->SetAttribute( "Helptext",item->text.mb_str( wxConvUTF8 ) );
+    recursiveWrite( m_treeCtrl3->GetRootItem(), root );
+    doc.SaveFile();
+}
+
+void ColdFinger::addElement( TiXmlElement* root, const char* key, const char* label )
+{
+    TiXmlElement* celem = new TiXmlElement( key );
+    celem->LinkEndChild( new TiXmlText( label ) );
+    root->LinkEndChild( celem );
+}
+
+wxTreeItemId ColdFinger::recursiveWrite( wxTreeItemId id, TiXmlElement *elem )
+{
+    wxTreeItemIdValue cookie;
+    wxTreeItemId child;
+    wxTreeItemId item = m_treeCtrl3->GetFirstChild( id, cookie );
+    TiXmlElement *newElement;
+
+    while ( item.IsOk() )
+    {
+        wxString sData = m_treeCtrl3->GetItemText( item );
+        myTreeItem* data = ( myTreeItem* ) m_treeCtrl3->GetItemData( item );
+
+        newElement = new TiXmlElement( ( data->type )?"ITEM":"NODE" );
+
+        addElement( newElement,"Type",wxString::Format( _T( "%i" ),data->type ).mb_str() );
+        addElement( newElement,"Name",sData.mb_str( wxConvUTF8 ) );
+        addElement( newElement,"Text",data->text.mb_str( wxConvUTF8 ) );
+        addElement( newElement,"GUID",data->guid.mb_str( wxConvUTF8 ) );
+        addElement( newElement,"Route",data->route.mb_str( wxConvUTF8 ) );
+        addElement( newElement,"GUIDWP",data->guidWP.mb_str( wxConvUTF8 ) );
+        addElement( newElement,"WP",data->WP.mb_str( wxConvUTF8 ) );
+        addElement( newElement,"Grid",wxString::Format( _T( "%i" ),data->grid ).mb_str() );
+        addElement( newElement,"Column",wxString::Format( _T( "%i" ),data->gridcol ).mb_str() );
+        addElement( newElement,"Deleteable",wxString::Format( _T( "%s" ),( data->deleteable )?_T( "true" ):_T( "false" ) ).mb_str() );
+        addElement( newElement,"Add",wxString::Format( _T( "%s" ),( data->add )?_T( "true" ):_T( "false" ) ).mb_str() );
+        addElement( newElement,"Menu",wxString::Format( _T( "%s" ),( data->menu )?_T( "true" ):_T( "false" ) ).mb_str() );
+
+        if ( m_treeCtrl3->ItemHasChildren( item ) )
+            recursiveWrite( item, newElement );
+
+        elem->LinkEndChild( newElement );
+        item = m_treeCtrl3->GetNextSibling( item );
+    }
+
+    /* Not found */
+    wxTreeItemId dummy;
+    return dummy;
+}
+
+void ColdFinger::loadTextBlocks()
+{
+    TiXmlDocument doc( dataPath.mb_str( wxConvUTF8 ) );
+    bool ok = doc.LoadFile();
+
+    if ( ok )
+        fillTree( m_treeCtrl3->GetRootItem(), &doc );
+
+    modified = false;
+}
+
+void ColdFinger::fillTree( wxTreeItemId id, TiXmlNode* node )
+{
+    TiXmlNode* pChild;
+    static myTreeItem* elem	;
+    int t = node->Type();
+
+    switch ( t )
+    {
+    case TiXmlNode::TINYXML_ELEMENT:
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "TextblocksXML" ) )
+        {
+            wxString name,text;
+            TiXmlAttribute* pAttrib=node->ToElement()->FirstAttribute();
+            if ( wxString( pAttrib->Name(),wxConvUTF8 ) == _T( "Name" ) )
+                name = wxString( pAttrib->Value(),wxConvUTF8 );
+            pAttrib=pAttrib->Next();
+            if ( wxString( pAttrib->Name(),wxConvUTF8 ) == _T( "Helptext" ) )
+                text = wxString( pAttrib->Value(),wxConvUTF8 );
+
+            elem = new myTreeItem( NODE,name,text,_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,0,false,false,false );
+            id = m_treeCtrl3->AddRoot( name,fo,-1,elem );
+        }
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "NODE" ) )
+        {
+            elem = new myTreeItem( 0,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,0,false,false,false );
+            id = m_treeCtrl3->AppendItem( id,_T( "" ),fo,-1,elem );
+        }
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "ITEM" ) )
+        {
+            elem = new myTreeItem( 1,_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),_T( "" ),0,0,false,false,false );
+            id = m_treeCtrl3->AppendItem( id,_T( "" ),it,-1,elem );
+        }
+
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Type" ) )
+        {
+            elem->type = atoi( node->ToElement()->GetText() );
+            m_treeCtrl3->SetItemText( id,elem->name );
+        }
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Name" ) )
+        {
+            elem->name = wxString( node->ToElement()->GetText(),wxConvUTF8 );
+            m_treeCtrl3->SetItemText( id,elem->name );
+        }
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Text" ) )
+            elem->text = wxString( node->ToElement()->GetText(),wxConvUTF8 );
+
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Grid" ) )
+        {
+            elem->grid = atoi( node->ToElement()->GetText() );
+            m_treeCtrl3->SetItemText( id,elem->name );
+        }
+
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Column" ) )
+            elem->gridcol = atoi( node->ToElement()->GetText() );
+
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Deleteable" ) )
+            elem->deleteable = ( wxString( node->ToElement()->GetText(),wxConvUTF8 ) == _T( "true" ) )?true:false;
+
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Add" ) )
+            elem->add = ( wxString( node->ToElement()->GetText(),wxConvUTF8 ) == _T( "true" ) )?true:false;
+
+        if ( wxString( node->Value(),wxConvUTF8 ) == _T( "Menu" ) )
+            elem->menu = ( wxString( node->ToElement()->GetText(),wxConvUTF8 ) == _T( "true" ) )?true:false;
+        break;
+    }
+
+    for ( pChild = node->FirstChild(); pChild != 0; pChild = pChild->NextSibling() )
+    {
+        fillTree( id, pChild );
+    }
+}
+
+void ColdFinger::OnTreeBeginDragCold( wxTreeEvent& event )
+{
+    if ( event.GetItem() != m_treeCtrl3->GetRootItem() )
+    {
+        selectedItem = event.GetItem();
+        this->m_textCtrl73->SetValue( ( ( myTreeItem* )m_treeCtrl3->GetItemData( selectedItem ) )->text );
+        m_treeCtrl3->SelectItem( selectedItem );
+
+        if ( ( ( myTreeItem* )this->m_treeCtrl3->GetItemData( selectedItem ) )->type == NODE )
+            return;
+
+        event.Allow();
+    }
+}
+
+void ColdFinger::OnTreeEndDragCold( wxTreeEvent& event )
+{
+    wxTreeItemId id,parent;
+
+    id = event.GetItem();
+    if ( id == m_treeCtrl3->GetRootItem() ) return;
+    myTreeItem* my = ( myTreeItem* )m_treeCtrl3->GetItemData( id );
+
+    if ( my->grid == -1 || my->grid == -2 ) return;
+
+    if ( my->type == ColdFinger::NODE )
+        parent = id;
+    else
+        parent = m_treeCtrl3->GetItemParent( id );
+
+    myTreeItem* parentmy = ( myTreeItem* )m_treeCtrl3->GetItemData( selectedItem );
+    wxString s = m_treeCtrl3->GetItemText( selectedItem );
+
+    parentmy->type       = ColdFinger::ITEM;
+    parentmy->grid       = my->grid;
+    parentmy->gridcol    = my->gridcol;
+    parentmy->deleteable = true;
+    parentmy->add        = false;
+    parentmy->menu       = my->menu;
+
+    myTreeItem* newmy = new myTreeItem( parentmy );
+    wxTreeItemId newId = m_treeCtrl3->InsertItem( parent,( newmy->type == ColdFinger::NODE )?wxTreeItemId():id,s,( newmy->type == ColdFinger::NODE )?fo:it,-1,newmy );
+
+    m_treeCtrl3->Delete( selectedItem );
+    selectedItem = newId;
+    m_textCtrl73->SetValue( newmy->text );
+    m_treeCtrl3->SelectItem( newId );
+    m_treeCtrl3->Expand( id );
+}
+
+/////////////////// used in ColdFinger /////////////////
+myTreeItem::myTreeItem( int type, wxString name, wxString text, wxString guid, wxString route, wxString guidWP, wxString WP, int grid, int gridcol, bool deleteable, bool add, bool menu )
+{
+    this->type       = type;
+    this->name       = name;
+    this->text       = text;
+    this->guidWP     = guidWP;
+    this->route      = route;
+    this->guidWP     = guidWP;
+    this->WP         = WP;
+    this->grid       = grid;
+    this->gridcol    = gridcol;
+    this->deleteable = deleteable;
+    this->add        = add;
+    this->menu   	 = menu;
+}
+
+myTreeItem::myTreeItem( const myTreeItem* item )
+{
+    this->type       = item->type;
+    this->name       = item->name;
+    this->text       = item->text;
+    this->guidWP     = item->guidWP;
+    this->route      = item->route;
+    this->guidWP     = item->guidWP;
+    this->WP         = item->WP;
+    this->grid       = item->grid;
+    this->gridcol    = item->gridcol;
+    this->deleteable = item->deleteable;
+    this->add        = item->add;
+    this->menu   	 = item->menu;
+}
 
-	myTreeItem *item = new myTreeItem(NODE,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),fo,0,true,true,false);
 
-	if(((myTreeItem*)this->m_treeCtrl3->GetItemData(selectedItem))->type ==  ITEM)
-		parent = this->m_treeCtrl3->GetItemParent(selectedItem);
-	else
-		parent = selectedItem;
-
-	myTreeItem* parentdata = ((myTreeItem*)this->m_treeCtrl3->GetItemData(parent));
-	item->grid		 = parentdata->grid;
-	item->gridcol	 = parentdata->gridcol;
-	item->add		 = true;
-	item->deleteable = true;
-	item->menu       = parentdata->menu;
-
-	selectedItem = m_treeCtrl3->AppendItem(parent,wxString::Format(_("New Node%i"),i++),fo,-1,item);
-	m_treeCtrl3->SelectItem(selectedItem);
-	m_treeCtrl3->EditLabel(selectedItem);
-	modified = true;
+bool DnD::OnDropText( wxCoord x, wxCoord y, const wxString& str )
+{
+    return true;
 }
 
-void ColdFinger::OnMenuTreeSelectionDeleteNodeCold( wxCommandEvent& event )
-{
-	if(m_treeCtrl3->GetSelection() == m_treeCtrl3->GetRootItem()) return;
-	if(((myTreeItem*)m_treeCtrl3->GetItemData(selectedItem))->deleteable == false ||
-	  ((myTreeItem*)m_treeCtrl3->GetItemData(selectedItem))->type == ITEM)
-	  return;
-
-	m_treeCtrl3->Delete(selectedItem);
-	selectedItem = m_treeCtrl3->GetItemParent(selectedItem);
-	modified = true;
-}
+////////////// Timer-Interval Dialog ///////
+TimerInterval::TimerInterval( wxWindow* parent, Options* opt,  wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer32;
+    bSizer32 = new wxBoxSizer( wxVERTICAL );
+
+    m_radioBtnNormalTimer = new wxRadioButton( this, wxID_ANY, _( "Normal Timer" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer32->Add( m_radioBtnNormalTimer, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer46;
+    fgSizer46 = new wxFlexGridSizer( 0, 6, 0, 0 );
+    fgSizer46->SetFlexibleDirection( wxBOTH );
+    fgSizer46->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_spinCtrlH = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 0, 24, 24 );
+    fgSizer46->Add( m_spinCtrlH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextH = new wxStaticText( this, wxID_ANY, _( "h" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextH->Wrap( -1 );
+    fgSizer46->Add( m_staticTextH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_spinCtrlM = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 0, 59, 0 );
+    fgSizer46->Add( m_spinCtrlM, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextM = new wxStaticText( this, wxID_ANY, _( "m" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextM->Wrap( -1 );
+    fgSizer46->Add( m_staticTextM, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
 
-void ColdFinger::OnMenuSelectionAddCold( wxCommandEvent& event )
-{
-	static int i = 1;
-	wxTreeItemId parent;
+    m_spinCtrlS = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 0, 59, 0 );
+    fgSizer46->Add( m_spinCtrlS, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	myTreeItem *item = new myTreeItem(ITEM,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),it,0,true,true,false);
+    m_staticTextS = new wxStaticText( this, wxID_ANY, _T( "s" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextS->Wrap( -1 );
+    fgSizer46->Add( m_staticTextS, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
 
-	if(((myTreeItem*)this->m_treeCtrl3->GetItemData(m_treeCtrl3->GetSelection()))->type ==  ITEM)
-		parent = this->m_treeCtrl3->GetItemParent(selectedItem);
-	else
-		parent = selectedItem;
-
-	myTreeItem* parentdata = ((myTreeItem*)this->m_treeCtrl3->GetItemData(parent));
-	item->grid		 = parentdata->grid;
-	item->gridcol	 = parentdata->gridcol;
-	item->add		 = true;
-	item->deleteable = true;
-	item->menu       = parentdata->menu;
-
-	selectedItem = m_treeCtrl3->AppendItem(parent,wxString::Format(_("New Item%i"),i++),it,-1,item);
-	m_treeCtrl3->SelectItem(selectedItem);
-	m_treeCtrl3->EditLabel(selectedItem);
-	modified = true;
-}
+    bSizer32->Add( fgSizer46, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
 
-void ColdFinger::OnTreeItemRightClickCold( wxTreeEvent& event )
-{
-	if(event.GetItem() == this->m_treeCtrl3->GetRootItem()) return;
+    wxFlexGridSizer* fgSizer49;
+    fgSizer49 = new wxFlexGridSizer( 0, 1, 0, 0 );
+    fgSizer49->SetFlexibleDirection( wxBOTH );
+    fgSizer49->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
+    m_staticText120 = new wxStaticText( this, wxID_ANY, _( "Event" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText120->Wrap( -1 );
+    fgSizer49->Add( m_staticText120, 0, wxALL, 5 );
 
-	selectedItem = event.GetItem();
-	m_treeCtrl3->SelectItem(selectedItem);
+    bSizer32->Add( fgSizer49, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-	myTreeItem* item = ((myTreeItem*)this->m_treeCtrl3->GetItemData(selectedItem));
+    m_staticline37 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer32->Add( m_staticline37, 0, wxEXPAND | wxALL, 5 );
 
-	if(item->grid == -1 || item->grid == -2) return;
+    wxFlexGridSizer* fgSizer54;
+    fgSizer54 = new wxFlexGridSizer( 0, 4, 0, 0 );
+    fgSizer54->SetFlexibleDirection( wxBOTH );
+    fgSizer54->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	if(item->deleteable == false)
-		m_menu9->Enable(m_menu9->FindItem(_("Delete Treenode")),false);
-	else
-		m_menu9->Enable(m_menu9->FindItem(_("Delete Treenode")),true);
+    m_radioBtnFullHour = new wxRadioButton( this, wxID_ANY, _( "Full Hour Timer" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer54->Add( m_radioBtnFullHour, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	if(item->add == false)
-		m_menu9->Enable(m_menu9->FindItem(_("Add Treenode")),false);
-	else
-		m_menu9->Enable(m_menu9->FindItem(_("Add Treenode")),true);
+    m_staticText125 = new wxStaticText( this, wxID_ANY, _( "every" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText125->Wrap( -1 );
+    fgSizer54->Add( m_staticText125, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	m_treeCtrl3->PopupMenu( m_menu9 );
-}
+    m_spinCtrl4 = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 1, 24, 1 );
+    fgSizer54->Add( m_spinCtrl4, 0, wxALL, 5 );
 
-void ColdFinger::OnMenuSelectionDeleteCold( wxCommandEvent& event )
-{
-	if(((myTreeItem*)this->m_treeCtrl3->GetItemData(selectedItem))->deleteable == false ||
-		((myTreeItem*)this->m_treeCtrl3->GetItemData(selectedItem))->type == NODE) return;
+    m_staticText124 = new wxStaticText( this, wxID_ANY, _( "h" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText124->Wrap( -1 );
+    fgSizer54->Add( m_staticText124, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	if(selectedItem != m_treeCtrl3->GetRootItem())
-	{
-		m_treeCtrl3->Delete(selectedItem);
-		selectedItem = m_treeCtrl3->GetItemParent(selectedItem);
-		modified = true;
-	}
-}
+    bSizer32->Add( fgSizer54, 0, 0, 5 );
 
-void ColdFinger::OnMenuSelectionRenameCold( wxCommandEvent& event )
-{
-	modified = true;
-	m_treeCtrl3->EditLabel(m_treeCtrl3->GetSelection());
-}
+    wxFlexGridSizer* fgSizer47;
+    fgSizer47 = new wxFlexGridSizer( 0, 1, 0, 0 );
+    fgSizer47->SetFlexibleDirection( wxBOTH );
+    fgSizer47->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-void ColdFinger::OnTextCold( wxCommandEvent& event )
-{
-	modified = true;
-}
+    m_gridFull = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
-void ColdFinger::writeTextblocks()
-{
-	if(!modified) 
-		return;
+    // Grid
+    m_gridFull->CreateGrid( 2, 1 );
+    m_gridFull->EnableEditing( true );
+    m_gridFull->EnableGridLines( true );
+    m_gridFull->EnableDragGridSize( false );
+    m_gridFull->SetMargins( 0, 0 );
 
-	TiXmlDocument doc(dataPath.mb_str(wxConvUTF8));  
-	
- 	TiXmlDeclaration* decl = new TiXmlDeclaration( "1.0", "UTF-8", "" );  
-	doc.LinkEndChild( decl ); 
-
-	myTreeItem* item;
-	item = (myTreeItem*) m_treeCtrl3->GetItemData(m_treeCtrl3->GetRootItem());
-
-	TiXmlElement *root = new TiXmlElement("TextblocksXML");
-	doc.LinkEndChild( root ); 	
-
-	root->SetAttribute( "Name",item->name.mb_str(wxConvUTF8) );
-	root->SetAttribute( "Helptext",item->text.mb_str(wxConvUTF8) );
-	recursiveWrite(m_treeCtrl3->GetRootItem(), root);
-	doc.SaveFile();
-}
-
-void ColdFinger::addElement(TiXmlElement* root, const char* key, const char* label)
-{
-	TiXmlElement* celem = new TiXmlElement(key);
-	celem->LinkEndChild(new TiXmlText(label));
-	root->LinkEndChild(celem);		
-}
-
-wxTreeItemId ColdFinger::recursiveWrite(wxTreeItemId id, TiXmlElement *elem)
-{
-	wxTreeItemIdValue cookie;
-	wxTreeItemId child;
-    wxTreeItemId item = m_treeCtrl3->GetFirstChild(id, cookie );
-	TiXmlElement *newElement;
-
-	while( item.IsOk() )
-	{
-		wxString sData = m_treeCtrl3->GetItemText(item);
-		myTreeItem* data = (myTreeItem*) m_treeCtrl3->GetItemData(item);
-						
-		newElement = new TiXmlElement((data->type)?"ITEM":"NODE");					
-			
-		addElement(newElement,"Type",wxString::Format(_T("%i"),data->type).mb_str());
-		addElement(newElement,"Name",sData.mb_str(wxConvUTF8));
-		addElement(newElement,"Text",data->text.mb_str(wxConvUTF8));
-		addElement(newElement,"GUID",data->guid.mb_str(wxConvUTF8));
-		addElement(newElement,"Route",data->route.mb_str(wxConvUTF8));							
-		addElement(newElement,"GUIDWP",data->guidWP.mb_str(wxConvUTF8));
-		addElement(newElement,"WP",data->WP.mb_str(wxConvUTF8));
-		addElement(newElement,"Grid",wxString::Format(_T("%i"),data->grid).mb_str());
-		addElement(newElement,"Column",wxString::Format(_T("%i"),data->gridcol).mb_str());
-		addElement(newElement,"Deleteable",wxString::Format(_T("%s"),(data->deleteable)?_T("true"):_T("false")).mb_str());
-		addElement(newElement,"Add",wxString::Format(_T("%s"),(data->add)?_T("true"):_T("false")).mb_str());
-		addElement(newElement,"Menu",wxString::Format(_T("%s"),(data->menu)?_T("true"):_T("false")).mb_str());
-
-		if( m_treeCtrl3->ItemHasChildren( item ) )
-			recursiveWrite( item, newElement );
-
-		elem->LinkEndChild(newElement);
-		item = m_treeCtrl3->GetNextSibling(item);
-	}
-     
-	/* Not found */
-	wxTreeItemId dummy;
-	return dummy;	
-}
+    // Columns
+    m_gridFull->EnableDragColMove( false );
+    m_gridFull->EnableDragColSize( true );
+    m_gridFull->SetColLabelSize( 30 );
+    m_gridFull->SetColLabelValue( 0, _( "+ Minutes" ) );
+    m_gridFull->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
-void ColdFinger::loadTextBlocks()
-{
-	TiXmlDocument doc(dataPath.mb_str(wxConvUTF8));
-	bool ok = doc.LoadFile();
+    // Rows
+    m_gridFull->EnableDragRowSize( true );
+    m_gridFull->SetRowLabelSize( 30 );
+    m_gridFull->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
-	if(ok)
-		fillTree(m_treeCtrl3->GetRootItem(), &doc);
+    // Label Appearance
 
-	modified = false;
-}
+    // Cell Defaults
+    m_gridFull->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP );
 
-void ColdFinger::fillTree(wxTreeItemId id, TiXmlNode* node)
-{
-	TiXmlNode* pChild;
-	static myTreeItem* elem	;
-	int t = node->Type();
-
-	switch ( t )
-	{
-	case TiXmlNode::TINYXML_ELEMENT:
-		if(wxString(node->Value(),wxConvUTF8) == _T("TextblocksXML"))
-		{
-			wxString name,text;
-			TiXmlAttribute* pAttrib=node->ToElement()->FirstAttribute();
-			if(wxString(pAttrib->Name(),wxConvUTF8) == _T("Name"))
-				name = wxString(pAttrib->Value(),wxConvUTF8);
-			pAttrib=pAttrib->Next();
-			if(wxString(pAttrib->Name(),wxConvUTF8) == _T("Helptext"))
-				text = wxString(pAttrib->Value(),wxConvUTF8);
-
-			elem = new myTreeItem(NODE,name,text,_T(""),_T(""),_T(""),_T(""),0,0,false,false,false);
-			id = m_treeCtrl3->AddRoot(name,fo,-1,elem);
-		}
-		if(wxString(node->Value(),wxConvUTF8) == _T("NODE"))
-		{
-			elem = new myTreeItem(0,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),0,0,false,false,false);
-			id = m_treeCtrl3->AppendItem(id,_T(""),fo,-1,elem);
-		}
-		if(wxString(node->Value(),wxConvUTF8) == _T("ITEM"))
-		{
-			elem = new myTreeItem(1,_T(""),_T(""),_T(""),_T(""),_T(""),_T(""),0,0,false,false,false);
-			id = m_treeCtrl3->AppendItem(id,_T(""),it,-1,elem);
-		}
-
-		if(wxString(node->Value(),wxConvUTF8) == _T("Type"))
-		{
-			elem->type = atoi(node->ToElement()->GetText());
-			m_treeCtrl3->SetItemText(id,elem->name);
-		}
-		if(wxString(node->Value(),wxConvUTF8) == _T("Name"))
-		{
-			elem->name = wxString(node->ToElement()->GetText(),wxConvUTF8);
-			m_treeCtrl3->SetItemText(id,elem->name);
-		}
-		if(wxString(node->Value(),wxConvUTF8) == _T("Text"))
-			elem->text = wxString(node->ToElement()->GetText(),wxConvUTF8);
-
-		if(wxString(node->Value(),wxConvUTF8) == _T("Grid"))
-		{
-			elem->grid = atoi(node->ToElement()->GetText());
-			m_treeCtrl3->SetItemText(id,elem->name);
-		}
-
-		if(wxString(node->Value(),wxConvUTF8) == _T("Column"))
-			elem->gridcol = atoi(node->ToElement()->GetText());
-
-		if(wxString(node->Value(),wxConvUTF8) == _T("Deleteable"))
-			elem->deleteable = (wxString(node->ToElement()->GetText(),wxConvUTF8) == _T("true"))?true:false;
-
-		if(wxString(node->Value(),wxConvUTF8) == _T("Add"))
-			elem->add = (wxString(node->ToElement()->GetText(),wxConvUTF8) == _T("true"))?true:false;
-
-		if(wxString(node->Value(),wxConvUTF8) == _T("Menu"))
-			elem->menu = (wxString(node->ToElement()->GetText(),wxConvUTF8) == _T("true"))?true:false;
-		break;
-	}
-
-	for ( pChild = node->FirstChild(); pChild != 0; pChild = pChild->NextSibling()) 
-	{
-		fillTree( id, pChild );
-	}
-}
+    m_menu11 = new wxMenu();
+    wxMenuItem* m_menuItemDeleteRow;
+    m_menuItemDeleteRow = new wxMenuItem( m_menu11, wxID_ANY, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu11->Append( m_menuItemDeleteRow );
 
-void ColdFinger::OnTreeBeginDragCold( wxTreeEvent& event )
-{
-    if ( event.GetItem() != m_treeCtrl3->GetRootItem() )
-    {
-		selectedItem = event.GetItem();
-		this->m_textCtrl73->SetValue(((myTreeItem*)m_treeCtrl3->GetItemData(selectedItem))->text);
-		m_treeCtrl3->SelectItem(selectedItem);
+    wxMenuItem* m_menuItemClearAll;
+    m_menuItemClearAll = new wxMenuItem( m_menu11, wxID_ANY, wxString( _( "Clear all" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu11->Append( m_menuItemClearAll );
 
-		if(((myTreeItem*)this->m_treeCtrl3->GetItemData(selectedItem))->type == NODE)
-			return;
+    fgSizer47->Add( m_gridFull, 0, wxALL|wxEXPAND, 5 );
+    bSizer32->Add( fgSizer47, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-		event.Allow();
-	}
-}
+    wxFlexGridSizer* fgSizer491;
+    fgSizer491 = new wxFlexGridSizer( 0, 1, 0, 0 );
+    fgSizer491->SetFlexibleDirection( wxBOTH );
+    fgSizer491->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-void ColdFinger::OnTreeEndDragCold( wxTreeEvent& event)
-{
-	wxTreeItemId id,parent;
+    m_staticText1201 = new wxStaticText( this, wxID_ANY, _( "Event" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1201->Wrap( -1 );
+    fgSizer491->Add( m_staticText1201, 0, wxALL, 5 );
 
-	id = event.GetItem();
-	if( id == m_treeCtrl3->GetRootItem()) return;
-	myTreeItem* my = (myTreeItem*)m_treeCtrl3->GetItemData(id);
+    bSizer32->Add( fgSizer491, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-	if(my->grid == -1 || my->grid == -2) return;
+    m_staticline38 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer32->Add( m_staticline38, 0, wxEXPAND | wxALL, 5 );
 
-	if(my->type == ColdFinger::NODE)
-		parent = id;
-	else
-		parent = m_treeCtrl3->GetItemParent(id);
+    m_radioBtnIndividualTimer = new wxRadioButton( this, wxID_ANY, _( "Individual Timer" ), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer32->Add( m_radioBtnIndividualTimer, 0, wxALL, 5 );
 
-	myTreeItem* parentmy = (myTreeItem*)m_treeCtrl3->GetItemData(selectedItem);
-	wxString s = m_treeCtrl3->GetItemText(selectedItem);
+    wxFlexGridSizer* fgSizer48;
+    fgSizer48 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer48->SetFlexibleDirection( wxBOTH );
+    fgSizer48->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-	parentmy->type       = ColdFinger::ITEM;
-	parentmy->grid       = my->grid;
-	parentmy->gridcol    = my->gridcol;
-	parentmy->deleteable = true;
-	parentmy->add        = false;
-	parentmy->menu       = my->menu;
+    m_gridIndividual = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 
-	myTreeItem* newmy = new myTreeItem(parentmy);
-	wxTreeItemId newId = m_treeCtrl3->InsertItem(parent,(newmy->type == ColdFinger::NODE)?wxTreeItemId():id,s,(newmy->type == ColdFinger::NODE)?fo:it,-1,newmy);
+    // Grid
+    m_gridIndividual->CreateGrid( 2, 2 );
+    m_gridIndividual->EnableEditing( true );
+    m_gridIndividual->EnableGridLines( true );
+    m_gridIndividual->EnableDragGridSize( false );
+    m_gridIndividual->SetMargins( 0, 0 );
 
-	m_treeCtrl3->Delete(selectedItem);
-	selectedItem = newId;
-	m_textCtrl73->SetValue(newmy->text);
-	m_treeCtrl3->SelectItem(newId);
-	m_treeCtrl3->Expand(id);
-}
+    // Columns
+    m_gridIndividual->SetColSize( 0, 51 );
+    m_gridIndividual->SetColSize( 1, 53 );
+    m_gridIndividual->EnableDragColMove( false );
+    m_gridIndividual->EnableDragColSize( true );
+    m_gridIndividual->SetColLabelSize( 30 );
+    m_gridIndividual->SetColLabelValue( 0, _( "Hour" ) );
+    m_gridIndividual->SetColLabelValue( 1, _( "Minutes" ) );
+    m_gridIndividual->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
-/////////////////// used in ColdFinger /////////////////
-myTreeItem::myTreeItem( int type, wxString name, wxString text, wxString guid, wxString route, wxString guidWP, wxString WP, int grid, int gridcol, bool deleteable, bool add, bool menu )
-{
-	this->type       = type;
-	this->name       = name;
-	this->text       = text;
-	this->guidWP     = guidWP;
-	this->route      = route;
-	this->guidWP     = guidWP;
-	this->WP         = WP;
-	this->grid       = grid;
-	this->gridcol    = gridcol;
-	this->deleteable = deleteable;
-	this->add        = add;
-	this->menu   	 = menu;
-}
-
-myTreeItem::myTreeItem(const myTreeItem* item)
-{
-	this->type       = item->type;
-	this->name       = item->name;
-	this->text       = item->text;
-	this->guidWP     = item->guidWP;
-	this->route      = item->route;
-	this->guidWP     = item->guidWP;
-	this->WP         = item->WP;
-	this->grid       = item->grid;
-	this->gridcol    = item->gridcol;
-	this->deleteable = item->deleteable;
-	this->add        = item->add;
-	this->menu   	 = item->menu;
-}
+    // Rows
+    m_gridIndividual->EnableDragRowSize( true );
+    m_gridIndividual->SetRowLabelSize( 1 );
+    m_gridIndividual->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
+    // Label Appearance
 
-bool DnD::OnDropText(wxCoord x, wxCoord y, const wxString& str)
-{
-    return true;
-}
+    // Cell Defaults
+    m_gridIndividual->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP );
 
-////////////// Timer-Interval Dialog ///////
-TimerInterval::TimerInterval( wxWindow* parent, Options* opt,  wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer32;
-	bSizer32 = new wxBoxSizer( wxVERTICAL );
-	
-	m_radioBtnNormalTimer = new wxRadioButton( this, wxID_ANY, _("Normal Timer"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer32->Add( m_radioBtnNormalTimer, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer46;
-	fgSizer46 = new wxFlexGridSizer( 0, 6, 0, 0 );
-	fgSizer46->SetFlexibleDirection( wxBOTH );
-	fgSizer46->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_spinCtrlH = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 0, 24, 24 );
-	fgSizer46->Add( m_spinCtrlH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextH = new wxStaticText( this, wxID_ANY, _("h"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextH->Wrap( -1 );
-	fgSizer46->Add( m_staticTextH, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_spinCtrlM = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 0, 59, 0 );
-	fgSizer46->Add( m_spinCtrlM, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextM = new wxStaticText( this, wxID_ANY, _("m"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextM->Wrap( -1 );
-	fgSizer46->Add( m_staticTextM, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_spinCtrlS = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 0, 59, 0 );
-	fgSizer46->Add( m_spinCtrlS, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextS = new wxStaticText( this, wxID_ANY, _T("s"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextS->Wrap( -1 );
-	fgSizer46->Add( m_staticTextS, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	bSizer32->Add( fgSizer46, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxFlexGridSizer* fgSizer49;
-	fgSizer49 = new wxFlexGridSizer( 0, 1, 0, 0 );
-	fgSizer49->SetFlexibleDirection( wxBOTH );
-	fgSizer49->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText120 = new wxStaticText( this, wxID_ANY, _("Event"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText120->Wrap( -1 );
-	fgSizer49->Add( m_staticText120, 0, wxALL, 5 );
-	
-	bSizer32->Add( fgSizer49, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline37 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer32->Add( m_staticline37, 0, wxEXPAND | wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer54;
-	fgSizer54 = new wxFlexGridSizer( 0, 4, 0, 0 );
-	fgSizer54->SetFlexibleDirection( wxBOTH );
-	fgSizer54->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_radioBtnFullHour = new wxRadioButton( this, wxID_ANY, _("Full Hour Timer"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer54->Add( m_radioBtnFullHour, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText125 = new wxStaticText( this, wxID_ANY, _("every"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText125->Wrap( -1 );
-	fgSizer54->Add( m_staticText125, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_spinCtrl4 = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 50,-1 ), wxSP_ARROW_KEYS, 1, 24, 1 );
-	fgSizer54->Add( m_spinCtrl4, 0, wxALL, 5 );
-	
-	m_staticText124 = new wxStaticText( this, wxID_ANY, _("h"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText124->Wrap( -1 );
-	fgSizer54->Add( m_staticText124, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer32->Add( fgSizer54, 0, 0, 5 );
-	
-	wxFlexGridSizer* fgSizer47;
-	fgSizer47 = new wxFlexGridSizer( 0, 1, 0, 0 );
-	fgSizer47->SetFlexibleDirection( wxBOTH );
-	fgSizer47->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-	m_gridFull = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridFull->CreateGrid( 2, 1 );
-	m_gridFull->EnableEditing( true );
-	m_gridFull->EnableGridLines( true );
-	m_gridFull->EnableDragGridSize( false );
-	m_gridFull->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridFull->EnableDragColMove( false );
-	m_gridFull->EnableDragColSize( true );
-	m_gridFull->SetColLabelSize( 30 );
-	m_gridFull->SetColLabelValue( 0, _("+ Minutes") );
-	m_gridFull->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridFull->EnableDragRowSize( true );
-	m_gridFull->SetRowLabelSize( 30 );
-	m_gridFull->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridFull->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP );
-
-	m_menu11 = new wxMenu();
-	wxMenuItem* m_menuItemDeleteRow;
-	m_menuItemDeleteRow = new wxMenuItem( m_menu11, wxID_ANY, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu11->Append( m_menuItemDeleteRow );
-	
-	wxMenuItem* m_menuItemClearAll;
-	m_menuItemClearAll = new wxMenuItem( m_menu11, wxID_ANY, wxString( _("Clear all") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu11->Append( m_menuItemClearAll );
-	
-	fgSizer47->Add( m_gridFull, 0, wxALL|wxEXPAND, 5 );
-	bSizer32->Add( fgSizer47, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxFlexGridSizer* fgSizer491;
-	fgSizer491 = new wxFlexGridSizer( 0, 1, 0, 0 );
-	fgSizer491->SetFlexibleDirection( wxBOTH );
-	fgSizer491->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText1201 = new wxStaticText( this, wxID_ANY, _("Event"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1201->Wrap( -1 );
-	fgSizer491->Add( m_staticText1201, 0, wxALL, 5 );
-	
-	bSizer32->Add( fgSizer491, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline38 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer32->Add( m_staticline38, 0, wxEXPAND | wxALL, 5 );
-	
-	m_radioBtnIndividualTimer = new wxRadioButton( this, wxID_ANY, _("Individual Timer"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer32->Add( m_radioBtnIndividualTimer, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer48;
-	fgSizer48 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer48->SetFlexibleDirection( wxBOTH );
-	fgSizer48->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_gridIndividual = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridIndividual->CreateGrid( 2, 2 );
-	m_gridIndividual->EnableEditing( true );
-	m_gridIndividual->EnableGridLines( true );
-	m_gridIndividual->EnableDragGridSize( false );
-	m_gridIndividual->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridIndividual->SetColSize( 0, 51 );
-	m_gridIndividual->SetColSize( 1, 53 );
-	m_gridIndividual->EnableDragColMove( false );
-	m_gridIndividual->EnableDragColSize( true );
-	m_gridIndividual->SetColLabelSize( 30 );
-	m_gridIndividual->SetColLabelValue( 0, _("Hour") );
-	m_gridIndividual->SetColLabelValue( 1, _("Minutes") );
-	m_gridIndividual->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridIndividual->EnableDragRowSize( true );
-	m_gridIndividual->SetRowLabelSize( 1 );
-	m_gridIndividual->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridIndividual->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_TOP );
-
-	m_menu12 = new wxMenu();
-	wxMenuItem* m_menuItemDeleteRowI;
-	m_menuItemDeleteRowI = new wxMenuItem( m_menu12, wxID_ANY, wxString( _("Delete Row") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu12->Append( m_menuItemDeleteRowI );
-	
-	wxMenuItem* m_menuItemClearAllI;
-	m_menuItemClearAllI = new wxMenuItem( m_menu12, wxID_ANY, wxString( _("Clear all") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menu12->Append( m_menuItemClearAllI );
-
-	fgSizer48->Add( m_gridIndividual, 0, wxALL, 5 );
-	
-	bSizer32->Add( fgSizer48, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxFlexGridSizer* fgSizer4911;
-	fgSizer4911 = new wxFlexGridSizer( 0, 1, 0, 0 );
-	fgSizer4911->SetFlexibleDirection( wxBOTH );
-	fgSizer4911->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText12011 = new wxStaticText( this, wxID_ANY, _("Event"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText12011->Wrap( -1 );
-	fgSizer4911->Add( m_staticText12011, 0, wxALL, 5 );
-	
-	bSizer32->Add( fgSizer4911, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline39 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer32->Add( m_staticline39, 0, wxEXPAND | wxALL, 5 );
-	
-	m_sdbSizer9 = new wxStdDialogButtonSizer();
-	m_sdbSizer9OK = new wxButton( this, wxID_OK );
-	m_sdbSizer9->AddButton( m_sdbSizer9OK );
-	m_sdbSizer9Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer9->AddButton( m_sdbSizer9Cancel );
-	m_sdbSizer9->Realize();
-	bSizer32->Add( m_sdbSizer9, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer32 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	m_radioBtnNormalTimer->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonNormal ), NULL, this );
-	m_radioBtnFullHour->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonFull ), NULL, this );
-	m_spinCtrl4->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( TimerInterval::OnSpinCtrlFullh ), NULL, this );
-	m_gridFull->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeFull ), NULL, this );
-	m_radioBtnIndividualTimer->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonIndividual ), NULL, this );
-	m_gridIndividual->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeIndividual ), NULL, this );
-	m_sdbSizer9OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnButtonOKClick ), NULL, this );
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( TimerInterval::OnClose ) );
-	m_sdbSizer9Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnCancel ), NULL, this );
-	m_gridFull->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickFull ), NULL, this );
-	m_gridIndividual->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickIndividual ), NULL, this );
-	this->Connect( m_menuItemDeleteRow->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuDeleteRow ) );
-	this->Connect( m_menuItemClearAll->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuClearAll ) );
+    m_menu12 = new wxMenu();
+    wxMenuItem* m_menuItemDeleteRowI;
+    m_menuItemDeleteRowI = new wxMenuItem( m_menu12, wxID_ANY, wxString( _( "Delete Row" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu12->Append( m_menuItemDeleteRowI );
+
+    wxMenuItem* m_menuItemClearAllI;
+    m_menuItemClearAllI = new wxMenuItem( m_menu12, wxID_ANY, wxString( _( "Clear all" ) ) , wxEmptyString, wxITEM_NORMAL );
+    m_menu12->Append( m_menuItemClearAllI );
+
+    fgSizer48->Add( m_gridIndividual, 0, wxALL, 5 );
+
+    bSizer32->Add( fgSizer48, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxFlexGridSizer* fgSizer4911;
+    fgSizer4911 = new wxFlexGridSizer( 0, 1, 0, 0 );
+    fgSizer4911->SetFlexibleDirection( wxBOTH );
+    fgSizer4911->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText12011 = new wxStaticText( this, wxID_ANY, _( "Event" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText12011->Wrap( -1 );
+    fgSizer4911->Add( m_staticText12011, 0, wxALL, 5 );
+
+    bSizer32->Add( fgSizer4911, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline39 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer32->Add( m_staticline39, 0, wxEXPAND | wxALL, 5 );
+
+    m_sdbSizer9 = new wxStdDialogButtonSizer();
+    m_sdbSizer9OK = new wxButton( this, wxID_OK );
+    m_sdbSizer9->AddButton( m_sdbSizer9OK );
+    m_sdbSizer9Cancel = new wxButton( this, wxID_CANCEL );
+    m_sdbSizer9->AddButton( m_sdbSizer9Cancel );
+    m_sdbSizer9->Realize();
+    bSizer32->Add( m_sdbSizer9, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer32 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    m_radioBtnNormalTimer->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonNormal ), NULL, this );
+    m_radioBtnFullHour->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonFull ), NULL, this );
+    m_spinCtrl4->Connect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( TimerInterval::OnSpinCtrlFullh ), NULL, this );
+    m_gridFull->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeFull ), NULL, this );
+    m_radioBtnIndividualTimer->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonIndividual ), NULL, this );
+    m_gridIndividual->Connect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeIndividual ), NULL, this );
+    m_sdbSizer9OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnButtonOKClick ), NULL, this );
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( TimerInterval::OnClose ) );
+    m_sdbSizer9Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnCancel ), NULL, this );
+    m_gridFull->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickFull ), NULL, this );
+    m_gridIndividual->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickIndividual ), NULL, this );
+    this->Connect( m_menuItemDeleteRow->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuDeleteRow ) );
+    this->Connect( m_menuItemClearAll->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuClearAll ) );
 
-	init(opt,(LogbookDialog*) parent);
+    init( opt,( LogbookDialog* ) parent );
 }
 
 TimerInterval::~TimerInterval()
 {
-	// Disconnect Events
-	m_radioBtnNormalTimer->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonNormal ), NULL, this );
-	m_radioBtnFullHour->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonFull ), NULL, this );
-	m_spinCtrl4->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( TimerInterval::OnSpinCtrlFullh ), NULL, this );
-	m_gridFull->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeFull ), NULL, this );
-	m_radioBtnIndividualTimer->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonIndividual ), NULL, this );
-	m_gridIndividual->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeIndividual ), NULL, this );
-	m_sdbSizer9OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnButtonOKClick ), NULL, this );
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( TimerInterval::OnClose ) );
-	m_sdbSizer9Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnCancel ), NULL, this );
-	m_gridFull->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickFull ), NULL, this );
-	m_gridIndividual->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickIndividual ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuDeleteRow ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuClearAll ) );
+    // Disconnect Events
+    m_radioBtnNormalTimer->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonNormal ), NULL, this );
+    m_radioBtnFullHour->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonFull ), NULL, this );
+    m_spinCtrl4->Disconnect( wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler( TimerInterval::OnSpinCtrlFullh ), NULL, this );
+    m_gridFull->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeFull ), NULL, this );
+    m_radioBtnIndividualTimer->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( TimerInterval::OnRadioButtonIndividual ), NULL, this );
+    m_gridIndividual->Disconnect( wxEVT_GRID_CELL_CHANGE, wxGridEventHandler( TimerInterval::OnGridCellChangeIndividual ), NULL, this );
+    m_sdbSizer9OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnButtonOKClick ), NULL, this );
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( TimerInterval::OnClose ) );
+    m_sdbSizer9Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( TimerInterval::OnCancel ), NULL, this );
+    m_gridFull->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickFull ), NULL, this );
+    m_gridIndividual->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( TimerInterval::OnGridCellRightClickIndividual ), NULL, this );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuDeleteRow ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( TimerInterval::OnMenuClearAll ) );
 }
 
 void TimerInterval::OnGridCellRightClickFull( wxGridEvent& event )
 {
-	selGrid = m_gridFull;
-	selRow =  event.GetRow();
-	m_gridFull->PopupMenu( m_menu11, event.GetPosition() );
+    selGrid = m_gridFull;
+    selRow =  event.GetRow();
+    m_gridFull->PopupMenu( m_menu11, event.GetPosition() );
 }
 
 void TimerInterval::OnGridCellRightClickIndividual( wxGridEvent& event )
 {
-	selGrid = m_gridIndividual;
-	selRow =  event.GetRow();
-	m_gridIndividual->PopupMenu( m_menu11, event.GetPosition() );
+    selGrid = m_gridIndividual;
+    selRow =  event.GetRow();
+    m_gridIndividual->PopupMenu( m_menu11, event.GetPosition() );
 }
 
 void TimerInterval::OnMenuDeleteRow( wxCommandEvent& event )
 {
-	deleteRow();
+    deleteRow();
 }
 
 void TimerInterval::OnMenuClearAll( wxCommandEvent& event )
 {
-	clearAll();
+    clearAll();
 }
 
 void TimerInterval::deleteRow()
 {
-	selGrid->DeleteRows(selRow);
-	if(selGrid->GetNumberRows() == 0)
-		selGrid->AppendRows(1);
+    selGrid->DeleteRows( selRow );
+    if ( selGrid->GetNumberRows() == 0 )
+        selGrid->AppendRows( 1 );
 }
 
 void TimerInterval::clearAll()
 {
-	selGrid->DeleteRows(0,selGrid->GetNumberRows());
-	selGrid->AppendRows(1);
+    selGrid->DeleteRows( 0,selGrid->GetNumberRows() );
+    selGrid->AppendRows( 1 );
 }
 
 void TimerInterval::OnButtonOKClick( wxCommandEvent& event )
 {
-	opt->thour = wxString::Format(_T("%i"),m_spinCtrlH->GetValue());
-	opt->tmin  = wxString::Format(_T("%i"),m_spinCtrlM->GetValue());
-	opt->tsec  = wxString::Format(_T("%i"),m_spinCtrlS->GetValue());
-
-	opt->timerSec = (m_spinCtrlH->GetValue()  * 3600000 +
-					 m_spinCtrlM->GetValue() * 60000   +
-					 m_spinCtrlS->GetValue() * 1000);
-
-	setTimerFullArray();
-	setTimerIndividualArray();
-	saveData();
-	ok = true;
-	Close();
+    opt->thour = wxString::Format( _T( "%i" ),m_spinCtrlH->GetValue() );
+    opt->tmin  = wxString::Format( _T( "%i" ),m_spinCtrlM->GetValue() );
+    opt->tsec  = wxString::Format( _T( "%i" ),m_spinCtrlS->GetValue() );
+
+    opt->timerSec = ( m_spinCtrlH->GetValue()  * 3600000 +
+                      m_spinCtrlM->GetValue() * 60000   +
+                      m_spinCtrlS->GetValue() * 1000 );
+
+    setTimerFullArray();
+    setTimerIndividualArray();
+    saveData();
+    ok = true;
+    Close();
 }
 
 void TimerInterval::OnClose( wxCloseEvent& event )
 {
-	if(!ok)
-	{
-		opt->timerType = oldTimerType;
-		opt->thour = oldSpinH;
-		opt->tmin = oldSpinM;
-		opt->tsec = oldSpinS;
-		dialog->fullHourPlus = oldHrDelay;
-
-		TimerFull.Clear();
-		TimerIndividualH.Clear();
-		TimerIndividualM.Clear();
-		TimerIndidividualAMPM.Clear();
-
-		for(unsigned int i = 0; i < oldTimerFull.Count(); i++)
-			TimerFull.Add(oldTimerFull[i]); 
-		for(unsigned int i = 0; i < oldTimerIndividualH.Count(); i++)
-			TimerIndividualH.Add(oldTimerIndividualH[i]);
-		for(unsigned int i = 0; i < oldTimerIndividualM.Count(); i++)
-			TimerIndividualM.Add(oldTimerIndividualM[i]);
-		for(unsigned int i = 0; i < oldTimerIndidividualAMPM.Count(); i++)
-			TimerIndidividualAMPM.Add(oldTimerIndidividualAMPM[i]);
-	}
-
-	if(ok == true && (opt->timerType == 0 && !dialog->logbookPlugIn->eventsEnabled))
-	{
-		if(dialog->logbookPlugIn->m_timer->IsRunning())
-			dialog->logbookPlugIn->m_timer->Stop();
-		if(opt->timerSec > 0 && dialog->logbookPlugIn->opt->timerType == 0)
-		 	 dialog->logbookPlugIn->m_timer->Start(opt->timerSec);
-	}
-	else if(ok == true && opt->timerType != 0)
-	{
-		if(dialog->logbookPlugIn->m_timer->IsRunning())
-			dialog->logbookPlugIn->m_timer->Stop();
-	}
-
-	dialog->setTitleExt();
-	dialog->SetTitle(dialog->logbook->title + dialog->titleExt);
-	event.Skip();
+    if ( !ok )
+    {
+        opt->timerType = oldTimerType;
+        opt->thour = oldSpinH;
+        opt->tmin = oldSpinM;
+        opt->tsec = oldSpinS;
+        dialog->fullHourPlus = oldHrDelay;
+
+        TimerFull.Clear();
+        TimerIndividualH.Clear();
+        TimerIndividualM.Clear();
+        TimerIndidividualAMPM.Clear();
+
+        for ( unsigned int i = 0; i < oldTimerFull.Count(); i++ )
+            TimerFull.Add( oldTimerFull[i] );
+        for ( unsigned int i = 0; i < oldTimerIndividualH.Count(); i++ )
+            TimerIndividualH.Add( oldTimerIndividualH[i] );
+        for ( unsigned int i = 0; i < oldTimerIndividualM.Count(); i++ )
+            TimerIndividualM.Add( oldTimerIndividualM[i] );
+        for ( unsigned int i = 0; i < oldTimerIndidividualAMPM.Count(); i++ )
+            TimerIndidividualAMPM.Add( oldTimerIndidividualAMPM[i] );
+    }
+
+    if ( ok == true && ( opt->timerType == 0 && !dialog->logbookPlugIn->eventsEnabled ) )
+    {
+        if ( dialog->logbookPlugIn->m_timer->IsRunning() )
+            dialog->logbookPlugIn->m_timer->Stop();
+        if ( opt->timerSec > 0 && dialog->logbookPlugIn->opt->timerType == 0 )
+            dialog->logbookPlugIn->m_timer->Start( opt->timerSec );
+    }
+    else if ( ok == true && opt->timerType != 0 )
+    {
+        if ( dialog->logbookPlugIn->m_timer->IsRunning() )
+            dialog->logbookPlugIn->m_timer->Stop();
+    }
+
+    dialog->setTitleExt();
+    dialog->SetTitle( dialog->logbook->title + dialog->titleExt );
+    event.Skip();
 }
 
 void TimerInterval::OnCancel( wxCommandEvent& event )
 {
-	Close();
-	event.Skip();
+    Close();
+    event.Skip();
 }
 
 void TimerInterval::OnRadioButtonNormal( wxCommandEvent& event )
 {
-	opt->timerType = 0;
+    opt->timerType = 0;
 }
 
 void TimerInterval::OnRadioButtonFull( wxCommandEvent& event )
 {
-	opt->timerType = 1;
+    opt->timerType = 1;
 }
 
 void TimerInterval::OnRadioButtonIndividual( wxCommandEvent& event )
 {
-	opt->timerType = 2;
+    opt->timerType = 2;
 }
 
 void TimerInterval::OnSpinCtrlFullh( wxSpinEvent& event )
 {
-	if(m_spinCtrl4->GetValue() != oldFullHour)
-	{
-		dialog->fullHourPlus = m_spinCtrl4->GetValue();
-		dialog->fullHourModified = true;
-	}
+    if ( m_spinCtrl4->GetValue() != oldFullHour )
+    {
+        dialog->fullHourPlus = m_spinCtrl4->GetValue();
+        dialog->fullHourModified = true;
+    }
 }
 
 void TimerInterval::saveData()
 {
-	wxString fn = dialog->data+wxFileName::GetPathSeparator()+_T("Timer.txt");
+    wxString fn = dialog->data+wxFileName::GetPathSeparator()+_T( "Timer.txt" );
+
+    wxTextFile data( fn );
+    data.Create();
+
+    wxFileOutputStream dout( fn );
+    wxTextOutputStream out( dout );
 
-	wxTextFile data(fn);
-	data.Create();
+    wxString full;
+    wxString ind;
+
+    full = wxString::Format( _T( "%i," ),m_spinCtrl4->GetValue() );
+    for ( int i = 0; i < m_gridFull->GetNumberRows()-1; i++ )
+        full += m_gridFull->GetCellValue( i,0 ) + _T( "," );
+    full.RemoveLast();
+
+    out << full + _T( "\n" );
+
+    wxDateTime dt = wxDateTime::Now();
+    for ( int i = 0; i < m_gridIndividual->GetNumberRows()-1; i++ )
+    {
+        if ( opt->timeformat == 0 )
+            dt.SetHour( wxAtoi( m_gridIndividual->GetCellValue( i,0 ) ) );
+        else
+        {
+            if ( m_gridIndividual->GetCellValue( i,2 ) == _T( "PM" ) )
+            {
+                if ( wxAtoi( m_gridIndividual->GetCellValue( i,0 ) ) != 12 )
+                {
+                    dt.SetHour( wxAtoi( m_gridIndividual->GetCellValue( i,0 ) )+12 );
+                }
+                else
+                {
+                    dt.SetHour( wxAtoi( m_gridIndividual->GetCellValue( i,0 ) ) );
+                }
+            }
+            else
+            {
+                dt.SetHour( wxAtoi( m_gridIndividual->GetCellValue( i,0 ) ) );
+            }
+        }
 
-	wxFileOutputStream dout(fn);
-	wxTextOutputStream out(dout);
+        dt.SetMinute( wxAtoi( m_gridIndividual->GetCellValue( i,1 ) ) );
 
-	wxString full;
-	wxString ind;
-
-	full = wxString::Format(_T("%i,"),m_spinCtrl4->GetValue());
-	for(int i = 0; i < m_gridFull->GetNumberRows()-1; i++)
-		full += m_gridFull->GetCellValue(i,0) + _T(",");
-	full.RemoveLast();
-
-	out << full + _T("\n");
-
-	wxDateTime dt = wxDateTime::Now();
-	for(int i = 0; i < m_gridIndividual->GetNumberRows()-1; i++)
-	{
-		if(opt->timeformat == 0)
-			dt.SetHour(wxAtoi(m_gridIndividual->GetCellValue(i,0)));
-		else
-		{
-			if(m_gridIndividual->GetCellValue(i,2) == _T("PM"))
-			{
-				if(wxAtoi(m_gridIndividual->GetCellValue(i,0)) != 12)
-					{ dt.SetHour(wxAtoi(m_gridIndividual->GetCellValue(i,0))+12); }
-				else
-					{ dt.SetHour(wxAtoi(m_gridIndividual->GetCellValue(i,0))); }
-			}
-			else
-			    { dt.SetHour(wxAtoi(m_gridIndividual->GetCellValue(i,0))); }
-		}
-
-		dt.SetMinute(wxAtoi(m_gridIndividual->GetCellValue(i,1)));
-
-		ind += wxString::Format(_T("%i,%i#"),dt.GetHour(),dt.GetMinute());
-	}
-	ind.RemoveLast();
-	out << ind + _T("\n");
+        ind += wxString::Format( _T( "%i,%i#" ),dt.GetHour(),dt.GetMinute() );
+    }
+    ind.RemoveLast();
+    out << ind + _T( "\n" );
 
-	dout.Close();
+    dout.Close();
 }
 
 bool TimerInterval::loadData()
 {
-	if(TimerFull.Count() == 0 && TimerIndividualH.Count() == 0)
-		return false;
+    if ( TimerFull.Count() == 0 && TimerIndividualH.Count() == 0 )
+        return false;
+
+    m_spinCtrl4->SetValue( dialog->fullHourPlus );
+    m_gridFull->DeleteRows( 0,m_gridFull->GetNumberRows()-1 );
+    for ( unsigned int i = 0; i < TimerFull.Count(); i++ )
+    {
+        m_gridFull->AppendRows();
+        m_gridFull->SetCellValue( i,0,wxString::Format( _T( "%i" ),TimerFull[i] ) );
+    }
+
+    m_gridIndividual->DeleteRows( 0,m_gridIndividual->GetNumberRows()-1 );
+    for ( unsigned int i = 0; i < TimerIndividualH.Count(); i++ )
+    {
+        m_gridIndividual->AppendRows();
 
-	m_spinCtrl4->SetValue(dialog->fullHourPlus);
-	m_gridFull->DeleteRows(0,m_gridFull->GetNumberRows()-1);
-	for(unsigned int i = 0; i < TimerFull.Count(); i++)
-	{
-		m_gridFull->AppendRows();
-		m_gridFull->SetCellValue(i,0,wxString::Format(_T("%i"),TimerFull[i]));
-	}
-
-	m_gridIndividual->DeleteRows(0,m_gridIndividual->GetNumberRows()-1);
-	for(unsigned int i = 0; i < TimerIndividualH.Count(); i++)
-	{
-		m_gridIndividual->AppendRows();
-
-		m_gridIndividual->SetCellValue(i,0,wxString::Format(_T("%i"),TimerIndividualH[i]));
-		m_gridIndividual->SetCellValue(i,1,wxString::Format(_T("%i"),TimerIndividualM[i]));
-		if(TimerIndidividualAMPM.Count() >0)
-			m_gridIndividual->SetCellValue(i,2,TimerIndidividualAMPM[i]);
-	}
+        m_gridIndividual->SetCellValue( i,0,wxString::Format( _T( "%i" ),TimerIndividualH[i] ) );
+        m_gridIndividual->SetCellValue( i,1,wxString::Format( _T( "%i" ),TimerIndividualM[i] ) );
+        if ( TimerIndidividualAMPM.Count() >0 )
+            m_gridIndividual->SetCellValue( i,2,TimerIndidividualAMPM[i] );
+    }
 
-	return true;
+    return true;
 }
 
 
 void TimerInterval::OnGridCellChangeFull( wxGridEvent& event )
 {
-	static bool update = false;
+    static bool update = false;
+
+    int row = event.GetRow();
 
-	int row = event.GetRow();
+    if ( m_gridFull->GetCellValue( row,0 ).IsEmpty() )
+    {
+        TimerFull.RemoveAt( row );
+        if ( m_gridFull->GetNumberRows() > 2 )
+            m_gridFull->DeleteRows( row,1 );
+        Fit();
+        return;
+    }
 
-	if(m_gridFull->GetCellValue(row,0).IsEmpty())
-	{
-		TimerFull.RemoveAt(row);
-		if(m_gridFull->GetNumberRows() > 2)
-			m_gridFull->DeleteRows(row,1);
-		Fit();
-		return;
-	}
-
-	if(!update)
-	{
-		update = true;
-		appendRow(m_gridFull,row, event.GetCol());
-		bubbleSort();
-		update = false;		
-	}
+    if ( !update )
+    {
+        update = true;
+        appendRow( m_gridFull,row, event.GetCol() );
+        bubbleSort();
+        update = false;
+    }
 }
 
 void TimerInterval::OnGridCellChangeIndividual( wxGridEvent& event )
 {
-	static bool update = false;
-	int row = event.GetRow();
-	int col = event.GetCol();
-
-	setCellValue(m_gridIndividual,row, col);
-
-	if((m_gridIndividual->GetCellValue(row,0).IsEmpty() && m_gridIndividual->GetCellValue(row,1).IsEmpty()))
-	{
-		if(m_gridIndividual->GetNumberRows() > 2)
-			m_gridIndividual->DeleteRows(row);
-		TimerIndividualH.RemoveAt(row);
-		TimerIndividualM.RemoveAt(row);
-		TimerIndidividualAMPM.RemoveAt(row);
-		Fit();
-		return;
-	}
-
-	if(!update)
-	{
-		update = true;
-		appendRow(m_gridIndividual,row, col);
-		update = false;
-	}
-}
-
-
-void TimerInterval::setCellValue(wxGrid* grid, int row, int col)
-{
-	wxString s = grid->GetCellValue(row,col);
-
-	if(grid == m_gridFull || (grid == m_gridIndividual && col == 1))
-	{
-		int min = wxAtoi(s);
-		if(min < 0 || min > 59)
-		{
-			min = 0;
-			grid->SetCellValue(row,col,_T(""));
-			return;
-		}
-	}
-	else
-	{
-		int hr = wxAtoi(s);
-		if((opt->timeformat == 0 && (hr < 0 || hr > 23))) 
-		{
-			hr = 0;
-			grid->SetCellValue(row,col,_T(""));
-			return;
-		}
-
-		if(opt->timeformat == 1)
-		{
-			if(hr > 12)
-			{
-				m_gridIndividual->SetCellValue(row,col,wxString::Format(_T("%i"),hr-12));
-				m_gridIndividual->SetCellValue(row,2,_("PM"));
-			}
-			else
-			{
-				if(hr == 12)
-					m_gridIndividual->SetCellValue(row,2,_("PM"));
-				else
-					m_gridIndividual->SetCellValue(row,2,_("AM"));
-			}
-		}
-	}
+    static bool update = false;
+    int row = event.GetRow();
+    int col = event.GetCol();
+
+    setCellValue( m_gridIndividual,row, col );
+
+    if ( ( m_gridIndividual->GetCellValue( row,0 ).IsEmpty() && m_gridIndividual->GetCellValue( row,1 ).IsEmpty() ) )
+    {
+        if ( m_gridIndividual->GetNumberRows() > 2 )
+            m_gridIndividual->DeleteRows( row );
+        TimerIndividualH.RemoveAt( row );
+        TimerIndividualM.RemoveAt( row );
+        TimerIndidividualAMPM.RemoveAt( row );
+        Fit();
+        return;
+    }
+
+    if ( !update )
+    {
+        update = true;
+        appendRow( m_gridIndividual,row, col );
+        update = false;
+    }
+}
+
+
+void TimerInterval::setCellValue( wxGrid* grid, int row, int col )
+{
+    wxString s = grid->GetCellValue( row,col );
+
+    if ( grid == m_gridFull || ( grid == m_gridIndividual && col == 1 ) )
+    {
+        int min = wxAtoi( s );
+        if ( min < 0 || min > 59 )
+        {
+            min = 0;
+            grid->SetCellValue( row,col,_T( "" ) );
+            return;
+        }
+    }
+    else
+    {
+        int hr = wxAtoi( s );
+        if ( ( opt->timeformat == 0 && ( hr < 0 || hr > 23 ) ) )
+        {
+            hr = 0;
+            grid->SetCellValue( row,col,_T( "" ) );
+            return;
+        }
+
+        if ( opt->timeformat == 1 )
+        {
+            if ( hr > 12 )
+            {
+                m_gridIndividual->SetCellValue( row,col,wxString::Format( _T( "%i" ),hr-12 ) );
+                m_gridIndividual->SetCellValue( row,2,_( "PM" ) );
+            }
+            else
+            {
+                if ( hr == 12 )
+                    m_gridIndividual->SetCellValue( row,2,_( "PM" ) );
+                else
+                    m_gridIndividual->SetCellValue( row,2,_( "AM" ) );
+            }
+        }
+    }
 }
 
-void TimerInterval::appendRow(wxGrid* grid, int row, int col)
+void TimerInterval::appendRow( wxGrid* grid, int row, int col )
 {
-	if(row == grid->GetNumberRows()-1)
-		grid->AppendRows(); 
+    if ( row == grid->GetNumberRows()-1 )
+        grid->AppendRows();
 
-	Fit();
+    Fit();
 }
 
 void TimerInterval::setTimerFullArray()
 {
-	TimerFull.clear();
+    TimerFull.clear();
 
-	for(int i = 0; i < m_gridFull->GetNumberRows()-1; i++)
-		TimerFull.Add(wxAtoi(m_gridFull->GetCellValue(i,0)));
+    for ( int i = 0; i < m_gridFull->GetNumberRows()-1; i++ )
+        TimerFull.Add( wxAtoi( m_gridFull->GetCellValue( i,0 ) ) );
 }
 
 void TimerInterval::setTimerIndividualArray()
 {
-	TimerIndividualH.clear();
-	TimerIndividualM.clear();
-	TimerIndidividualAMPM.clear();
-
-	for(int i = 0; i < m_gridIndividual->GetNumberRows()-1; i++)
-	{
-		TimerIndividualH.Add(wxAtoi(m_gridIndividual->GetCellValue(i,0)));
-		TimerIndividualM.Add(wxAtoi(m_gridIndividual->GetCellValue(i,1)));
-		TimerIndidividualAMPM.Add(m_gridIndividual->GetCellValue(i,2));
-	}
+    TimerIndividualH.clear();
+    TimerIndividualM.clear();
+    TimerIndidividualAMPM.clear();
+
+    for ( int i = 0; i < m_gridIndividual->GetNumberRows()-1; i++ )
+    {
+        TimerIndividualH.Add( wxAtoi( m_gridIndividual->GetCellValue( i,0 ) ) );
+        TimerIndividualM.Add( wxAtoi( m_gridIndividual->GetCellValue( i,1 ) ) );
+        TimerIndidividualAMPM.Add( m_gridIndividual->GetCellValue( i,2 ) );
+    }
 }
 
 void TimerInterval::bubbleSort()
 {
-	bool sort;
+    bool sort;
+
+    if ( m_gridFull->GetNumberRows()-1 == 1 ) return;
+
+    do
+    {
+        sort = false;
+        for ( int i = 0; i < m_gridFull->GetNumberRows()-2; i++ )
+        {
+            wxString as = m_gridFull->GetCellValue( i,0 );
+            wxString bs = m_gridFull->GetCellValue( i+1,0 );
+            int a = wxAtoi( as );
+            int b = wxAtoi( bs );
+            if ( b < a )
+            {
+                sort = true;
+                m_gridFull->SetCellValue( i,0,bs );
+                m_gridFull->SetCellValue( i+1,0,as );
+            }
+
+        }
+    }
+    while ( sort );
+}
+
+void TimerInterval::init( Options* opt, LogbookDialog* dialog )
+{
+    ok = false;
+    this->opt = opt;
+    this->dialog = dialog;
+    timerruns = false;
+    dialog->fullHourModified = true;
+    oldSpinH = opt->thour;
+    oldSpinM = opt->tmin;
+    oldSpinS = opt->tsec;
+    oldHrDelay = dialog->fullHourPlus;
+
+    for ( unsigned int i = 0; i < TimerFull.Count(); i++ )
+        oldTimerFull.Add( TimerFull[i] );
+    for ( unsigned int i = 0; i < TimerIndividualH.Count(); i++ )
+        oldTimerIndividualH.Add( TimerIndividualH[i] );
+    for ( unsigned int i = 0; i < TimerIndividualM.Count(); i++ )
+        oldTimerIndividualM.Add( TimerIndividualM[i] );
+    for ( unsigned int i = 0; i < TimerIndidividualAMPM.Count(); i++ )
+        oldTimerIndidividualAMPM.Add( TimerIndidividualAMPM[i] );
+
+
+
+    opt->tsec = _T( "0" );
+    m_spinCtrlS->Hide();
+    m_staticTextS->Hide();
+    m_staticText120->Hide();
+    m_staticText1201->Hide();
+    m_staticText12011->Hide();
+
+    switch ( opt->timerType )
+    {
+    case 0:
+        m_radioBtnNormalTimer->SetValue( true );
+        break;
+    case 1:
+        m_radioBtnFullHour->SetValue( true );
+        break;
+    case 2:
+        m_radioBtnIndividualTimer->SetValue( true );
+        break;
+    }
+    oldTimerType = opt->timerType;
 
-	if(m_gridFull->GetNumberRows()-1 == 1) return;
+    m_gridIndividual->InsertCols( 2 );
+    m_gridIndividual->SetColLabelValue( 2,_( "AM/PM" ) );
+    m_gridIndividual->SetColumnWidth( 2,60 );
 
-	do
-	{
-		sort = false;
-		for(int i = 0; i < m_gridFull->GetNumberRows()-2; i++)
-		{
-			wxString as = m_gridFull->GetCellValue(i,0);
-			wxString bs = m_gridFull->GetCellValue(i+1,0);
-			int a = wxAtoi(as);
-			int b = wxAtoi(bs);
-			if(b < a)
-			{
-				sort = true;
-				m_gridFull->SetCellValue(i,0,bs);
-				m_gridFull->SetCellValue(i+1,0,as);
-			}
-
-		}
-	}while(sort);
-}
-
-void TimerInterval::init(Options* opt, LogbookDialog* dialog)
-{
-	ok = false;
-	this->opt = opt;
-	this->dialog = dialog;
-	timerruns = false;
-	dialog->fullHourModified = true;
-	oldSpinH = opt->thour;
-	oldSpinM = opt->tmin;
-	oldSpinS = opt->tsec;
-	oldHrDelay = dialog->fullHourPlus;
-
-	for(unsigned int i = 0; i < TimerFull.Count(); i++)
-		oldTimerFull.Add(TimerFull[i]); 
-	for(unsigned int i = 0; i < TimerIndividualH.Count(); i++)
-		oldTimerIndividualH.Add(TimerIndividualH[i]);
-	for(unsigned int i = 0; i < TimerIndividualM.Count(); i++)
-		oldTimerIndividualM.Add(TimerIndividualM[i]);
-	for(unsigned int i = 0; i < TimerIndidividualAMPM.Count(); i++)
-		oldTimerIndidividualAMPM.Add(TimerIndidividualAMPM[i]);
-
-
-
-	opt->tsec = _T("0");
-	m_spinCtrlS->Hide();
-	m_staticTextS->Hide();
-	m_staticText120->Hide();
-	m_staticText1201->Hide();
-	m_staticText12011->Hide();
-
-	switch(opt->timerType)
-	{
-	case 0: m_radioBtnNormalTimer->SetValue(true); break;
-	case 1: m_radioBtnFullHour->SetValue(true); break;
-	case 2: m_radioBtnIndividualTimer->SetValue(true); break;
-	}
-	oldTimerType = opt->timerType;
-
-	m_gridIndividual->InsertCols(2);
-	m_gridIndividual->SetColLabelValue(2,_("AM/PM"));
-	m_gridIndividual->SetColumnWidth(2,60);
-
-	if(opt->timeformat == 0)
-	{
-		m_gridIndividual->SetColMinimalAcceptableWidth(0);
-		m_gridIndividual->SetColumnWidth(2,0);
-	}
-
-	if(!loadData())
-	{
-		m_gridFull->SetCellValue(0,0,_T("00"));
-		m_gridIndividual->SetCellValue(0,0,_T("00"));
-		m_gridIndividual->SetCellValue(0,1,_T("00"));
-	}
-
-	opt->tsec = _T("0");
-	m_spinCtrlH->SetValue(opt->thour);
-	m_spinCtrlM->SetValue(opt->tmin);
-	m_spinCtrlS->SetValue(opt->tsec);
+    if ( opt->timeformat == 0 )
+    {
+        m_gridIndividual->SetColMinimalAcceptableWidth( 0 );
+        m_gridIndividual->SetColumnWidth( 2,0 );
+    }
+
+    if ( !loadData() )
+    {
+        m_gridFull->SetCellValue( 0,0,_T( "00" ) );
+        m_gridIndividual->SetCellValue( 0,0,_T( "00" ) );
+        m_gridIndividual->SetCellValue( 0,1,_T( "00" ) );
+    }
+
+    opt->tsec = _T( "0" );
+    m_spinCtrlH->SetValue( opt->thour );
+    m_spinCtrlM->SetValue( opt->tmin );
+    m_spinCtrlS->SetValue( opt->tsec );
 
-	Fit();
+    Fit();
 }
 
 //////////////// Dialog PositionDlg ////////////////
 PositionDlg::PositionDlg( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer35;
-	bSizer35 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer34;
-	bSizer34 = new wxBoxSizer( wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer44;
-	fgSizer44 = new wxFlexGridSizer( 0, 9, 0, 0 );
-	fgSizer44->SetFlexibleDirection( wxBOTH );
-	fgSizer44->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_textCtrlDeg1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 30,-1 ), 0 );
-	fgSizer44->Add( m_textCtrlDeg1, 0, wxALL, 5 );
-	
-	m_staticTextDeg1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeg1->Wrap( -1 );
-	fgSizer44->Add( m_staticTextDeg1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlmin1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	fgSizer44->Add( m_textCtrlmin1, 0, wxALL, 5 );
-	
-	m_staticTextmin1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextmin1->Wrap( -1 );
-	fgSizer44->Add( m_staticTextmin1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlsec1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	fgSizer44->Add( m_textCtrlsec1, 0, wxALL, 5 );
-	
-	m_staticTextsec1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextsec1->Wrap( -1 );
-	fgSizer44->Add( m_staticTextsec1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlNS = new wxTextCtrl( this, wxID_ANY, wxT("N"), wxDefaultPosition, wxSize( 25,-1 ), 0 );
-	fgSizer44->Add( m_textCtrlNS, 0, wxALL, 5 );
-	
-	bSizer34->Add( fgSizer44, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
-	
-	fgSizer441 = new wxFlexGridSizer( 0, 9, 0, 0 );
-	fgSizer441->SetFlexibleDirection( wxBOTH );
-	fgSizer441->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_textCtrlDeg2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 30,-1 ), 0 );
-	fgSizer441->Add( m_textCtrlDeg2, 0, wxALL, 5 );
-	
-	m_staticTextDeg2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeg2->Wrap( -1 );
-	fgSizer441->Add( m_staticTextDeg2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlmin2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	fgSizer441->Add( m_textCtrlmin2, 0, wxALL, 5 );
-	
-	m_staticTextmin2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextmin2->Wrap( -1 );
-	fgSizer441->Add( m_staticTextmin2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlsec2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	fgSizer441->Add( m_textCtrlsec2, 0, wxALL, 5 );
-	
-	m_staticTextsec2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextsec2->Wrap( -1 );
-	fgSizer441->Add( m_staticTextsec2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlWE = new wxTextCtrl( this, wxID_ANY, wxT("W"), wxDefaultPosition, wxSize( 25,-1 ), 0 );
-	fgSizer441->Add( m_textCtrlWE, 0, wxALL, 5 );
-	
-	bSizer34->Add( fgSizer441, 0, wxALIGN_RIGHT, 5 );
-	
-	bSizer35->Add( bSizer34, 1, wxEXPAND, 5 );
-	
-	wxArrayString m_choiceFormatChoices;
-	m_choiceFormat = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceFormatChoices, 0 );
-	m_choiceFormat->SetSelection( 0 );
-	bSizer35->Add( m_choiceFormat, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_sdbSizer10 = new wxStdDialogButtonSizer();
-	m_sdbSizer10OK = new wxButton( this, wxID_OK );
-	m_sdbSizer10->AddButton( m_sdbSizer10OK );
-	m_sdbSizer10Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer10->AddButton( m_sdbSizer10Cancel );
-	m_sdbSizer10->Realize();
-	bSizer35->Add( m_sdbSizer10, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer35 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	m_sdbSizer10Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnCancelButtonClick ), NULL, this );
-	m_sdbSizer10OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnOKButtonClick ), NULL, this );
-	m_choiceFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PositionDlg::OnChoice ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer35;
+    bSizer35 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer34;
+    bSizer34 = new wxBoxSizer( wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer44;
+    fgSizer44 = new wxFlexGridSizer( 0, 9, 0, 0 );
+    fgSizer44->SetFlexibleDirection( wxBOTH );
+    fgSizer44->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_textCtrlDeg1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 30,-1 ), 0 );
+    fgSizer44->Add( m_textCtrlDeg1, 0, wxALL, 5 );
+
+    m_staticTextDeg1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeg1->Wrap( -1 );
+    fgSizer44->Add( m_staticTextDeg1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlmin1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    fgSizer44->Add( m_textCtrlmin1, 0, wxALL, 5 );
+
+    m_staticTextmin1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextmin1->Wrap( -1 );
+    fgSizer44->Add( m_staticTextmin1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlsec1 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    fgSizer44->Add( m_textCtrlsec1, 0, wxALL, 5 );
+
+    m_staticTextsec1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextsec1->Wrap( -1 );
+    fgSizer44->Add( m_staticTextsec1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlNS = new wxTextCtrl( this, wxID_ANY, wxT( "N" ), wxDefaultPosition, wxSize( 25,-1 ), 0 );
+    fgSizer44->Add( m_textCtrlNS, 0, wxALL, 5 );
 
+    bSizer34->Add( fgSizer44, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
-	init((LogbookDialog*)parent);
+    fgSizer441 = new wxFlexGridSizer( 0, 9, 0, 0 );
+    fgSizer441->SetFlexibleDirection( wxBOTH );
+    fgSizer441->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_textCtrlDeg2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 30,-1 ), 0 );
+    fgSizer441->Add( m_textCtrlDeg2, 0, wxALL, 5 );
+
+    m_staticTextDeg2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeg2->Wrap( -1 );
+    fgSizer441->Add( m_staticTextDeg2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlmin2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    fgSizer441->Add( m_textCtrlmin2, 0, wxALL, 5 );
+
+    m_staticTextmin2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextmin2->Wrap( -1 );
+    fgSizer441->Add( m_staticTextmin2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlsec2 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    fgSizer441->Add( m_textCtrlsec2, 0, wxALL, 5 );
+
+    m_staticTextsec2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextsec2->Wrap( -1 );
+    fgSizer441->Add( m_staticTextsec2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlWE = new wxTextCtrl( this, wxID_ANY, wxT( "W" ), wxDefaultPosition, wxSize( 25,-1 ), 0 );
+    fgSizer441->Add( m_textCtrlWE, 0, wxALL, 5 );
+
+    bSizer34->Add( fgSizer441, 0, wxALIGN_RIGHT, 5 );
+
+    bSizer35->Add( bSizer34, 1, wxEXPAND, 5 );
+
+    wxArrayString m_choiceFormatChoices;
+    m_choiceFormat = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceFormatChoices, 0 );
+    m_choiceFormat->SetSelection( 0 );
+    bSizer35->Add( m_choiceFormat, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_sdbSizer10 = new wxStdDialogButtonSizer();
+    m_sdbSizer10OK = new wxButton( this, wxID_OK );
+    m_sdbSizer10->AddButton( m_sdbSizer10OK );
+    m_sdbSizer10Cancel = new wxButton( this, wxID_CANCEL );
+    m_sdbSizer10->AddButton( m_sdbSizer10Cancel );
+    m_sdbSizer10->Realize();
+    bSizer35->Add( m_sdbSizer10, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer35 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    m_sdbSizer10Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnCancelButtonClick ), NULL, this );
+    m_sdbSizer10OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnOKButtonClick ), NULL, this );
+    m_choiceFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PositionDlg::OnChoice ), NULL, this );
+
+
+    init( ( LogbookDialog* )parent );
 }
 
 PositionDlg::~PositionDlg()
 {
-	m_choiceFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PositionDlg::OnChoice ), NULL, this );
-	m_sdbSizer10Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnCancelButtonClick ), NULL, this );
-	m_sdbSizer10OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnOKButtonClick ), NULL, this );
-}
-
-void PositionDlg::init(LogbookDialog* dlg)
-{
-	this->dlg = dlg;
-	Options* opt = dlg->logbookPlugIn->opt;
-
-	m_staticTextDeg1->SetLabel(opt->Deg);
-	m_staticTextDeg2->SetLabel(opt->Deg);
-	m_staticTextmin1->SetLabel(opt->Min);
-	m_staticTextmin2->SetLabel(opt->Min);
-	m_staticTextsec1->SetLabel(opt->Sec);
-	m_staticTextsec2->SetLabel(opt->Sec);
-
-	m_choiceFormat->Append(wxT("054\xB0 12.1234'"));
-	m_choiceFormat->Append(wxT("054\xB0 12' 12.34\""));
-	m_choiceFormat->Select(opt->traditional);
-	oldSel = m_choiceFormat->GetSelection();
-
-	wxString tmp = dlg->m_gridGlobal->GetCellValue(dlg->selGridRow,LogbookHTML::POSITION);
-	if(tmp.IsEmpty() && dlg->selGridRow != 0)
-		tmp = dlg->m_gridGlobal->GetCellValue(dlg->selGridRow-1,LogbookHTML::POSITION);
-
-	if(tmp.Contains(_T("\"")))
-	{
-		m_textCtrlDeg1->SetValue(tmp.substr(0,3));
-		m_textCtrlmin1->SetValue(tmp.substr(5,2));
-		m_textCtrlsec1->SetValue(tmp.substr(9,5));
-		m_textCtrlNS->  SetValue(tmp.substr(16,1));
-		m_textCtrlDeg2->SetValue(tmp.substr(18,3));
-		m_textCtrlmin2->SetValue(tmp.substr(23,2));
-		m_textCtrlsec2->SetValue(tmp.substr(27,5));
-		m_textCtrlWE->SetLabel(tmp.substr(34,1));
-
-		if(!opt->traditional)
-			   setFormat(1);
-	}
-	else if(!tmp.IsEmpty())
-	{
-		m_textCtrlDeg1->SetValue(tmp.substr(0,3));
-		m_textCtrlmin1->SetValue(tmp.substr(5,7));
-		m_textCtrlNS->  SetValue(tmp.substr(14,1));
-		m_textCtrlDeg2->SetValue(tmp.substr(16,3));
-		m_textCtrlmin2->SetValue(tmp.substr(21,7));
-		m_textCtrlWE->SetLabel(tmp.substr(30,1));
-
-		if(opt->traditional)
-			   setFormat(0);
-	}
-
-	if(!opt->traditional)
-	{
-		m_textCtrlsec1->Enable(false);
-		m_textCtrlsec2->Enable(false);
-	}
+    m_choiceFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( PositionDlg::OnChoice ), NULL, this );
+    m_sdbSizer10Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnCancelButtonClick ), NULL, this );
+    m_sdbSizer10OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PositionDlg::OnOKButtonClick ), NULL, this );
+}
+
+void PositionDlg::init( LogbookDialog* dlg )
+{
+    this->dlg = dlg;
+    Options* opt = dlg->logbookPlugIn->opt;
+
+    m_staticTextDeg1->SetLabel( opt->Deg );
+    m_staticTextDeg2->SetLabel( opt->Deg );
+    m_staticTextmin1->SetLabel( opt->Min );
+    m_staticTextmin2->SetLabel( opt->Min );
+    m_staticTextsec1->SetLabel( opt->Sec );
+    m_staticTextsec2->SetLabel( opt->Sec );
+
+    m_choiceFormat->Append( wxT( "054\xB0 12.1234'" ) );
+    m_choiceFormat->Append( wxT( "054\xB0 12' 12.34\"" ) );
+    m_choiceFormat->Select( opt->traditional );
+    oldSel = m_choiceFormat->GetSelection();
+
+    wxString tmp = dlg->m_gridGlobal->GetCellValue( dlg->selGridRow,LogbookHTML::POSITION );
+    if ( tmp.IsEmpty() && dlg->selGridRow != 0 )
+        tmp = dlg->m_gridGlobal->GetCellValue( dlg->selGridRow-1,LogbookHTML::POSITION );
+
+    if ( tmp.Contains( _T( "\"" ) ) )
+    {
+        m_textCtrlDeg1->SetValue( tmp.substr( 0,3 ) );
+        m_textCtrlmin1->SetValue( tmp.substr( 5,2 ) );
+        m_textCtrlsec1->SetValue( tmp.substr( 9,5 ) );
+        m_textCtrlNS->  SetValue( tmp.substr( 16,1 ) );
+        m_textCtrlDeg2->SetValue( tmp.substr( 18,3 ) );
+        m_textCtrlmin2->SetValue( tmp.substr( 23,2 ) );
+        m_textCtrlsec2->SetValue( tmp.substr( 27,5 ) );
+        m_textCtrlWE->SetLabel( tmp.substr( 34,1 ) );
+
+        if ( !opt->traditional )
+            setFormat( 1 );
+    }
+    else if ( !tmp.IsEmpty() )
+    {
+        m_textCtrlDeg1->SetValue( tmp.substr( 0,3 ) );
+        m_textCtrlmin1->SetValue( tmp.substr( 5,7 ) );
+        m_textCtrlNS->  SetValue( tmp.substr( 14,1 ) );
+        m_textCtrlDeg2->SetValue( tmp.substr( 16,3 ) );
+        m_textCtrlmin2->SetValue( tmp.substr( 21,7 ) );
+        m_textCtrlWE->SetLabel( tmp.substr( 30,1 ) );
+
+        if ( opt->traditional )
+            setFormat( 0 );
+    }
+
+    if ( !opt->traditional )
+    {
+        m_textCtrlsec1->Enable( false );
+        m_textCtrlsec2->Enable( false );
+    }
 
-	this->Fit();
+    this->Fit();
 }
 
 void PositionDlg::OnChoice( wxCommandEvent& event )
 {
-	if(event.GetSelection() == oldSel)
-		return;
+    if ( event.GetSelection() == oldSel )
+        return;
+
+    if ( event.GetSelection() == 1 )
+    {
+        m_textCtrlsec1->Enable( true );
+        m_textCtrlsec2->Enable( true );
+        setFormat( 0 );
+    }
+    else
+    {
+        setFormat( 1 );
+        m_textCtrlsec1->Enable( false );
+        m_textCtrlsec2->Enable( false );
+    }
+    oldSel = event.GetSelection();
+}
+
+void PositionDlg::setFormat( int fmt )
+{
+    if ( fmt )
+    {
+        double min1,sec1,min2,sec2;
+        min1 = wxAtof( replaceComma( m_textCtrlmin1->GetValue() ) );
+        min2 = wxAtof( replaceComma( m_textCtrlmin2->GetValue() ) );
+
+        sec1 = wxAtof( replaceComma( m_textCtrlsec1->GetValue() ) )/60;
+        sec2 = wxAtof( replaceComma( m_textCtrlsec2->GetValue() ) )/60;
+
+        min1 += sec1;
+        min2 += sec2;
+
+        m_textCtrlmin1->SetValue( wxString::Format( _T( "%07.4f" ),min1 ) );
+        m_textCtrlmin2->SetValue( wxString::Format( _T( "%07.4f" ),min2 ) );
+        m_textCtrlsec1->Clear();
+        m_textCtrlsec2->Clear();
+    }
+    else
+    {
+        double min1,sec1,min2,sec2;
+        min1 = wxAtoi( m_textCtrlmin1->GetValue() );
+        min2 = wxAtoi( m_textCtrlmin2->GetValue() );
+
+        if ( m_choiceFormat->GetSelection() == 1 )
+        {
+            sec1 = ( wxAtof( replaceComma( m_textCtrlmin1->GetValue() ) )-( int )min1 )*60;
+            sec2 = ( wxAtof( replaceComma( m_textCtrlmin2->GetValue() ) )-( int )min2 )*60;
+        }
+        else
+        {
+            sec1 = wxAtof( replaceComma( m_textCtrlsec1->GetValue() ) );
+            sec2 = wxAtof( replaceComma( m_textCtrlsec2->GetValue() ) );
+        }
+
+        m_textCtrlmin1->SetValue( wxString::Format( _T( "%02.0f" ),min1 ) );
+        m_textCtrlmin2->SetValue( wxString::Format( _T( "%02.0f" ),min2 ) );
+        m_textCtrlsec1->SetValue( wxString::Format( _T( "%06.3f" ),sec1 ) );
+        m_textCtrlsec2->SetValue( wxString::Format( _T( "%06.3f" ),sec2 ) );
+    }
+}
 
-	if(event.GetSelection() == 1)
-	{
-			m_textCtrlsec1->Enable(true);
-			m_textCtrlsec2->Enable(true);
-			setFormat(0);
-	}
-	else
-	{
-			setFormat(1);
-			m_textCtrlsec1->Enable(false);
-			m_textCtrlsec2->Enable(false);
-	}
-	oldSel = event.GetSelection();
-}
-
-void PositionDlg::setFormat(int fmt)
-{
-	if(fmt)
-	{
-		double min1,sec1,min2,sec2;
-		min1 = wxAtof(replaceComma(m_textCtrlmin1->GetValue()));
-		min2 = wxAtof(replaceComma(m_textCtrlmin2->GetValue()));
-
-		sec1 = wxAtof(replaceComma(m_textCtrlsec1->GetValue()))/60;
-		sec2 = wxAtof(replaceComma(m_textCtrlsec2->GetValue()))/60;
-
-		min1 += sec1;
-		min2 += sec2;
-
-		m_textCtrlmin1->SetValue(wxString::Format(_T("%07.4f"),min1));
-		m_textCtrlmin2->SetValue(wxString::Format(_T("%07.4f"),min2));
-		m_textCtrlsec1->Clear();
-		m_textCtrlsec2->Clear();
-	}
-	else
-	{
-		double min1,sec1,min2,sec2;
-		min1 = wxAtoi(m_textCtrlmin1->GetValue());
-		min2 = wxAtoi(m_textCtrlmin2->GetValue());
-
-		if(m_choiceFormat->GetSelection() == 1)
-		{
-			sec1 = (wxAtof(replaceComma(m_textCtrlmin1->GetValue()))-(int)min1)*60;
-			sec2 = (wxAtof(replaceComma(m_textCtrlmin2->GetValue()))-(int)min2)*60;
-		}
-		else
-		{
-			sec1 = wxAtof(replaceComma(m_textCtrlsec1->GetValue()));
-			sec2 = wxAtof(replaceComma(m_textCtrlsec2->GetValue()));
-		}
-
-		m_textCtrlmin1->SetValue(wxString::Format(_T("%02.0f"),min1));
-		m_textCtrlmin2->SetValue(wxString::Format(_T("%02.0f"),min2));
-		m_textCtrlsec1->SetValue(wxString::Format(_T("%06.3f"),sec1));
-		m_textCtrlsec2->SetValue(wxString::Format(_T("%06.3f"),sec2));
-	}
-}
-
-wxString PositionDlg::replaceComma(wxString s)
-{
-	wxString tmp = s;
-	tmp.Replace(_T(","),_T("."));
-	return tmp;
+wxString PositionDlg::replaceComma( wxString s )
+{
+    wxString tmp = s;
+    tmp.Replace( _T( "," ),_T( "." ) );
+    return tmp;
 }
 
 void PositionDlg::OnOKButtonClick( wxCommandEvent& event )
 {
-	Options* opt = dlg->logbookPlugIn->opt;
-	double degf1, degf2,min1,sec1,min2,sec2;
+    Options* opt = dlg->logbookPlugIn->opt;
+    double degf1, degf2,min1,sec1,min2,sec2;
+
+    wxString min1str;
+    wxString min2str;
+    wxString sec1str;
+    wxString sec2str;
+
+    this->m_textCtrlsec1->Enable( true );
+    this->m_textCtrlsec2->Enable( true );
+
+    degf1 = wxAtof( m_textCtrlDeg1->GetValue() );
+    degf2 = wxAtof( m_textCtrlDeg2->GetValue() );
+    wxString deg1    = wxString::Format( _T( "%03.0f" ),wxAtof( m_textCtrlDeg1->GetValue() ) );
+    wxString deg2    = wxString::Format( _T( "%03.0f" ),wxAtof( m_textCtrlDeg2->GetValue() ) );
+    min1 = wxAtof( replaceComma( m_textCtrlmin1->GetValue() ) );
+    min2 = wxAtof( replaceComma( m_textCtrlmin2->GetValue() ) );
+
+    if ( opt->traditional )
+    {
+        if ( this->m_choiceFormat->GetSelection() == 0 )
+        {
+            min1 = ( int ) min1;
+            min2 = ( int ) min2;
+            sec1 = ( wxAtof( replaceComma( m_textCtrlmin1->GetValue() ) )-min1 )*60;
+            sec2 = ( wxAtof( replaceComma( m_textCtrlmin2->GetValue() ) )-min2 )*60;
+        }
+        else
+        {
+            sec1 = wxAtof( replaceComma( m_textCtrlsec1->GetValue() ) );
+            sec2 = wxAtof( replaceComma( m_textCtrlsec2->GetValue() ) );
+        }
+
+        min1str = wxString::Format( _T( "%02.0f" ),min1 );
+        min2str = wxString::Format( _T( "%02.0f" ),min2 );
+        sec1str = wxString::Format( _T( "%05.2f" ),sec1 );
+        sec2str = wxString::Format( _T( "%05.2f" ),sec2 );
+
+        retstr = deg1+min1str+sec1str+m_textCtrlNS->GetValue().Lower()+deg2+min2str+sec2str+m_textCtrlWE->GetValue().Lower();
+    }
+    else
+    {
+        sec1 = wxAtof( replaceComma( m_textCtrlsec1->GetValue() ) )/60;
+        sec2 = wxAtof( replaceComma( m_textCtrlsec2->GetValue() ) )/60;
 
-	wxString min1str;
-	wxString min2str;
-	wxString sec1str;
-	wxString sec2str;
-
-	this->m_textCtrlsec1->Enable(true);
-	this->m_textCtrlsec2->Enable(true);
-
-	degf1 = wxAtof(m_textCtrlDeg1->GetValue());
-	degf2 = wxAtof(m_textCtrlDeg2->GetValue());
-	wxString deg1    = wxString::Format(_T("%03.0f"),wxAtof(m_textCtrlDeg1->GetValue()));
-	wxString deg2    = wxString::Format(_T("%03.0f"),wxAtof(m_textCtrlDeg2->GetValue()));
-	min1 = wxAtof(replaceComma(m_textCtrlmin1->GetValue()));
-	min2 = wxAtof(replaceComma(m_textCtrlmin2->GetValue()));
-
-	if(opt->traditional)
-	{
-		if(this->m_choiceFormat->GetSelection() == 0)
-		{
-			min1 = (int) min1;
-			min2 = (int) min2;
-			sec1 = (wxAtof(replaceComma(m_textCtrlmin1->GetValue()))-min1)*60;
-			sec2 = (wxAtof(replaceComma(m_textCtrlmin2->GetValue()))-min2)*60;
-		}
-		else
-		{
-			sec1 = wxAtof(replaceComma(m_textCtrlsec1->GetValue()));
-			sec2 = wxAtof(replaceComma(m_textCtrlsec2->GetValue()));
-		}
-
-		min1str = wxString::Format(_T("%02.0f"),min1);
-		min2str = wxString::Format(_T("%02.0f"),min2);
-		sec1str = wxString::Format(_T("%05.2f"),sec1);
-		sec2str = wxString::Format(_T("%05.2f"),sec2);
-
-		retstr = deg1+min1str+sec1str+m_textCtrlNS->GetValue().Lower()+deg2+min2str+sec2str+m_textCtrlWE->GetValue().Lower();
-	}
-	else
-	{
-		sec1 = wxAtof(replaceComma(m_textCtrlsec1->GetValue()))/60;
-		sec2 = wxAtof(replaceComma(m_textCtrlsec2->GetValue()))/60;
-
-		min1 += sec1;
-		min2 += sec2;
-
-		min1str = wxString::Format(_T("%07.4f"),min1);
-		min2str = wxString::Format(_T("%07.4f"),min2);
-
-		retstr = deg1+min1str+m_textCtrlNS->GetValue().Lower()+deg2+min2str+m_textCtrlWE->GetValue().Lower();
-	}
-
-	wxString NS = m_textCtrlNS->GetValue().Upper();
-	wxString WE = m_textCtrlWE->GetValue().Upper();
-
-	if(degf1 < 0.0  || degf1 > 359.0)
-	{
-		m_textCtrlDeg1->SetFocus();
-		m_textCtrlDeg1->SetSelection(-1,-1);
-	}
-	else if(degf2 < 0.0 || degf2 > 359.0)
-	{
-		m_textCtrlDeg2->SetFocus();
-		m_textCtrlDeg2->SetSelection(-1,-1);
-	}
-	else if(min1 < 0.0 || min1 > 59.9999)
-	{
-		m_textCtrlmin1->SetFocus();
-		m_textCtrlmin1->SetSelection(-1,-1);
-	}
-	else if(min2 < 0.0 || min2 > 59.9999)
-	{
-		m_textCtrlmin2->SetFocus();
-		m_textCtrlmin2->SetSelection(-1,-1);
-	}
-	else if(sec1< 0.0 || sec1 > 59.9999)
-	{
-		m_textCtrlsec1->SetFocus();
-		m_textCtrlsec1->SetSelection(-1,-1);
-	}
-	else if(sec2 < 0.0 || sec2 > 59.9999)
-	{
-		m_textCtrlsec2->SetFocus();
-		m_textCtrlsec2->SetSelection(-1,-1);
-	}
-	else if(NS != _T("N") && NS != _T("S"))
-	{
-		m_textCtrlNS->SetFocus();
-		m_textCtrlNS->SetSelection(-1,-1);
-	}
-	else if(WE != _T("W") && WE != _T("E"))
-	{
-		m_textCtrlWE->SetFocus();
-		m_textCtrlWE->SetSelection(-1,-1);
-	}
-	else
-	{
-		retstr.Replace(_T("."),dlg->decimalPoint);
-		EndModal(wxID_OK);
-	}
+        min1 += sec1;
+        min2 += sec2;
+
+        min1str = wxString::Format( _T( "%07.4f" ),min1 );
+        min2str = wxString::Format( _T( "%07.4f" ),min2 );
+
+        retstr = deg1+min1str+m_textCtrlNS->GetValue().Lower()+deg2+min2str+m_textCtrlWE->GetValue().Lower();
+    }
+
+    wxString NS = m_textCtrlNS->GetValue().Upper();
+    wxString WE = m_textCtrlWE->GetValue().Upper();
+
+    if ( degf1 < 0.0  || degf1 > 359.0 )
+    {
+        m_textCtrlDeg1->SetFocus();
+        m_textCtrlDeg1->SetSelection( -1,-1 );
+    }
+    else if ( degf2 < 0.0 || degf2 > 359.0 )
+    {
+        m_textCtrlDeg2->SetFocus();
+        m_textCtrlDeg2->SetSelection( -1,-1 );
+    }
+    else if ( min1 < 0.0 || min1 > 59.9999 )
+    {
+        m_textCtrlmin1->SetFocus();
+        m_textCtrlmin1->SetSelection( -1,-1 );
+    }
+    else if ( min2 < 0.0 || min2 > 59.9999 )
+    {
+        m_textCtrlmin2->SetFocus();
+        m_textCtrlmin2->SetSelection( -1,-1 );
+    }
+    else if ( sec1< 0.0 || sec1 > 59.9999 )
+    {
+        m_textCtrlsec1->SetFocus();
+        m_textCtrlsec1->SetSelection( -1,-1 );
+    }
+    else if ( sec2 < 0.0 || sec2 > 59.9999 )
+    {
+        m_textCtrlsec2->SetFocus();
+        m_textCtrlsec2->SetSelection( -1,-1 );
+    }
+    else if ( NS != _T( "N" ) && NS != _T( "S" ) )
+    {
+        m_textCtrlNS->SetFocus();
+        m_textCtrlNS->SetSelection( -1,-1 );
+    }
+    else if ( WE != _T( "W" ) && WE != _T( "E" ) )
+    {
+        m_textCtrlWE->SetFocus();
+        m_textCtrlWE->SetSelection( -1,-1 );
+    }
+    else
+    {
+        retstr.Replace( _T( "." ),dlg->decimalPoint );
+        EndModal( wxID_OK );
+    }
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/LogbookDialog.h opencpn-plugin-logbookkonni-1.2024/src/LogbookDialog.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/LogbookDialog.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/LogbookDialog.h	2016-02-25 13:06:29.000000000 +0000
@@ -85,680 +85,681 @@
 class myBitmapButton;
 class wxJSONReader;
 
-class LogbookDialog : public wxDialog 
+class LogbookDialog : public wxDialog
 {
-	private:
-		wxString columns[92];
-		wxString			clouds[10];
-		wxString			statusText[3];
-		ColdFinger*         coldfinger;
-
-		wxString			saveDialogFilter;
-		int					lastRowSelectedService;
-		int					lastRowSelectedRepairs;
-		int					lastRowSelectedBuyParts;
-		int					previousColumn;
-		bool				noOpenPositionDlg;
-
-		void				declareExportHeader();
-		bool				checkHiddenColumns(wxGrid* grid,int i,bool use);
-		void				navigationHideColumn(wxCommandEvent& ev);
-		void				sortGrid(wxGrid* grid, int col, bool ascending);
-		void				clearDataDir();
-		void				addColdFingerDialog(wxMenu* m_menu1);
-		void				addColdFingerTextBlocks(wxMenu* m_menu1);
-		wxTreeItemId		FindMenuItem(int grid, int col, wxString name);
-		void				labelLeftClick(wxGridEvent& event, wxGrid* grid);
-
-	public:
-enum fields{ ROWHIGHT,ROUTE,RDATE,RTIME,WAKE,DISTANCE,POSITION,COG,SOG,REMARKS,
-			 BARO,WIND,WSPD,CURRENT,CSPD,WEATHER,CLOUDS,VISIBILITY,
-			 MOTOR,FUEL,SAILS,REEF,MREMARKS };
-enum status {STOP,SUSPEND,RUN};
-enum grids  {LOGBOOK,OVERVIEW,CREW,BOAT,GSERVICE,GREPAIRS,GBUYPARTS};
-
-		Boat*			boat;
-		CrewList*		crewList;
-		Maintenance*	maintenance;
-		wxString		backupFile;
-
-		wxImageList *imageList;
-		
-		wxNotebook* m_logbook;
-		wxButton* m_button4;
-		wxButton* logSave;
-		wxStaticLine* m_staticline8;
-        wxBitmapButton* m_bpButtonShowHideLayout;
-		wxStaticText* m_staticText32;
-		wxChoice* logbookChoice;
-		wxButton* logView;
-		wxStaticLine* m_staticline7;
-		wxButton* newLogbook;
-		wxButton* selLogbook;
-        wxStaticLine* m_staticline411;
-        wxBitmapButton* m_bpButtonShowHideStatusGlobal;
-        wxBitmapButton* m_bpButtonHelpGlobal;
-        wxStaticLine* m_staticline401;
-		wxNotebook* m_notebook8;
-		wxPanel* m_panel6;
-        wxMenu* m_menu10;
-		wxPanel* m_panel7;
-		wxGrid* m_gridWeather;
-		wxPanel* m_panel71;
-		wxGrid* m_gridMotorSails;
-        wxButton* m_buttonSetTimer;
-        wxStaticText* m_staticText1241;
-        myBitmapButton* m_bpButtonTimer;
-        wxStaticLine* m_staticline40;
-        wxStaticText* m_staticText12411;
-        myBitmapButton* m_bpButtonWatch;
-        wxStaticLine* m_staticline41;
-        wxStaticText* m_staticText124111;
-        myBitmapButton* m_bpButton8Waypoint;
-        wxStaticLine* m_staticline42;
-        wxStaticText* m_staticText1241111;
-        myBitmapButton* m_bpButtonDistance;
-        wxTextCtrl* m_textCtrlStatusDistance;
-        wxStaticLine* m_staticline43;
-        wxStaticText* m_staticText12411111;
-        myBitmapButton* m_bpButtonCourse;
-        wxTextCtrl* m_textCtrlStatusCourseDeg;
-        wxTextCtrl* m_textCtrlStatusCourseMin;
-        wxStaticLine* m_staticline44;
-        wxButton* m_buttonStartStop;
-        wxStaticLine* m_staticline46;
-        wxStaticText* m_staticTextStatusText;
-		wxPanel* m_panel142;
-		wxButton* logSaveOverview;
-		wxStaticLine* m_staticline81;
-		wxStaticText* m_staticText323;
-		wxButton* logViewOverview;
-		wxStaticLine* m_staticline71;
-		wxStaticLine* m_staticline11;
-		wxGrid* m_gridOverview;
-		wxMenu* m_menuOverView;
-		wxPanel* m_panel21;
-		wxButton* crewAdd;
-		wxButton* crewSave;
-		wxStaticLine* m_staticline5;
-		wxStaticText* m_staticText321;
-		wxChoice* crewChoice;
-		wxButton* crewView;
-		wxStaticLine* m_staticline36;
-		wxStaticText* m_staticText1171;
-		wxStaticLine* m_staticline2;
-		wxSplitterWindow* m_splitterWatch;
-		wxPanel* m_panel211;
-		wxGrid* m_gridCrew;
-		wxMenu* m_menu2;
-		wxStaticBoxSizer* sbSizer61;
-		wxStaticText* m_staticText1141;
-		wxTextCtrl* m_textCtrlWatchStartDate;
-		wxTextCtrl* m_textCtrlWatchStartTime;
-		wxStaticText* m_staticText1161;
-		wxButton* m_buttonCalculate;
-		wxButton* m_buttonReset;
-		wxButton* m_buttonClear;
-		wxStaticLine* m_staticline35;
-		wxButton* m_buttonDayMinus;
-		wxButton* m_buttonNow;
-		wxButton* m_buttonDayPlus;
-		wxStaticText* m_staticTextWakeDay;
-		wxStaticText* m_staticText1181;
-		wxGrid* m_gridCrewWake;
-		wxMenu* m_menu21;
-        wxPanel* m_panel24;
-        wxStaticText* m_staticTextStatusWatch;
-		wxPanel* m_panel3;
-		wxButton* addEquipmentButton;
-		wxToggleButton* m_toggleBtnShowEquipment;
-		wxStaticLine* m_staticline27;
-		wxButton* boatSave;
-		wxStaticLine* m_staticline4;
-		wxStaticText* m_staticText322;
-		wxChoice* boatChoice;
-		wxButton* boatView;
-		wxStaticLine* m_staticline3;
-		wxSplitterWindow* m_splitter1;
-		wxPanel* m_panel72;
-		wxStaticText* bname;
-		wxTextCtrl* boatName;
-		wxStaticText* m_staticText114;
-		wxTextCtrl* homeport;
-		wxStaticText* m_staticText115;
-		wxTextCtrl* callsign;
-		wxStaticText* m_staticText116;
-		wxTextCtrl* hin;
-		wxStaticText* m_staticText117;
-		wxTextCtrl* sailno;
-		wxStaticText* m_staticText119;
-		wxTextCtrl* insurance;
-		wxStaticText* m_staticText118;
-		wxTextCtrl* registration;
-		wxStaticText* m_staticText120;
-		wxTextCtrl* policy;
-		wxStaticText* m_staticText53;
-		wxTextCtrl* mmsi;
-		wxStaticText* m_staticText90;
-		wxTextCtrl* ownerName;
-		wxStaticText* m_staticText91;
-		wxTextCtrl* ownerFirstname;
-		wxStaticText* m_staticText95;
-		wxTextCtrl* ownerPhone;
-		wxStaticText* m_staticText92;
-		wxTextCtrl* ownerStreet;
-		wxStaticText* m_staticText93;
-		wxTextCtrl* owenerZip;
-		wxStaticText* m_staticText94;
-		wxTextCtrl* ownerTown;
-		wxStaticText* m_staticText128;
-		wxTextCtrl* boatType;
-		wxStaticText* m_staticText125;
-		wxTextCtrl* builder;
-		wxStaticText* m_staticText124;
-		wxTextCtrl* hull;
-		wxStaticText* m_staticText126;
-		wxTextCtrl* dateLaunched;
-		wxStaticText* m_staticText127;
-		wxTextCtrl* yardNr;
-		wxStaticText* m_staticText123;
-		wxTextCtrl* designer;
-		wxStaticText* m_staticText129;
-		wxTextCtrl* construction;
-		wxStaticText* m_staticText106;
-		wxTextCtrl* LOA;
-		wxStaticText* m_staticText107;
-		wxTextCtrl* LOD;
-		wxStaticText* m_staticText108;
-		wxTextCtrl* LWL;
-		wxStaticText* m_staticText109;
-		wxTextCtrl* beam;
-		wxStaticText* m_staticText110;
-		wxTextCtrl* draft;
-		wxTextCtrl* UserLabel1;
-		wxTextCtrl* Userfield2;
-		wxTextCtrl* Userfield3;
-		wxStaticText* m_staticText122;
-		wxTextCtrl* displacement;
-		wxPanel* m_panel8;
-		wxGrid* m_gridEquipment;
-		wxMenu* m_menu3;
-		wxPanel* m_panel14;
-		wxStaticLine* m_staticline151;
-		wxStaticText* m_staticText621;
-		wxStaticLine* m_staticline141;
-		wxMenu* m_menu7;
-		wxPanel* m_panel141;
-		wxStaticLine* m_staticline1513;
-		wxStaticText* m_staticText6213;
-		wxStaticLine* m_staticline1413;
-		wxMenu* m_menu71;
-		wxPanel* m_panel16;
-		wxStaticLine* m_staticline1511;
-		wxStaticText* m_staticText6211;
-		wxStaticLine* m_staticline1411;
-		wxMenu* m_menu711;
+private:
+    wxString columns[92];
+    wxString			clouds[10];
+    wxString			statusText[3];
+    ColdFinger*         coldfinger;
+
+    wxString			saveDialogFilter;
+    int					lastRowSelectedService;
+    int					lastRowSelectedRepairs;
+    int					lastRowSelectedBuyParts;
+    int					previousColumn;
+    bool				noOpenPositionDlg;
+
+    void				declareExportHeader();
+    bool				checkHiddenColumns( wxGrid* grid,int i,bool use );
+    void				navigationHideColumn( wxCommandEvent& ev );
+    void				sortGrid( wxGrid* grid, int col, bool ascending );
+    void				clearDataDir();
+    void				addColdFingerDialog( wxMenu* m_menu1 );
+    void				addColdFingerTextBlocks( wxMenu* m_menu1 );
+    wxTreeItemId		FindMenuItem( int grid, int col, wxString name );
+    void				labelLeftClick( wxGridEvent& event, wxGrid* grid );
+
+public:
+    enum fields { ROWHIGHT,ROUTE,RDATE,RTIME,WAKE,DISTANCE,POSITION,COG,SOG,REMARKS,
+                  BARO,WIND,WSPD,CURRENT,CSPD,WEATHER,CLOUDS,VISIBILITY,
+                  MOTOR,FUEL,SAILS,REEF,MREMARKS
+                };
+    enum status {STOP,SUSPEND,RUN};
+    enum grids  {LOGBOOK,OVERVIEW,CREW,BOAT,GSERVICE,GREPAIRS,GBUYPARTS};
+
+    Boat*			boat;
+    CrewList*		crewList;
+    Maintenance*	maintenance;
+    wxString		backupFile;
+
+    wxImageList *imageList;
+
+    wxNotebook* m_logbook;
+    wxButton* m_button4;
+    wxButton* logSave;
+    wxStaticLine* m_staticline8;
+    wxBitmapButton* m_bpButtonShowHideLayout;
+    wxStaticText* m_staticText32;
+    wxChoice* logbookChoice;
+    wxButton* logView;
+    wxStaticLine* m_staticline7;
+    wxButton* newLogbook;
+    wxButton* selLogbook;
+    wxStaticLine* m_staticline411;
+    wxBitmapButton* m_bpButtonShowHideStatusGlobal;
+    wxBitmapButton* m_bpButtonHelpGlobal;
+    wxStaticLine* m_staticline401;
+    wxNotebook* m_notebook8;
+    wxPanel* m_panel6;
+    wxMenu* m_menu10;
+    wxPanel* m_panel7;
+    wxGrid* m_gridWeather;
+    wxPanel* m_panel71;
+    wxGrid* m_gridMotorSails;
+    wxButton* m_buttonSetTimer;
+    wxStaticText* m_staticText1241;
+    myBitmapButton* m_bpButtonTimer;
+    wxStaticLine* m_staticline40;
+    wxStaticText* m_staticText12411;
+    myBitmapButton* m_bpButtonWatch;
+    wxStaticLine* m_staticline41;
+    wxStaticText* m_staticText124111;
+    myBitmapButton* m_bpButton8Waypoint;
+    wxStaticLine* m_staticline42;
+    wxStaticText* m_staticText1241111;
+    myBitmapButton* m_bpButtonDistance;
+    wxTextCtrl* m_textCtrlStatusDistance;
+    wxStaticLine* m_staticline43;
+    wxStaticText* m_staticText12411111;
+    myBitmapButton* m_bpButtonCourse;
+    wxTextCtrl* m_textCtrlStatusCourseDeg;
+    wxTextCtrl* m_textCtrlStatusCourseMin;
+    wxStaticLine* m_staticline44;
+    wxButton* m_buttonStartStop;
+    wxStaticLine* m_staticline46;
+    wxStaticText* m_staticTextStatusText;
+    wxPanel* m_panel142;
+    wxButton* logSaveOverview;
+    wxStaticLine* m_staticline81;
+    wxStaticText* m_staticText323;
+    wxButton* logViewOverview;
+    wxStaticLine* m_staticline71;
+    wxStaticLine* m_staticline11;
+    wxGrid* m_gridOverview;
+    wxMenu* m_menuOverView;
+    wxPanel* m_panel21;
+    wxButton* crewAdd;
+    wxButton* crewSave;
+    wxStaticLine* m_staticline5;
+    wxStaticText* m_staticText321;
+    wxChoice* crewChoice;
+    wxButton* crewView;
+    wxStaticLine* m_staticline36;
+    wxStaticText* m_staticText1171;
+    wxStaticLine* m_staticline2;
+    wxSplitterWindow* m_splitterWatch;
+    wxPanel* m_panel211;
+    wxGrid* m_gridCrew;
+    wxMenu* m_menu2;
+    wxStaticBoxSizer* sbSizer61;
+    wxStaticText* m_staticText1141;
+    wxTextCtrl* m_textCtrlWatchStartDate;
+    wxTextCtrl* m_textCtrlWatchStartTime;
+    wxStaticText* m_staticText1161;
+    wxButton* m_buttonCalculate;
+    wxButton* m_buttonReset;
+    wxButton* m_buttonClear;
+    wxStaticLine* m_staticline35;
+    wxButton* m_buttonDayMinus;
+    wxButton* m_buttonNow;
+    wxButton* m_buttonDayPlus;
+    wxStaticText* m_staticTextWakeDay;
+    wxStaticText* m_staticText1181;
+    wxGrid* m_gridCrewWake;
+    wxMenu* m_menu21;
+    wxPanel* m_panel24;
+    wxStaticText* m_staticTextStatusWatch;
+    wxPanel* m_panel3;
+    wxButton* addEquipmentButton;
+    wxToggleButton* m_toggleBtnShowEquipment;
+    wxStaticLine* m_staticline27;
+    wxButton* boatSave;
+    wxStaticLine* m_staticline4;
+    wxStaticText* m_staticText322;
+    wxChoice* boatChoice;
+    wxButton* boatView;
+    wxStaticLine* m_staticline3;
+    wxSplitterWindow* m_splitter1;
+    wxPanel* m_panel72;
+    wxStaticText* bname;
+    wxTextCtrl* boatName;
+    wxStaticText* m_staticText114;
+    wxTextCtrl* homeport;
+    wxStaticText* m_staticText115;
+    wxTextCtrl* callsign;
+    wxStaticText* m_staticText116;
+    wxTextCtrl* hin;
+    wxStaticText* m_staticText117;
+    wxTextCtrl* sailno;
+    wxStaticText* m_staticText119;
+    wxTextCtrl* insurance;
+    wxStaticText* m_staticText118;
+    wxTextCtrl* registration;
+    wxStaticText* m_staticText120;
+    wxTextCtrl* policy;
+    wxStaticText* m_staticText53;
+    wxTextCtrl* mmsi;
+    wxStaticText* m_staticText90;
+    wxTextCtrl* ownerName;
+    wxStaticText* m_staticText91;
+    wxTextCtrl* ownerFirstname;
+    wxStaticText* m_staticText95;
+    wxTextCtrl* ownerPhone;
+    wxStaticText* m_staticText92;
+    wxTextCtrl* ownerStreet;
+    wxStaticText* m_staticText93;
+    wxTextCtrl* owenerZip;
+    wxStaticText* m_staticText94;
+    wxTextCtrl* ownerTown;
+    wxStaticText* m_staticText128;
+    wxTextCtrl* boatType;
+    wxStaticText* m_staticText125;
+    wxTextCtrl* builder;
+    wxStaticText* m_staticText124;
+    wxTextCtrl* hull;
+    wxStaticText* m_staticText126;
+    wxTextCtrl* dateLaunched;
+    wxStaticText* m_staticText127;
+    wxTextCtrl* yardNr;
+    wxStaticText* m_staticText123;
+    wxTextCtrl* designer;
+    wxStaticText* m_staticText129;
+    wxTextCtrl* construction;
+    wxStaticText* m_staticText106;
+    wxTextCtrl* LOA;
+    wxStaticText* m_staticText107;
+    wxTextCtrl* LOD;
+    wxStaticText* m_staticText108;
+    wxTextCtrl* LWL;
+    wxStaticText* m_staticText109;
+    wxTextCtrl* beam;
+    wxStaticText* m_staticText110;
+    wxTextCtrl* draft;
+    wxTextCtrl* UserLabel1;
+    wxTextCtrl* Userfield2;
+    wxTextCtrl* Userfield3;
+    wxStaticText* m_staticText122;
+    wxTextCtrl* displacement;
+    wxPanel* m_panel8;
+    wxGrid* m_gridEquipment;
+    wxMenu* m_menu3;
+    wxPanel* m_panel14;
+    wxStaticLine* m_staticline151;
+    wxStaticText* m_staticText621;
+    wxStaticLine* m_staticline141;
+    wxMenu* m_menu7;
+    wxPanel* m_panel141;
+    wxStaticLine* m_staticline1513;
+    wxStaticText* m_staticText6213;
+    wxStaticLine* m_staticline1413;
+    wxMenu* m_menu71;
+    wxPanel* m_panel16;
+    wxStaticLine* m_staticline1511;
+    wxStaticText* m_staticText6211;
+    wxStaticLine* m_staticline1411;
+    wxMenu* m_menu711;
 //        wxStaticText* m_staticText140;
-        wxTextCtrl* m_textCtrl95;
-        wxStaticText* m_staticText141;
-        wxTextCtrl* m_textCtrl96;
-        wxStaticText* m_staticText142;
-        wxTextCtrl* m_textCtrl100;
-        wxStaticText* m_staticText143;
-        wxTextCtrl* m_textCtrl98;
-        wxStaticLine* m_staticline421;
-        wxButton* m_button61;
-        wxStaticLine* m_staticline431;
-        wxChoice* m_choice32;
-        wxButton* m_buttonSavePolar;
-        wxTextCtrl* m_textCtrl99;
-        wxPanel* m_panel22;
-        wxButton* m_buttonSailsReset;
-        wxBoxSizer* bSizerPolar;
-        wxStaticText* m_staticText144;
-        wxChoice* m_choiceDegreesPolar;
-        wxStaticLine* m_staticline441;
-        wxStaticText* m_staticText145;
-        wxStaticText* m_staticText146;
-        wxChoice* m_choiceSourcePolar;
-        wxStaticText* m_staticText148;
-        wxChoice* m_choiceWindPolar;
-        wxChoice* m_choiceWavefromPolar;
-        wxStaticText* m_staticText147;
-        wxChoice* m_choice37;
-        wxChoice* m_choiceCurrentPolar;
-        wxButton* m_button62;
-        wxStaticLine* m_staticline45;
-        wxButton* m_buttonFilterPolar;
-        wxChoice* m_choiceRingsPolar;
-
-		// Virtual event handlers, overide them in your derived class
-		 void LogbookDialogOnClose( wxCloseEvent& event ) ;
-		 void LogbookDialogOnInitDialog( wxInitDialogEvent& event ) ;
-		 void OnNoteBookPageChangedLogbook( wxNotebookEvent& event );
-		 void m_button4OnButtonClick( wxCommandEvent& event ) ;
-		 void logSaveOnButtonClick( wxCommandEvent& event ) ;
-		 void OnGridLabelLeftDClickGlobal( wxGridEvent& event );
-		 void OnGridLabelLeftDClickWeather( wxGridEvent& event );
-		 void OnGridLabelLeftDClickMotorSails( wxGridEvent& event );
-		 void OnGridLabelLeftDClickOverview( wxGridEvent& event );
-		 void OnGridLabelLeftDClickCrew( wxGridEvent& event );
-		 void OnGridLabelLeftDClickCrewWake( wxGridEvent& event );
-		 void OnMenuSelectionHiddenCrew( wxCommandEvent& event );
-		 void onButtonReloadLayoutLogbook( wxCommandEvent& event ) ;
-		 void onButtonClickEditLayoutLogbook( wxCommandEvent& event ) ;
-		 void onRadioButtonHTML( wxCommandEvent& event ) ;
-		 void onRadioButtonODT( wxCommandEvent& event ) ;
-		 void logViewOnButtonClick( wxCommandEvent& event ) ;
-		 void newLogbookOnButtonClick( wxCommandEvent& event ) ;
-		 void selLogbookOnButtonClick( wxCommandEvent& event ) ;
-		 void m_gridGlobalOnGridCellRightClick( wxGridEvent& event ) ;
-		 void m_gridGlobalOnGridCmdCellChange( wxGridEvent& event ) ;
-		 void m_gridGlobalOnGridSelectCell( wxGridEvent& event ) ;
-		 void OnMenuSelectionHideColumn( wxCommandEvent& event );
-		 void OnMenuSelectionHideColumnOverView( wxCommandEvent& event );
-		 void m_gridGlobalOnKeyDown( wxKeyEvent& event ) ;
-		 void m_menuItem1OnMenuSelection( wxCommandEvent& event ) ;
-		 void m_gridWeatherOnGridCellRightClick( wxGridEvent& event ) ;
-		 void m_gridWeatherOnGridCmdCellChange( wxGridEvent& event ) ;
-		 void m_gridWeatherOnGridSelectCell( wxGridEvent& event ) ;
-		 void m_gridWeatherOnKeyDown( wxKeyEvent& event ) ;
-		 void m_gridMotorSailsOnGridCellRightClick( wxGridEvent& event ) ;
-		 void m_gridMotorSailsOnGridCmdCellChange( wxGridEvent& event ) ;
-		 void m_gridMotorSailsOnGridSelectCell( wxGridEvent& event ) ;
-		 void m_gridMotorSailsOnKeyDown( wxKeyEvent& event ) ;
-		 void crewAddOnButtonClick( wxCommandEvent& event ) ;
-		 void crewSaveOnButtonClick( wxCommandEvent& event ) ;
-		 void OnMenuSelectionOnboardCrew( wxCommandEvent& event );
-		 void OnMenuSelectionAllEntriesCrew( wxCommandEvent& event );
-		 void onButtonClickReloadLayoutsCrew( wxCommandEvent& event ) ;
-		 void onButtonClickEditLayoutCrew( wxCommandEvent& event ) ;
-		 void onRadioButtonHTMLCrew( wxCommandEvent& event ) ;
-		 void onRadioButtonODTCrew( wxCommandEvent& event ) ;
-		 void crewViewOnButtonClick( wxCommandEvent& event ) ;
-		 void m_gridCrewOnGridCellChange( wxGridEvent& event ) ;
-		 void m_gridCrewOnGridCellRightClick( wxGridEvent& event ) ;
-		 void m_menuItem2OnMenuSelection( wxCommandEvent& event ) ;
-		 void m_gridCrewWakeOnGridCellChange( wxGridEvent& event ) ;
-		 void boataddEquipmentButtonOnButtonClick( wxCommandEvent& event ) ;
-		 void boatSaveOnButtonClick( wxCommandEvent& event ) ;
-		 void onButtonClickReloadLayoutsBoat( wxCommandEvent& event ) ;
-		 void onButtonClickEditLayoutBoat( wxCommandEvent& event ) ;
-		 void onRadioButtonHTMLBoat( wxCommandEvent& event ) ;
-		 void onRadioButtonODTBoat( wxCommandEvent& event ) ;
-		 void boatViewOnButtonClick( wxCommandEvent& event ) ;
-		 void boatNameOnTextEnter( wxCommandEvent& event ) ;
-		 void m_gridEquipmentOnGridCellChange( wxGridEvent& event ) ;
-		 void m_gridEquipmentOnGridCellRightClick( wxGridEvent& event ) ;
-		 void m_menuItem3OnMenuSelection( wxCommandEvent& event ) ;
-		 void OnMenuSelectionShowHiddenCols( wxCommandEvent& event );
-		 void onButtobClickAddLineService( wxCommandEvent& event ) ;
-		 void onButtobClickSaveService( wxCommandEvent& event ) ;
-		 void onButtonClickReloadLayoutsServiceHTML( wxCommandEvent& event ) ;
-		 void onButtonClickEditLayoutODTService( wxCommandEvent& event ) ;
-		 void onRadioButtonHTMLService( wxCommandEvent& event ) ;
-		 void onRadioButtonODTService( wxCommandEvent& event ) ;
-		 void onButtonClickViewService( wxCommandEvent& event ) ;
-		 void onGridCellServiceChange( wxGridEvent& event ) ;
-		 void onGridCellRightClickService( wxGridEvent& event ) ;
-		 void onGridCellServiceSelected( wxGridEvent& event ) ;
-		 void OnKeyDownService( wxKeyEvent& event ) ;
-		 void onMenuSelectionServiceOK( wxCommandEvent& event ) ;
-		 void onMenuSelectionServiceBuyParts( wxCommandEvent& event ) ;
-		 void onMenuSelectionServiceDelete( wxCommandEvent& event ) ;
-		 void onButtobClickAddLineRepairs( wxCommandEvent& event ) ;
-		 void onButtobClickSaveRepairs( wxCommandEvent& event ) ;
-		 void onButtonClickReloadLayoutsRepairsHTML( wxCommandEvent& event ) ;
-		 void onButtonClickEditLayoutODTRepairs( wxCommandEvent& event ) ;
-		 void onRadioButtonHTMLRepairs( wxCommandEvent& event ) ;
-		 void onRadioButtonODTRepairs( wxCommandEvent& event ) ;
-		 void onButtonClickViewRepairs( wxCommandEvent& event ) ;
-		 void onGridCellRepairsChange( wxGridEvent& event ) ;
-		 void onGridCellRightClickRepairs( wxGridEvent& event ) ;
-		 void onGridCellRepairsSelected( wxGridEvent& event ) ;
-		 void OnKeyDownRepairs( wxKeyEvent& event ) ;
-		 void onMenuSelectionRepairsOK( wxCommandEvent& event ) ;
-		 void onMenuSelectionRepairsBuyParts( wxCommandEvent& event ) ;
-		 void onMenuSelectionRepairsDelete( wxCommandEvent& event ) ;
-		 void onButtobClickAddLineBuyParts( wxCommandEvent& event ) ;
-		 void onButtobClickSaveBuyParts( wxCommandEvent& event ) ;
-		 void onButtonClickReloadLayoutsBuyPartsHTML( wxCommandEvent& event ) ;
-		 void onButtonClickEditLayoutODTBuyParts( wxCommandEvent& event ) ;
-		 void onRadioButtonHTMLBuyParts( wxCommandEvent& event ) ;
-		 void onRadioButtonODTBuyParts( wxCommandEvent& event ) ;
-		 void onButtonClickViewBuyParts( wxCommandEvent& event ) ;
-		 void onGridCellChangeBuyParts( wxGridEvent& event ) ;
-		 void onGridCellRightClickBuyParts( wxGridEvent& event ) ;
-		 void onGridEditorHidden( wxGridEvent& event ) ;
-		 void onGridEditorShow( wxGridEvent& event ) ;
-		 void onGridCellSelectedBuyParts( wxGridEvent& event ) ;
-		 void OnKeyDownBuyParts( wxKeyEvent& event ) ;
-		 void onMenuSelectionBuyPartsDelete( wxCommandEvent& event ) ;
-		 void OnButtonClickOverviewSave( wxCommandEvent& event );
-		 void onButtonReloadLayoutOverView( wxCommandEvent& event );
-		 void onButtonClickEditLayoutOverview( wxCommandEvent& event );
-		 void onRadioButtonHTMLOverview( wxCommandEvent& event );
-		 void onRadioButtonODTOverView( wxCommandEvent& event );
-		 void OnButtonClickOverView( wxCommandEvent& event );
-		 void OnGridCellRightClickOverview( wxGridEvent& event );
-		 void OnGridLabelLeftClickOverview( wxGridEvent& event );
-		 void OnMenuSelectionGotoRoute( wxCommandEvent& event );
-		 void OnMenuSelectionShowHiddenColsOverview( wxCommandEvent& event );
-		 void onButtonClickSelectLogbook( wxCommandEvent& event );
-		 void OnRadioButtonActuellLogbook( wxCommandEvent& event );
-		 void OnRadioButtonAllLogbooks( wxCommandEvent& event );
-		 void onGridCellLeftClickService( wxGridEvent& event );
-		 void onGridCellLeftClickBuyParts( wxGridEvent& event );
-		 void OnToggleButtonShowEquip( wxCommandEvent& event );
-		 void OnKeyDownOverview( wxKeyEvent& event );
-		 void OnMenuSelectionSearch( wxCommandEvent& event );	
-		 void OnMenuSelectionNewWatchWake( wxCommandEvent& event );		
-		 void OnGridCellRightClickWake( wxGridEvent& event );
-		 void OnMenuSelectionAddWatch( wxCommandEvent& event );
-		 void OnMenuSelectionSameWatch( wxCommandEvent& event );
-		 void OnGridLabelLeftClickService( wxGridEvent& event );
-		 void OnGridLabelLeftClickRepairs( wxGridEvent& event );
-		 void OnGridLabelLeftClickBuyParts( wxGridEvent& event );
-		 void OnGridCellLeftClickGlobal( wxGridEvent& event );
-		 void OnMenuSelectionAsc( wxCommandEvent& event );
-		 void OnMenuSelectionDesc( wxCommandEvent& event );
-		 void OnKeyDownCrew( wxKeyEvent& event );
-		 void OnKeyDownWatch( wxKeyEvent& event );
-		 void OnButtonClickWakeClear( wxCommandEvent& event );
-		 void OnMenuSelectionShutdown( wxCommandEvent& event );
-		 void OnGridLabelRightClickGlobal( wxGridEvent& event );
-		 void OnGridLabelRightClickWeather( wxGridEvent& event );
-		 void OnGridLabelRightClickMotorSails( wxGridEvent& event );
-		 void OnLeftUpDistance( wxMouseEvent& event );
-		 void OnLeftUpCourse( wxMouseEvent& event );
-		 void OnLeftUpCourseMin( wxMouseEvent& event );
-		 void OnLeftUpStartTime( wxMouseEvent& event );
-		 void OnLeftUpDays( wxMouseEvent& event );
-		 void OnLeftUpDay( wxMouseEvent& event );
-		 void OnNotebookPageChangedLoggrids( wxNotebookEvent& event );
-		 void OnButtomClickStatusbarGlobal( wxCommandEvent& event );
-		 void OnClickButtonHelpGlobal( wxCommandEvent& event );
-		 void OnChoiceGlobal( wxCommandEvent& event );
-		 void OnChoiceCrew( wxCommandEvent& event );
-		 void OnChoiceBoat( wxCommandEvent& event );
-		 void OnChoiceBoatOverview( wxCommandEvent& event );
-		 void OnChoiceService( wxCommandEvent& event );
-		 void OnChoiceBuyParts( wxCommandEvent& event );
-		 void OnChoiceRepairs( wxCommandEvent& event );
-		 void OnGridBeginDragCrew( wxGridEvent& event );
-		 void OnGridBeginDragWatch( wxGridEvent& event );
-		 void m_gridCrewOnGridCellLeftClick( wxGridEvent& event );
-		 void OnButtonClickCalculate( wxCommandEvent& event );
-		 void OnButtonClickReset( wxCommandEvent& event );
-		 void OnButtonClickDayPlus( wxCommandEvent& event );
-		 void OnButtonClickNow( wxCommandEvent& event );
-		 void OnButtonClickDayMinus( wxCommandEvent& event );
-		 void OnLeftDownWatchStartDate( wxMouseEvent& event );
-		 void OnTextEnterWatchTime( wxCommandEvent& event );
-		 void OnGridCellLeftClickWatch( wxGridEvent& event );
-		 void OnGridEditorShownWatch( wxGridEvent& event );
-		 void OnGridEditorHiddenWatch( wxGridEvent& event );
-		 void OnGridEditorCreatedWatch( wxGridEditorCreatedEvent& event );
-		 void OnMotion( wxMouseEvent& event );
-		 void OnGridEditorShownCrew( wxGridEvent& event );
-		 void OnMenuSelectionSplitWatch( wxCommandEvent& event );
-		 void OnMenuSelectionMergeWatch( wxCommandEvent& event );
-		 void OnTextEnterDayWake( wxCommandEvent& event );
-		 void OnMenuSelectionDeleteMembers( wxCommandEvent& event );
-		 void OnSplitterSashPositionChangedWake( wxSplitterEvent& event );
-		 void OnGridLabelRightClickWake( wxGridEvent& event );
-		 void OnGridLabelLeftClickWake( wxGridEvent& event );
-		 void OnIdleMainDialog( wxIdleEvent& event );
-		 void OnButtonClickStatusTimer( wxCommandEvent& event );
-		 void OnStatusBulletTimer( wxCommandEvent& event );
-		 void OnStatusBulletWatch( wxCommandEvent& event );
-		 void OnStatusBulletWaypoint( wxCommandEvent& event );
-		 void OnStatusBulletDistance( wxCommandEvent& event );
-		 void OnStatusBulletCourse( wxCommandEvent& event );
-		 void OnButtonClickStatusStartStop( wxCommandEvent& event );
-		 void OnTextEnterStatusDistance( wxCommandEvent& event );
-		 void OnTextEnterStatusCourseDeg( wxCommandEvent& event );
-		 void OnTextEnterStatusMinutes( wxCommandEvent& event );
-		 void OnGridLabelLeftClickGlobal( wxGridEvent& event );
-		 void OnGridLabelLeftClickWeather( wxGridEvent& event );
-		 void OnGridLabelLeftClickMotorSails( wxGridEvent& event );
-		 void onMenuSelectionDeleteRows( wxCommandEvent& event );
-		 void OnMenuSelectionFlip( wxCommandEvent& event );
-		 void OnMenuSelectionFlipWatches( wxCommandEvent& event );
-         void OnButtomClickShowHideLayout( wxCommandEvent& event );
-         void OnToggleButtonEngine1( wxCommandEvent& event );
-         void OnToggleButtonEngine2( wxCommandEvent& event );
-         void OnToggleButtonGenerator( wxCommandEvent& event );
-         void OnButtonClickResetSails( wxCommandEvent& event );
-         void OnCheckboxSails( wxCommandEvent& event );
-
-		 void OnComboUpService(wxCommandEvent& event);
-		 void OnComboUpRepairs(wxCommandEvent& event);
-		 void OnComboUpBuyParts(wxCommandEvent& event);
-
-		 void m_menu1Highlighted(wxMenuEvent& event);
-
-		 void gridGlobalScrolled( wxScrollWinEvent& event );
-		 void gridWeatherScrolled( wxScrollWinEvent& event );
-		 void gridMotorSailsScrolled( wxScrollWinEvent& event );
-
-		 void appendOSDirSlash(wxString* pString);
-
-		 void getIniValues();
-		 void setIniValues();
-		 void flipMonthDay();
-		 void deleteRows();
-		 void setBulletColorAllStates(myBitmapButton* button, wxBitmap bmp);
-	
-	public:
-enum maintenanceTab {SERVICE,REPAIRS,BUYPARTS};
-enum FORMAT {HTML,ODT};
-
-        wxPanel* m_panel2;
-        wxBoxSizer* bSizer6;
-        wxPanel* m_panelLayout;
-        wxButton* m_buttonReloadLayout;
-		wxButton* m_buttonEditLayout;
-        wxPanel* m_panelEngine;
-        wxToggleButton* m_toggleBtnEngine1;
-        wxToggleButton* m_toggleBtnEngine2;
-        wxToggleButton* m_toggleBtnGenerator;
-        wxFlexGridSizer* fgSizerSails;
-		wxRadioButton* m_radioBtnHTML;
-		wxRadioButton* m_radioBtnODT;
-		wxGrid* m_gridGlobal;
-        wxMenu* m_menu1;
-        wxPanel* Statusbar;
-		wxChoice* overviewChoice;
-		wxButton* m_buttonReloadLayoutOview;
-		wxButton* m_buttonEditLayoutOview;
-		wxRadioButton* m_radioBtnHTMLOverview;
-		wxRadioButton* m_radioBtnODTOverview;
-		wxRadioButton* m_radioBtnActuellLogbook;
-		wxRadioButton* m_radioBtnAllLogbooks;
-		wxRadioButton* m_radioBtnSelectLogbook;
-		wxButton* m_buttonSelectLogbook;
-		wxButton* m_buttonReloadCrew;
-		wxButton* m_buttonEditLayoutCrew;
-		wxRadioButton* m_radioBtnHTMLCrew;
-		wxRadioButton* m_radioBtnODTCrew;
-        wxChoice* m_choiceCrewNames;
-        wxTextCtrl* m_textCtrlWakeTrip;
-        wxTextCtrl* m_textCtrlWakeDay;
-        wxChoice* m_choiceWakeDisplay;
-		wxButton* m_buttonReloadLayoutsBoat;
-		wxButton* m_buttonEditLayoutBoat;
-		wxRadioButton* m_radioBtnHTMLBoat;
-		wxRadioButton* m_radioBtnODTBoat;
-		wxStaticBoxSizer* sbSizer6;
-		wxTextCtrl* Userfield1;
-		wxTextCtrl* UserLabel2;
-		wxTextCtrl* UserLabel3;
-		wxStaticBoxSizer* sbSizer12;
-		wxPanel* m_panel13;
-		wxNotebook* m_notebook6;
-		wxButton* m_buttonAddLineService;
-		wxButton* m_buttonSaveService;
-		wxChoice* m_choiceSelectLayoutService;
-		wxButton* m_buttonReloadLayoutsServiceHTML;
-		wxButton* m_buttonEditLayoutODTService;
-		wxRadioButton* m_radioBtnHTMLService;
-		wxRadioButton* m_radioBtnODTService;
-		wxButton* m_buttonViewService;
-		wxGrid* m_gridMaintanence;
-		wxButton* m_buttonAddLineRepairs;
-		wxButton* m_buttonSaveRepairs;
-		wxChoice* m_choiceSelectLayoutRepairs;
-		wxButton* m_buttonReloadLayoutsRepairsHTML;
-		wxButton* m_buttonEditLayoutODTRepairs;
-		wxRadioButton* m_radioBtnHTMLRepairs;
-		wxRadioButton* m_radioBtnODTRepairs;
-		wxButton* m_buttonViewRepairs;
-		wxGrid* m_gridMaintanenceRepairs;
-		wxButton* m_buttonAddLineBuyParts;
-		wxButton* m_buttonSaveBuyParts;
-		wxChoice* m_choiceSelectLayoutBuyParts;
-		wxButton* m_buttonReloadLayoutsBuyPartsHTML;
-		wxButton* m_buttonEditLayoutODTBuyParts;
-		wxRadioButton* m_radioBtnHTMLBuyParts;
-		wxRadioButton* m_radioBtnODTBuyParts;
-		wxButton* m_buttonViewBuyParts;
-		wxGrid* m_gridMaintenanceBuyParts;
-        wxPanel* m_panelPolar;
-
-		LogbookDialog( logbookkonni_pi* d, wxTimer* t, LogbookTimer* lt, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Active Logbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1010,535 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER);
-		~LogbookDialog();
-		
-		void m_gridGlobalOnContextMenu( wxMouseEvent &event )
-		{
-			m_gridGlobal->PopupMenu( m_menu1, event.GetPosition() );
-		}
-
-		void m_gridServiceOnContextMenu( wxMouseEvent &event )
-		{
-			m_gridMaintanence->PopupMenu( m_menu7, event.GetPosition() );
-		}
-		
-		void m_splitter1OnIdle( wxIdleEvent& )
-		{
-			m_splitter1->SetSashPosition( 310 );
-			m_splitter1->Disconnect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::m_splitter1OnIdle ), NULL, this );
-		}
-
-		void m_splitterWatchOnIdle( wxIdleEvent& )
-		{
-			m_splitterWatch->UpdateSize();
-			m_splitterWatch->SetSashPosition( 0 );
-			m_splitterWatch->Disconnect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::m_splitterWatchOnIdle ), NULL, this );
-		}
-		
-
-		static bool myParseDate(wxString s,wxDateTime  &dt);
-		static bool myParseTime(wxString s, wxDateTime &dt);
-		static void setDatePattern();
-
-		void setTitleExt();
-		wxString replaceDangerChar(wxString s);
-		wxString restoreDangerChar(wxString s);
-		void startBrowser(wxString filename);
-		void startApplication(wxString filename, wxString ext);
-		void loadLayoutChoice(int grid, wxString path, wxChoice* choice, wxString filter);
-		void setEqualRowHeight(int row);
-		void init();
-		void OnTimerGPS(wxTimerEvent& ev);
-		void OnLogTimer(wxTimerEvent& ev);
-        void OnTimerSails(wxTimerEvent& ev);
-        int  showLayoutDialog(int grid, wxChoice *choice, wxString location, int format);
-		bool isInArrayString(wxArrayString ar, wxString s);
-		wxDateTime getDateTo(wxString filename);
-		void loadTimerEx();
-		int setBulletColor(myBitmapButton* button, bool* option, int on);
-		int  checkBitmaps();
-		void refreshBullets();
-		void startNormalTimer();
-		void resetBullets();
-		void deselectAllLogbookGrids();
-        void writeToRouteDlg(wxJSONValue data);
-        void setToNumberEngine();
-        void setShowGenerator();
-    void stopEngine1(bool enable, bool print);
-    void stopEngine2(bool enable, bool show, bool print);
-    void stopGenerator(bool enabled, bool show, bool print);
-    void startEngine1(bool enabled, bool active, bool print);
-    void startEngine2(bool enabled, bool active, bool print);
-    void startGenerator(bool enabled, bool active, bool print);
-        void resetSails();
-        void setCheckboxLabels();
-        void setSailsGap();
-        void setAbbreviations();
-        void setCheckboxSails();
-        void stateSails();
-
-		logbookkonni_pi*	  logbookPlugIn;
-		wxString*			  pHome_Locn;
-        wxString			  basePath;
-		wxString              data;
-		wxString              image_locn;
-		wxString              help_locn;
-		wxString              clouds_locn;
-		Logbook*			  logbook;
-		OverView*			  overview;
-        wxString			  onOff[2];
-        wxString			  panelOnOff[2];
-        wxCheckBox*			  checkboxSails[14];
-
-		static wxString		datePattern;
-		static wxChar		dateSeparator;
-		wxString			decimalPoint;
-
-		wxMenuItem*			menuItemTimer;
-		wxString			layoutHTML;
-		wxString			layoutODT;
-		LogbookTimer*		logbookTimerWindow;
-		wxTimer*            timer;
-		wxTimer*			GPSTimer;
-        wxTimer*			SailsTimer;
-		bool				statusGPS;
-		wxTimer*			logbookTimer;
-		int					fullHourPlus;
-		bool				fullHourModified;
-		int					sashPos; 
-
-		wxColour			defaultBackground;
-		int					gridGlobalCol;
-		int					gridWeatherCol;
-		int					gridMotorSailsCol;
-
-		int					selGridRow;
-		int					selGridCol;
-
-		wxGrid				*logGrids[LOGGRIDS];
-		int					numPages;
-		int					totalColumns;
-		wxFont				font;
-
-		// ODT-Strings for Export
-		wxString			content;
-		wxString			contentEnd;
-		wxString			manifest;
-		wxString			styles;
-		wxString			meta;
-
-		// XML-String for Export Excel
-		wxString			xmlHead;
-		wxString			xmlEnd;
-
-        // KML-String for Export
-        wxString			kmlHead;
-        wxString			kmlFolder;
-        wxString			kmlLine;
-        wxString			kmlEndFolder;
-        wxString			kmlBody;
-        wxString			kmlEnd;
-        wxString			kmlPathHeader;
-        wxString			kmlPathFooter;
+    wxTextCtrl* m_textCtrl95;
+    wxStaticText* m_staticText141;
+    wxTextCtrl* m_textCtrl96;
+    wxStaticText* m_staticText142;
+    wxTextCtrl* m_textCtrl100;
+    wxStaticText* m_staticText143;
+    wxTextCtrl* m_textCtrl98;
+    wxStaticLine* m_staticline421;
+    wxButton* m_button61;
+    wxStaticLine* m_staticline431;
+    wxChoice* m_choice32;
+    wxButton* m_buttonSavePolar;
+    wxTextCtrl* m_textCtrl99;
+    wxPanel* m_panel22;
+    wxButton* m_buttonSailsReset;
+    wxBoxSizer* bSizerPolar;
+    wxStaticText* m_staticText144;
+    wxChoice* m_choiceDegreesPolar;
+    wxStaticLine* m_staticline441;
+    wxStaticText* m_staticText145;
+    wxStaticText* m_staticText146;
+    wxChoice* m_choiceSourcePolar;
+    wxStaticText* m_staticText148;
+    wxChoice* m_choiceWindPolar;
+    wxChoice* m_choiceWavefromPolar;
+    wxStaticText* m_staticText147;
+    wxChoice* m_choice37;
+    wxChoice* m_choiceCurrentPolar;
+    wxButton* m_button62;
+    wxStaticLine* m_staticline45;
+    wxButton* m_buttonFilterPolar;
+    wxChoice* m_choiceRingsPolar;
+
+    // Virtual event handlers, overide them in your derived class
+    void LogbookDialogOnClose( wxCloseEvent& event ) ;
+    void LogbookDialogOnInitDialog( wxInitDialogEvent& event ) ;
+    void OnNoteBookPageChangedLogbook( wxNotebookEvent& event );
+    void m_button4OnButtonClick( wxCommandEvent& event ) ;
+    void logSaveOnButtonClick( wxCommandEvent& event ) ;
+    void OnGridLabelLeftDClickGlobal( wxGridEvent& event );
+    void OnGridLabelLeftDClickWeather( wxGridEvent& event );
+    void OnGridLabelLeftDClickMotorSails( wxGridEvent& event );
+    void OnGridLabelLeftDClickOverview( wxGridEvent& event );
+    void OnGridLabelLeftDClickCrew( wxGridEvent& event );
+    void OnGridLabelLeftDClickCrewWake( wxGridEvent& event );
+    void OnMenuSelectionHiddenCrew( wxCommandEvent& event );
+    void onButtonReloadLayoutLogbook( wxCommandEvent& event ) ;
+    void onButtonClickEditLayoutLogbook( wxCommandEvent& event ) ;
+    void onRadioButtonHTML( wxCommandEvent& event ) ;
+    void onRadioButtonODT( wxCommandEvent& event ) ;
+    void logViewOnButtonClick( wxCommandEvent& event ) ;
+    void newLogbookOnButtonClick( wxCommandEvent& event ) ;
+    void selLogbookOnButtonClick( wxCommandEvent& event ) ;
+    void m_gridGlobalOnGridCellRightClick( wxGridEvent& event ) ;
+    void m_gridGlobalOnGridCmdCellChange( wxGridEvent& event ) ;
+    void m_gridGlobalOnGridSelectCell( wxGridEvent& event ) ;
+    void OnMenuSelectionHideColumn( wxCommandEvent& event );
+    void OnMenuSelectionHideColumnOverView( wxCommandEvent& event );
+    void m_gridGlobalOnKeyDown( wxKeyEvent& event ) ;
+    void m_menuItem1OnMenuSelection( wxCommandEvent& event ) ;
+    void m_gridWeatherOnGridCellRightClick( wxGridEvent& event ) ;
+    void m_gridWeatherOnGridCmdCellChange( wxGridEvent& event ) ;
+    void m_gridWeatherOnGridSelectCell( wxGridEvent& event ) ;
+    void m_gridWeatherOnKeyDown( wxKeyEvent& event ) ;
+    void m_gridMotorSailsOnGridCellRightClick( wxGridEvent& event ) ;
+    void m_gridMotorSailsOnGridCmdCellChange( wxGridEvent& event ) ;
+    void m_gridMotorSailsOnGridSelectCell( wxGridEvent& event ) ;
+    void m_gridMotorSailsOnKeyDown( wxKeyEvent& event ) ;
+    void crewAddOnButtonClick( wxCommandEvent& event ) ;
+    void crewSaveOnButtonClick( wxCommandEvent& event ) ;
+    void OnMenuSelectionOnboardCrew( wxCommandEvent& event );
+    void OnMenuSelectionAllEntriesCrew( wxCommandEvent& event );
+    void onButtonClickReloadLayoutsCrew( wxCommandEvent& event ) ;
+    void onButtonClickEditLayoutCrew( wxCommandEvent& event ) ;
+    void onRadioButtonHTMLCrew( wxCommandEvent& event ) ;
+    void onRadioButtonODTCrew( wxCommandEvent& event ) ;
+    void crewViewOnButtonClick( wxCommandEvent& event ) ;
+    void m_gridCrewOnGridCellChange( wxGridEvent& event ) ;
+    void m_gridCrewOnGridCellRightClick( wxGridEvent& event ) ;
+    void m_menuItem2OnMenuSelection( wxCommandEvent& event ) ;
+    void m_gridCrewWakeOnGridCellChange( wxGridEvent& event ) ;
+    void boataddEquipmentButtonOnButtonClick( wxCommandEvent& event ) ;
+    void boatSaveOnButtonClick( wxCommandEvent& event ) ;
+    void onButtonClickReloadLayoutsBoat( wxCommandEvent& event ) ;
+    void onButtonClickEditLayoutBoat( wxCommandEvent& event ) ;
+    void onRadioButtonHTMLBoat( wxCommandEvent& event ) ;
+    void onRadioButtonODTBoat( wxCommandEvent& event ) ;
+    void boatViewOnButtonClick( wxCommandEvent& event ) ;
+    void boatNameOnTextEnter( wxCommandEvent& event ) ;
+    void m_gridEquipmentOnGridCellChange( wxGridEvent& event ) ;
+    void m_gridEquipmentOnGridCellRightClick( wxGridEvent& event ) ;
+    void m_menuItem3OnMenuSelection( wxCommandEvent& event ) ;
+    void OnMenuSelectionShowHiddenCols( wxCommandEvent& event );
+    void onButtobClickAddLineService( wxCommandEvent& event ) ;
+    void onButtobClickSaveService( wxCommandEvent& event ) ;
+    void onButtonClickReloadLayoutsServiceHTML( wxCommandEvent& event ) ;
+    void onButtonClickEditLayoutODTService( wxCommandEvent& event ) ;
+    void onRadioButtonHTMLService( wxCommandEvent& event ) ;
+    void onRadioButtonODTService( wxCommandEvent& event ) ;
+    void onButtonClickViewService( wxCommandEvent& event ) ;
+    void onGridCellServiceChange( wxGridEvent& event ) ;
+    void onGridCellRightClickService( wxGridEvent& event ) ;
+    void onGridCellServiceSelected( wxGridEvent& event ) ;
+    void OnKeyDownService( wxKeyEvent& event ) ;
+    void onMenuSelectionServiceOK( wxCommandEvent& event ) ;
+    void onMenuSelectionServiceBuyParts( wxCommandEvent& event ) ;
+    void onMenuSelectionServiceDelete( wxCommandEvent& event ) ;
+    void onButtobClickAddLineRepairs( wxCommandEvent& event ) ;
+    void onButtobClickSaveRepairs( wxCommandEvent& event ) ;
+    void onButtonClickReloadLayoutsRepairsHTML( wxCommandEvent& event ) ;
+    void onButtonClickEditLayoutODTRepairs( wxCommandEvent& event ) ;
+    void onRadioButtonHTMLRepairs( wxCommandEvent& event ) ;
+    void onRadioButtonODTRepairs( wxCommandEvent& event ) ;
+    void onButtonClickViewRepairs( wxCommandEvent& event ) ;
+    void onGridCellRepairsChange( wxGridEvent& event ) ;
+    void onGridCellRightClickRepairs( wxGridEvent& event ) ;
+    void onGridCellRepairsSelected( wxGridEvent& event ) ;
+    void OnKeyDownRepairs( wxKeyEvent& event ) ;
+    void onMenuSelectionRepairsOK( wxCommandEvent& event ) ;
+    void onMenuSelectionRepairsBuyParts( wxCommandEvent& event ) ;
+    void onMenuSelectionRepairsDelete( wxCommandEvent& event ) ;
+    void onButtobClickAddLineBuyParts( wxCommandEvent& event ) ;
+    void onButtobClickSaveBuyParts( wxCommandEvent& event ) ;
+    void onButtonClickReloadLayoutsBuyPartsHTML( wxCommandEvent& event ) ;
+    void onButtonClickEditLayoutODTBuyParts( wxCommandEvent& event ) ;
+    void onRadioButtonHTMLBuyParts( wxCommandEvent& event ) ;
+    void onRadioButtonODTBuyParts( wxCommandEvent& event ) ;
+    void onButtonClickViewBuyParts( wxCommandEvent& event ) ;
+    void onGridCellChangeBuyParts( wxGridEvent& event ) ;
+    void onGridCellRightClickBuyParts( wxGridEvent& event ) ;
+    void onGridEditorHidden( wxGridEvent& event ) ;
+    void onGridEditorShow( wxGridEvent& event ) ;
+    void onGridCellSelectedBuyParts( wxGridEvent& event ) ;
+    void OnKeyDownBuyParts( wxKeyEvent& event ) ;
+    void onMenuSelectionBuyPartsDelete( wxCommandEvent& event ) ;
+    void OnButtonClickOverviewSave( wxCommandEvent& event );
+    void onButtonReloadLayoutOverView( wxCommandEvent& event );
+    void onButtonClickEditLayoutOverview( wxCommandEvent& event );
+    void onRadioButtonHTMLOverview( wxCommandEvent& event );
+    void onRadioButtonODTOverView( wxCommandEvent& event );
+    void OnButtonClickOverView( wxCommandEvent& event );
+    void OnGridCellRightClickOverview( wxGridEvent& event );
+    void OnGridLabelLeftClickOverview( wxGridEvent& event );
+    void OnMenuSelectionGotoRoute( wxCommandEvent& event );
+    void OnMenuSelectionShowHiddenColsOverview( wxCommandEvent& event );
+    void onButtonClickSelectLogbook( wxCommandEvent& event );
+    void OnRadioButtonActualLogbook( wxCommandEvent& event );
+    void OnRadioButtonAllLogbooks( wxCommandEvent& event );
+    void onGridCellLeftClickService( wxGridEvent& event );
+    void onGridCellLeftClickBuyParts( wxGridEvent& event );
+    void OnToggleButtonShowEquip( wxCommandEvent& event );
+    void OnKeyDownOverview( wxKeyEvent& event );
+    void OnMenuSelectionSearch( wxCommandEvent& event );
+    void OnMenuSelectionNewWatchWake( wxCommandEvent& event );
+    void OnGridCellRightClickWake( wxGridEvent& event );
+    void OnMenuSelectionAddWatch( wxCommandEvent& event );
+    void OnMenuSelectionSameWatch( wxCommandEvent& event );
+    void OnGridLabelLeftClickService( wxGridEvent& event );
+    void OnGridLabelLeftClickRepairs( wxGridEvent& event );
+    void OnGridLabelLeftClickBuyParts( wxGridEvent& event );
+    void OnGridCellLeftClickGlobal( wxGridEvent& event );
+    void OnMenuSelectionAsc( wxCommandEvent& event );
+    void OnMenuSelectionDesc( wxCommandEvent& event );
+    void OnKeyDownCrew( wxKeyEvent& event );
+    void OnKeyDownWatch( wxKeyEvent& event );
+    void OnButtonClickWakeClear( wxCommandEvent& event );
+    void OnMenuSelectionShutdown( wxCommandEvent& event );
+    void OnGridLabelRightClickGlobal( wxGridEvent& event );
+    void OnGridLabelRightClickWeather( wxGridEvent& event );
+    void OnGridLabelRightClickMotorSails( wxGridEvent& event );
+    void OnLeftUpDistance( wxMouseEvent& event );
+    void OnLeftUpCourse( wxMouseEvent& event );
+    void OnLeftUpCourseMin( wxMouseEvent& event );
+    void OnLeftUpStartTime( wxMouseEvent& event );
+    void OnLeftUpDays( wxMouseEvent& event );
+    void OnLeftUpDay( wxMouseEvent& event );
+    void OnNotebookPageChangedLoggrids( wxNotebookEvent& event );
+    void OnButtomClickStatusbarGlobal( wxCommandEvent& event );
+    void OnClickButtonHelpGlobal( wxCommandEvent& event );
+    void OnChoiceGlobal( wxCommandEvent& event );
+    void OnChoiceCrew( wxCommandEvent& event );
+    void OnChoiceBoat( wxCommandEvent& event );
+    void OnChoiceBoatOverview( wxCommandEvent& event );
+    void OnChoiceService( wxCommandEvent& event );
+    void OnChoiceBuyParts( wxCommandEvent& event );
+    void OnChoiceRepairs( wxCommandEvent& event );
+    void OnGridBeginDragCrew( wxGridEvent& event );
+    void OnGridBeginDragWatch( wxGridEvent& event );
+    void m_gridCrewOnGridCellLeftClick( wxGridEvent& event );
+    void OnButtonClickCalculate( wxCommandEvent& event );
+    void OnButtonClickReset( wxCommandEvent& event );
+    void OnButtonClickDayPlus( wxCommandEvent& event );
+    void OnButtonClickNow( wxCommandEvent& event );
+    void OnButtonClickDayMinus( wxCommandEvent& event );
+    void OnLeftDownWatchStartDate( wxMouseEvent& event );
+    void OnTextEnterWatchTime( wxCommandEvent& event );
+    void OnGridCellLeftClickWatch( wxGridEvent& event );
+    void OnGridEditorShownWatch( wxGridEvent& event );
+    void OnGridEditorHiddenWatch( wxGridEvent& event );
+    void OnGridEditorCreatedWatch( wxGridEditorCreatedEvent& event );
+    void OnMotion( wxMouseEvent& event );
+    void OnGridEditorShownCrew( wxGridEvent& event );
+    void OnMenuSelectionSplitWatch( wxCommandEvent& event );
+    void OnMenuSelectionMergeWatch( wxCommandEvent& event );
+    void OnTextEnterDayWake( wxCommandEvent& event );
+    void OnMenuSelectionDeleteMembers( wxCommandEvent& event );
+    void OnSplitterSashPositionChangedWake( wxSplitterEvent& event );
+    void OnGridLabelRightClickWake( wxGridEvent& event );
+    void OnGridLabelLeftClickWake( wxGridEvent& event );
+    void OnIdleMainDialog( wxIdleEvent& event );
+    void OnButtonClickStatusTimer( wxCommandEvent& event );
+    void OnStatusBulletTimer( wxCommandEvent& event );
+    void OnStatusBulletWatch( wxCommandEvent& event );
+    void OnStatusBulletWaypoint( wxCommandEvent& event );
+    void OnStatusBulletDistance( wxCommandEvent& event );
+    void OnStatusBulletCourse( wxCommandEvent& event );
+    void OnButtonClickStatusStartStop( wxCommandEvent& event );
+    void OnTextEnterStatusDistance( wxCommandEvent& event );
+    void OnTextEnterStatusCourseDeg( wxCommandEvent& event );
+    void OnTextEnterStatusMinutes( wxCommandEvent& event );
+    void OnGridLabelLeftClickGlobal( wxGridEvent& event );
+    void OnGridLabelLeftClickWeather( wxGridEvent& event );
+    void OnGridLabelLeftClickMotorSails( wxGridEvent& event );
+    void onMenuSelectionDeleteRows( wxCommandEvent& event );
+    void OnMenuSelectionFlip( wxCommandEvent& event );
+    void OnMenuSelectionFlipWatches( wxCommandEvent& event );
+    void OnButtomClickShowHideLayout( wxCommandEvent& event );
+    void OnToggleButtonEngine1( wxCommandEvent& event );
+    void OnToggleButtonEngine2( wxCommandEvent& event );
+    void OnToggleButtonGenerator( wxCommandEvent& event );
+    void OnButtonClickResetSails( wxCommandEvent& event );
+    void OnCheckboxSails( wxCommandEvent& event );
+
+    void OnComboUpService( wxCommandEvent& event );
+    void OnComboUpRepairs( wxCommandEvent& event );
+    void OnComboUpBuyParts( wxCommandEvent& event );
+
+    void m_menu1Highlighted( wxMenuEvent& event );
+
+    void gridGlobalScrolled( wxScrollWinEvent& event );
+    void gridWeatherScrolled( wxScrollWinEvent& event );
+    void gridMotorSailsScrolled( wxScrollWinEvent& event );
+
+    void appendOSDirSlash( wxString* pString );
+
+    void getIniValues();
+    void setIniValues();
+    void flipMonthDay();
+    void deleteRows();
+    void setBulletColorAllStates( myBitmapButton* button, wxBitmap bmp );
+
+public:
+    enum maintenanceTab {SERVICE,REPAIRS,BUYPARTS};
+    enum FORMAT {HTML,ODT};
+
+    wxPanel* m_panel2;
+    wxBoxSizer* bSizer6;
+    wxPanel* m_panelLayout;
+    wxButton* m_buttonReloadLayout;
+    wxButton* m_buttonEditLayout;
+    wxPanel* m_panelEngine;
+    wxToggleButton* m_toggleBtnEngine1;
+    wxToggleButton* m_toggleBtnEngine2;
+    wxToggleButton* m_toggleBtnGenerator;
+    wxFlexGridSizer* fgSizerSails;
+    wxRadioButton* m_radioBtnHTML;
+    wxRadioButton* m_radioBtnODT;
+    wxGrid* m_gridGlobal;
+    wxMenu* m_menu1;
+    wxPanel* Statusbar;
+    wxChoice* overviewChoice;
+    wxButton* m_buttonReloadLayoutOview;
+    wxButton* m_buttonEditLayoutOview;
+    wxRadioButton* m_radioBtnHTMLOverview;
+    wxRadioButton* m_radioBtnODTOverview;
+    wxRadioButton* m_radioBtnActualLogbook;
+    wxRadioButton* m_radioBtnAllLogbooks;
+    wxRadioButton* m_radioBtnSelectLogbook;
+    wxButton* m_buttonSelectLogbook;
+    wxButton* m_buttonReloadCrew;
+    wxButton* m_buttonEditLayoutCrew;
+    wxRadioButton* m_radioBtnHTMLCrew;
+    wxRadioButton* m_radioBtnODTCrew;
+    wxChoice* m_choiceCrewNames;
+    wxTextCtrl* m_textCtrlWakeTrip;
+    wxTextCtrl* m_textCtrlWakeDay;
+    wxChoice* m_choiceWakeDisplay;
+    wxButton* m_buttonReloadLayoutsBoat;
+    wxButton* m_buttonEditLayoutBoat;
+    wxRadioButton* m_radioBtnHTMLBoat;
+    wxRadioButton* m_radioBtnODTBoat;
+    wxStaticBoxSizer* sbSizer6;
+    wxTextCtrl* Userfield1;
+    wxTextCtrl* UserLabel2;
+    wxTextCtrl* UserLabel3;
+    wxStaticBoxSizer* sbSizer12;
+    wxPanel* m_panel13;
+    wxNotebook* m_notebook6;
+    wxButton* m_buttonAddLineService;
+    wxButton* m_buttonSaveService;
+    wxChoice* m_choiceSelectLayoutService;
+    wxButton* m_buttonReloadLayoutsServiceHTML;
+    wxButton* m_buttonEditLayoutODTService;
+    wxRadioButton* m_radioBtnHTMLService;
+    wxRadioButton* m_radioBtnODTService;
+    wxButton* m_buttonViewService;
+    wxGrid* m_gridMaintanence;
+    wxButton* m_buttonAddLineRepairs;
+    wxButton* m_buttonSaveRepairs;
+    wxChoice* m_choiceSelectLayoutRepairs;
+    wxButton* m_buttonReloadLayoutsRepairsHTML;
+    wxButton* m_buttonEditLayoutODTRepairs;
+    wxRadioButton* m_radioBtnHTMLRepairs;
+    wxRadioButton* m_radioBtnODTRepairs;
+    wxButton* m_buttonViewRepairs;
+    wxGrid* m_gridMaintanenceRepairs;
+    wxButton* m_buttonAddLineBuyParts;
+    wxButton* m_buttonSaveBuyParts;
+    wxChoice* m_choiceSelectLayoutBuyParts;
+    wxButton* m_buttonReloadLayoutsBuyPartsHTML;
+    wxButton* m_buttonEditLayoutODTBuyParts;
+    wxRadioButton* m_radioBtnHTMLBuyParts;
+    wxRadioButton* m_radioBtnODTBuyParts;
+    wxButton* m_buttonViewBuyParts;
+    wxGrid* m_gridMaintenanceBuyParts;
+    wxPanel* m_panelPolar;
+
+    LogbookDialog( logbookkonni_pi* d, wxTimer* t, LogbookTimer* lt, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _( "Active Logbook" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1010,535 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~LogbookDialog();
+
+    void m_gridGlobalOnContextMenu( wxMouseEvent &event )
+    {
+        m_gridGlobal->PopupMenu( m_menu1, event.GetPosition() );
+    }
+
+    void m_gridServiceOnContextMenu( wxMouseEvent &event )
+    {
+        m_gridMaintanence->PopupMenu( m_menu7, event.GetPosition() );
+    }
+
+    void m_splitter1OnIdle( wxIdleEvent& )
+    {
+        m_splitter1->SetSashPosition( 310 );
+        m_splitter1->Disconnect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::m_splitter1OnIdle ), NULL, this );
+    }
+
+    void m_splitterWatchOnIdle( wxIdleEvent& )
+    {
+        m_splitterWatch->UpdateSize();
+        m_splitterWatch->SetSashPosition( 0 );
+        m_splitterWatch->Disconnect( wxEVT_IDLE, wxIdleEventHandler( LogbookDialog::m_splitterWatchOnIdle ), NULL, this );
+    }
+
+
+    static bool myParseDate( wxString s,wxDateTime  &dt );
+    static bool myParseTime( wxString s, wxDateTime &dt );
+    static void setDatePattern();
+
+    void setTitleExt();
+    wxString replaceDangerChar( wxString s );
+    wxString restoreDangerChar( wxString s );
+    void startBrowser( wxString filename );
+    void startApplication( wxString filename, wxString ext );
+    void loadLayoutChoice( int grid, wxString path, wxChoice* choice, wxString filter );
+    void setEqualRowHeight( int row );
+    void init();
+    void OnTimerGPS( wxTimerEvent& ev );
+    void OnLogTimer( wxTimerEvent& ev );
+    void OnTimerSails( wxTimerEvent& ev );
+    int  showLayoutDialog( int grid, wxChoice *choice, wxString location, int format );
+    bool isInArrayString( wxArrayString ar, wxString s );
+    wxDateTime getDateTo( wxString filename );
+    void loadTimerEx();
+    int setBulletColor( myBitmapButton* button, bool* option, int on );
+    int  checkBitmaps();
+    void refreshBullets();
+    void startNormalTimer();
+    void resetBullets();
+    void deselectAllLogbookGrids();
+    void writeToRouteDlg( wxJSONValue data );
+    void setToNumberEngine();
+    void setShowGenerator();
+    void stopEngine1( bool enable, bool print );
+    void stopEngine2( bool enable, bool show, bool print );
+    void stopGenerator( bool enabled, bool show, bool print );
+    void startEngine1( bool enabled, bool active, bool print );
+    void startEngine2( bool enabled, bool active, bool print );
+    void startGenerator( bool enabled, bool active, bool print );
+    void resetSails();
+    void setCheckboxLabels();
+    void setSailsGap();
+    void setAbbreviations();
+    void setCheckboxSails();
+    void stateSails();
+
+    logbookkonni_pi*	  logbookPlugIn;
+    wxString			  Home_Locn;
+    wxString			  basePath;
+    wxString              data;
+    wxString              image_locn;
+    wxString              help_locn;
+    wxString              clouds_locn;
+    Logbook*			  logbook;
+    OverView*			  overview;
+    wxString			  onOff[2];
+    wxString			  panelOnOff[2];
+    wxCheckBox*			  checkboxSails[14];
+
+    static wxString		datePattern;
+    static wxChar		dateSeparator;
+    wxString			decimalPoint;
+
+    wxMenuItem*			menuItemTimer;
+    wxString			layoutHTML;
+    wxString			layoutODT;
+    LogbookTimer*		logbookTimerWindow;
+    wxTimer*            timer;
+    wxTimer*			GPSTimer;
+    wxTimer*			SailsTimer;
+    bool				statusGPS;
+    wxTimer*			logbookTimer;
+    int					fullHourPlus;
+    bool				fullHourModified;
+    int					sashPos;
+
+    wxColour			defaultBackground;
+    int					gridGlobalCol;
+    int					gridWeatherCol;
+    int					gridMotorSailsCol;
+
+    int					selGridRow;
+    int					selGridCol;
+
+    wxGrid				*logGrids[LOGGRIDS];
+    int					numPages;
+    int					totalColumns;
+    wxFont				font;
+
+    // ODT-Strings for Export
+    wxString			content;
+    wxString			contentEnd;
+    wxString			manifest;
+    wxString			styles;
+    wxString			meta;
+
+    // XML-String for Export Excel
+    wxString			xmlHead;
+    wxString			xmlEnd;
+
+    // KML-String for Export
+    wxString			kmlHead;
+    wxString			kmlFolder;
+    wxString			kmlLine;
+    wxString			kmlEndFolder;
+    wxString			kmlBody;
+    wxString			kmlEnd;
+    wxString			kmlPathHeader;
+    wxString			kmlPathFooter;
 
-		wxString			titleExt;
+    wxString			titleExt;
 };
 
 ///////////////////////////////////////////////////////////////////////////
@@ -767,107 +768,107 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class RouteDialog
 ///////////////////////////////////////////////////////////////////////////////
-class RouteDialog : public wxDialog 
+class RouteDialog : public wxDialog
 {
-	private:
-	
-	protected:
-	
-	public:
-		wxListCtrl* m_listCtrlRoute;
-		wxStdDialogButtonSizer* m_sdbSizer6;
-		wxButton* m_sdbSizer6OK;
-		wxButton* m_sdbSizer6Cancel;
-		
-		RouteDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Route"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 269,318 ), long style = wxDEFAULT_DIALOG_STYLE );
-		~RouteDialog();
-	
+private:
+
+protected:
+
+public:
+    wxListCtrl* m_listCtrlRoute;
+    wxStdDialogButtonSizer* m_sdbSizer6;
+    wxButton* m_sdbSizer6OK;
+    wxButton* m_sdbSizer6Cancel;
+
+    RouteDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _( "Select Route" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 269,318 ), long style = wxDEFAULT_DIALOG_STYLE );
+    ~RouteDialog();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LayoutDialog
 ///////////////////////////////////////////////////////////////////////////////
-class LayoutDialog : public wxDialog 
+class LayoutDialog : public wxDialog
 {
-	private:
-	
-	protected:
-		wxBitmapButton* m_bpButtonLoadLayout;
-		wxStdDialogButtonSizer* m_sdbSizer3;
-		wxButton* m_sdbSizer3OK;
-		wxButton* m_sdbSizer3Cancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		 void OnButtonClickLoadLayout( wxCommandEvent& event );
-         void OnChoice( wxCommandEvent& event );
-         void OnText( wxCommandEvent& event );
-
-
-	public:
-		wxRadioButton* m_radioBtnEdit;
-		wxRadioButton* m_radioBtnFilter;
-		wxRadioButton* m_radioBtnRename;
-		wxTextCtrl* m_textCtrlRename;
-		wxRadioButton* m_radioBtnDelete;
-		wxRadioButton* m_radioBtnEmail;
-		wxRadioButton* m_radioBtnInstall;
-		wxChoice* m_choice15;
-		wxString layoutPath;
-		wxString layoutFileName;
-		LogbookDialog *dialog;
-#ifdef __WXMSW__		
-		LayoutDialog( wxWindow* parent, wxString location, wxChoice* choice,wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 307,205 ), long style = wxDEFAULT_DIALOG_STYLE );
+private:
+
+protected:
+    wxBitmapButton* m_bpButtonLoadLayout;
+    wxStdDialogButtonSizer* m_sdbSizer3;
+    wxButton* m_sdbSizer3OK;
+    wxButton* m_sdbSizer3Cancel;
+
+    // Virtual event handlers, overide them in your derived class
+    void OnButtonClickLoadLayout( wxCommandEvent& event );
+    void OnChoice( wxCommandEvent& event );
+    void OnText( wxCommandEvent& event );
+
+
+public:
+    wxRadioButton* m_radioBtnEdit;
+    wxRadioButton* m_radioBtnFilter;
+    wxRadioButton* m_radioBtnRename;
+    wxTextCtrl* m_textCtrlRename;
+    wxRadioButton* m_radioBtnDelete;
+    wxRadioButton* m_radioBtnEmail;
+    wxRadioButton* m_radioBtnInstall;
+    wxChoice* m_choice15;
+    wxString layoutPath;
+    wxString layoutFileName;
+    LogbookDialog *dialog;
+#ifdef __WXMSW__
+    LayoutDialog( wxWindow* parent, wxString location, wxChoice* choice,wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 307,205 ), long style = wxDEFAULT_DIALOG_STYLE );
 #else
-		LayoutDialog( wxWindow* parent, wxString location, wxChoice* choice,wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 307,230 ), long style = wxDEFAULT_DIALOG_STYLE );
-		
+    LayoutDialog( wxWindow* parent, wxString location, wxChoice* choice,wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 307,230 ), long style = wxDEFAULT_DIALOG_STYLE );
+
 #endif
-		~LayoutDialog();
-	
+    ~LayoutDialog();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SelectLogbookDialog
 ///////////////////////////////////////////////////////////////////////////////
-class SelectLogbook : public wxDialog 
+class SelectLogbook : public wxDialog
 {
-	private:
-		wxString path;
-		LogbookDialog* parent;
-		wxDateTime getDateTo(wxString filename);	
-	protected:
-		wxStdDialogButtonSizer* m_sdbSizer4;
-		wxButton* m_sdbSizer4OK;
-		wxButton* m_sdbSizer4Cancel;
-		
-		void OnInit( wxInitDialogEvent& event );
-        void OnCellSelecttion( wxGridEvent& event );
-        void OnGridCellChange( wxGridEvent& event );
-        void OnKeyDown( wxKeyEvent& event );
-	
-	public:
-		wxGrid* m_grid13;
-		wxArrayString files;
-        int selRow;
+private:
+    wxString path;
+    LogbookDialog* parent;
+    wxDateTime getDateTo( wxString filename );
+protected:
+    wxStdDialogButtonSizer* m_sdbSizer4;
+    wxButton* m_sdbSizer4OK;
+    wxButton* m_sdbSizer4Cancel;
+
+    void OnInit( wxInitDialogEvent& event );
+    void OnCellSelecttion( wxGridEvent& event );
+    void OnGridCellChange( wxGridEvent& event );
+    void OnKeyDown( wxKeyEvent& event );
+
+public:
+    wxGrid* m_grid13;
+    wxArrayString files;
+    int selRow;
 
-#ifdef __WXMSW__		
-		SelectLogbook( wxWindow* parent, wxString path, wxWindowID id = wxID_ANY, const wxString& title = _("Select Logbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 700,252), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+#ifdef __WXMSW__
+    SelectLogbook( wxWindow* parent, wxString path, wxWindowID id = wxID_ANY, const wxString& title = _( "Select Logbook" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 700,252 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 #else
-		SelectLogbook( wxWindow* parent, wxString path, wxWindowID id = wxID_ANY, const wxString& title = _("Select Logbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,350), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER  );		
+    SelectLogbook( wxWindow* parent, wxString path, wxWindowID id = wxID_ANY, const wxString& title = _( "Select Logbook" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 610,350 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER  );
 #endif
-		~SelectLogbook();
-	
+    ~SelectLogbook();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////
-WX_DECLARE_OBJARRAY(wxArrayString, myGridStringArray);//(,
-                              //class WXDLLIMPEXP_ADV);
+WX_DECLARE_OBJARRAY( wxArrayString, myGridStringArray ); //(,
+//class WXDLLIMPEXP_ADV);
 
 class myGridStringTable : public wxGridTableBase
 {
 public:
     myGridStringTable();
     myGridStringTable( int numRows, int numCols );
-     ~myGridStringTable();
+    ~myGridStringTable();
 
     // these are pure virtual in wxGridTableBase
     //
@@ -907,277 +908,288 @@
 };
 
 class myTreeItem;
-//////////////////// D�alog ColdFinger //////////////////////////////////
-class ColdFinger : public wxDialog 
+//////////////////// Dialog ColdFinger //////////////////////////////////
+class ColdFinger : public wxDialog
 {
-	private:
-		LogbookDialog	*dialog;
-	    bool			modified;
-		wxString		dataPath;
-		wxImageList*    imageList; 
-
-		void            init();
-		void			addElement(TiXmlElement* root, const char* key, const char* label);
-		wxTreeItemId	recursiveWrite(wxTreeItemId id, TiXmlElement *elem);
-		void			fillTree(wxTreeItemId id, TiXmlNode *elem);
-
-	protected:
-		wxSplitterWindow* m_splitter2;
-		wxPanel* m_panel18;
-		wxMenu* m_menu9;
-		wxPanel* m_panel19;
-		wxStaticText* m_staticText94;
-		wxStaticText* m_staticText95;
-		wxChoice* m_choice23;
-		wxStaticText* m_staticText96;
-		wxChoice* m_choice24;
-		wxStaticLine* m_staticline32;
-		wxStaticText* m_staticText97;
-		wxStdDialogButtonSizer* m_sdbSizer8;
-		wxButton* m_sdbSizer8OK;
-		wxButton* m_sdbSizer8Cancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		 void OnCloseCold( wxCloseEvent& event );
-		 void OnInitDialog( wxInitDialogEvent& event );
-		 void OnTreeBeginDragCold( wxTreeEvent& event );
-		 void OnTreeEndDragCold( wxTreeEvent& event );
-		 void OnTreeItemRightClickCold( wxTreeEvent& event );
-		 void OnTreeSelChanged( wxTreeEvent& event );
-		 void OnMenuSelectionAddCold( wxCommandEvent& event );
-		 void OnMenuSelectionDeleteCold( wxCommandEvent& event );
-		 void OnMenuSelectionRenameCold( wxCommandEvent& event );
-		 void OnMenuSelectionaddNodeCold( wxCommandEvent& event );
-		 void OnMenuTreeSelectionDeleteNodeCold( wxCommandEvent& event );
-		 void OnTextCold( wxCommandEvent& event );
-		 void OnCancelButtonClickCold( wxCommandEvent& event );
-		 void OnOKButtonClickCold( wxCommandEvent& event );
-		
-	
-	public:
-		enum treenodes { NODE,ITEM };
-		wxTreeCtrl* m_treeCtrl3;
-		wxTextCtrl* m_textCtrl73;
-		myTreeItem* retItem;
-		wxTreeItemId selectedItem;
-		int				fo; 
-		int				it;
-		
-		ColdFinger( LogbookDialog* parent,  wxWindowID id = wxID_ANY, const wxString& title = _("Textblocks Dialog"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 524,392 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~ColdFinger();
-
-		void	writeTextblocks();
-        void	loadTextBlocks();
-		
-		void m_splitter2OnIdle( wxIdleEvent& )
-		{
-			m_splitter2->SetSashPosition( 0 );
-			m_splitter2->Disconnect( wxEVT_IDLE, wxIdleEventHandler( ColdFinger::m_splitter2OnIdle ), NULL, this );
-		}
+private:
+    LogbookDialog	*dialog;
+    bool			modified;
+    wxString		dataPath;
+    wxImageList*    imageList;
+
+    void            init();
+    void			addElement( TiXmlElement* root, const char* key, const char* label );
+    wxTreeItemId	recursiveWrite( wxTreeItemId id, TiXmlElement *elem );
+    void			fillTree( wxTreeItemId id, TiXmlNode *elem );
+
+protected:
+    wxSplitterWindow* m_splitter2;
+    wxPanel* m_panel18;
+    wxMenu* m_menu9;
+    wxPanel* m_panel19;
+    wxStaticText* m_staticText94;
+    wxStaticText* m_staticText95;
+    wxChoice* m_choice23;
+    wxStaticText* m_staticText96;
+    wxChoice* m_choice24;
+    wxStaticLine* m_staticline32;
+    wxStaticText* m_staticText97;
+    wxStdDialogButtonSizer* m_sdbSizer8;
+    wxButton* m_sdbSizer8OK;
+    wxButton* m_sdbSizer8Cancel;
+
+    // Virtual event handlers, overide them in your derived class
+    void OnCloseCold( wxCloseEvent& event );
+    void OnInitDialog( wxInitDialogEvent& event );
+    void OnTreeBeginDragCold( wxTreeEvent& event );
+    void OnTreeEndDragCold( wxTreeEvent& event );
+    void OnTreeItemRightClickCold( wxTreeEvent& event );
+    void OnTreeSelChanged( wxTreeEvent& event );
+    void OnMenuSelectionAddCold( wxCommandEvent& event );
+    void OnMenuSelectionDeleteCold( wxCommandEvent& event );
+    void OnMenuSelectionRenameCold( wxCommandEvent& event );
+    void OnMenuSelectionaddNodeCold( wxCommandEvent& event );
+    void OnMenuTreeSelectionDeleteNodeCold( wxCommandEvent& event );
+    void OnTextCold( wxCommandEvent& event );
+    void OnCancelButtonClickCold( wxCommandEvent& event );
+    void OnOKButtonClickCold( wxCommandEvent& event );
+
+
+public:
+    enum treenodes { NODE,ITEM };
+    wxTreeCtrl* m_treeCtrl3;
+    wxTextCtrl* m_textCtrl73;
+    myTreeItem* retItem;
+    wxTreeItemId selectedItem;
+    int				fo;
+    int				it;
+
+    ColdFinger( LogbookDialog* parent,  wxWindowID id = wxID_ANY, const wxString& title = _( "Textblocks Dialog" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 524,392 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~ColdFinger();
+
+    void	writeTextblocks();
+    void	loadTextBlocks();
+
+    void m_splitter2OnIdle( wxIdleEvent& )
+    {
+        m_splitter2->SetSashPosition( 0 );
+        m_splitter2->Disconnect( wxEVT_IDLE, wxIdleEventHandler( ColdFinger::m_splitter2OnIdle ), NULL, this );
+    }
 };
 
 class myTreeItem : public wxTreeItemData
 {
 public:
-	myTreeItem( int type, wxString name, wxString text, wxString guid, wxString route, wxString guidWP, wxString WP, int grid, int gridcol, bool deleteable, bool add, bool menu);
-	myTreeItem( const myTreeItem* item);
-	~myTreeItem(){};
-
-	int		 type;
-	wxString name;
-	wxString text;
-	wxString guid;
-	wxString route;
-	wxString guidWP;
-	wxString WP;
-	int      grid;
-	int      gridcol;
-	bool	 deleteable;
-	bool     add;
-	bool     menu;
+    myTreeItem( int type, wxString name, wxString text, wxString guid, wxString route, wxString guidWP, wxString WP, int grid, int gridcol, bool deleteable, bool add, bool menu );
+    myTreeItem( const myTreeItem* item );
+    ~myTreeItem() {};
+
+    int		 type;
+    wxString name;
+    wxString text;
+    wxString guid;
+    wxString route;
+    wxString guidWP;
+    wxString WP;
+    int      grid;
+    int      gridcol;
+    bool	 deleteable;
+    bool     add;
+    bool     menu;
 
 };
 
 class DnD : public wxTextDropTarget
 {
 public:
-    DnD(ColdFinger* d, wxTreeCtrl *pOwner, wxTreeCtrl* pSender) { m_pOwner = pOwner; m_pSender = pSender; dialog = d;}
-	~DnD();
+    DnD( ColdFinger* d, wxTreeCtrl *pOwner, wxTreeCtrl* pSender )
+    {
+        m_pOwner = pOwner;
+        m_pSender = pSender;
+        dialog = d;
+    }
+    ~DnD();
 
-     bool OnDropText(wxCoord x, wxCoord y, const wxString& str);
+    bool OnDropText( wxCoord x, wxCoord y, const wxString& str );
 
 private:
     wxTreeCtrl *m_pOwner;
-	wxTreeCtrl* m_pSender;
-	ColdFinger* dialog;
+    wxTreeCtrl* m_pSender;
+    ColdFinger* dialog;
 };
 
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/spinctrl.h>
-#include <wx/gdicmn.h>				
+#include <wx/gdicmn.h>
 ////////////// Timer-Interval Dialog ///////////
-class TimerInterval : public wxDialog 
+class TimerInterval : public wxDialog
 {
-WX_DEFINE_ARRAY_INT(unsigned int, ArrayTimerFull);
-WX_DEFINE_ARRAY_INT(unsigned int, ArrayTimerIndividualH);
-WX_DEFINE_ARRAY_INT(unsigned int, ArrayTimerIndividualM);
-
-ArrayTimerFull oldTimerFull; 
-ArrayTimerIndividualH oldTimerIndividualH;
-ArrayTimerIndividualM oldTimerIndividualM;
-wxArrayString oldTimerIndidividualAMPM;
-
-	private:
-		wxSpinCtrl* m_spinCtrlH;
-		wxStaticText* m_staticTextH;
-		wxSpinCtrl* m_spinCtrlM;
-		wxStaticText* m_staticTextM;
-		wxSpinCtrl* m_spinCtrlS;
-		wxStaticText* m_staticTextS;
-
-		Options* opt;
-		LogbookDialog* dialog;
-		bool timerruns;
-		int oldFullHour;
-		bool ok;
-		int oldTimerType;
-		wxString oldSpinH;
-		wxString oldSpinM;
-		wxString oldSpinS;
-		int oldHrDelay;
-
-		void init(Options* opt, LogbookDialog* dialog);
-		void setCellValue(wxGrid* grid, int row, int col);
-		void appendRow(wxGrid* grid, int row, int col);
-		void saveData();
-		bool loadData();
-		void bubbleSort();
-		void setTimerFullArray();
-		void setTimerIndividualArray();
-		void deleteRow();
-		void clearAll();
-	
-	protected:
-		wxStaticText* m_staticText120;
-		wxStaticLine* m_staticline37;
-		wxStaticText* m_staticText125;
-		wxSpinCtrl* m_spinCtrl4;
-		wxStaticText* m_staticText124;
-		wxGrid* m_gridFull;
-		wxStaticText* m_staticText1201;
-		wxStaticLine* m_staticline38;
-		wxRadioButton* m_radioBtnIndividualTimer;
-		wxGrid* m_gridIndividual;
-		wxStaticText* m_staticText12011;
-		wxStaticLine* m_staticline39;
-		wxStdDialogButtonSizer* m_sdbSizer9;
-		wxButton* m_sdbSizer9OK;
-		wxButton* m_sdbSizer9Cancel;
-		wxMenu* m_menu11;
-		wxMenu* m_menu12;
-		wxGrid* selGrid;
-		int selRow;
-
-		// Virtual event handlers, overide them in your derived class
-		void OnRadioButtonNormal( wxCommandEvent& event );
-		void OnRadioButtonFull( wxCommandEvent& event );
-		void OnSpinCtrlFullh( wxSpinEvent& event );
-		void OnGridCellChangeFull( wxGridEvent& event );
-		void OnRadioButtonIndividual( wxCommandEvent& event );
-		void OnGridCellChangeIndividual( wxGridEvent& event );
-		void OnButtonOKClick( wxCommandEvent& event );
-		void OnClose( wxCloseEvent& event );
-		void OnCancel( wxCommandEvent& event );
-		void OnGridCellRightClickFull( wxGridEvent& event );
-		void OnGridCellRightClickIndividual( wxGridEvent& event );
-		void OnMenuDeleteRow( wxCommandEvent& event );
-		void OnMenuClearAll( wxCommandEvent& event );
-		
-	
-	public:
-		wxRadioButton* m_radioBtnNormalTimer;
-		wxRadioButton* m_radioBtnFullHour;
-		
-		TimerInterval( wxWindow* parent, Options* options, wxWindowID id = wxID_ANY, const wxString& title = _("Set Timer Interval"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 274,452 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~TimerInterval();
+    WX_DEFINE_ARRAY_INT( unsigned int, ArrayTimerFull );
+    WX_DEFINE_ARRAY_INT( unsigned int, ArrayTimerIndividualH );
+    WX_DEFINE_ARRAY_INT( unsigned int, ArrayTimerIndividualM );
+
+    ArrayTimerFull oldTimerFull;
+    ArrayTimerIndividualH oldTimerIndividualH;
+    ArrayTimerIndividualM oldTimerIndividualM;
+    wxArrayString oldTimerIndidividualAMPM;
+
+private:
+    wxSpinCtrl* m_spinCtrlH;
+    wxStaticText* m_staticTextH;
+    wxSpinCtrl* m_spinCtrlM;
+    wxStaticText* m_staticTextM;
+    wxSpinCtrl* m_spinCtrlS;
+    wxStaticText* m_staticTextS;
+
+    Options* opt;
+    LogbookDialog* dialog;
+    bool timerruns;
+    int oldFullHour;
+    bool ok;
+    int oldTimerType;
+    wxString oldSpinH;
+    wxString oldSpinM;
+    wxString oldSpinS;
+    int oldHrDelay;
+
+    void init( Options* opt, LogbookDialog* dialog );
+    void setCellValue( wxGrid* grid, int row, int col );
+    void appendRow( wxGrid* grid, int row, int col );
+    void saveData();
+    bool loadData();
+    void bubbleSort();
+    void setTimerFullArray();
+    void setTimerIndividualArray();
+    void deleteRow();
+    void clearAll();
+
+protected:
+    wxStaticText* m_staticText120;
+    wxStaticLine* m_staticline37;
+    wxStaticText* m_staticText125;
+    wxSpinCtrl* m_spinCtrl4;
+    wxStaticText* m_staticText124;
+    wxGrid* m_gridFull;
+    wxStaticText* m_staticText1201;
+    wxStaticLine* m_staticline38;
+    wxRadioButton* m_radioBtnIndividualTimer;
+    wxGrid* m_gridIndividual;
+    wxStaticText* m_staticText12011;
+    wxStaticLine* m_staticline39;
+    wxStdDialogButtonSizer* m_sdbSizer9;
+    wxButton* m_sdbSizer9OK;
+    wxButton* m_sdbSizer9Cancel;
+    wxMenu* m_menu11;
+    wxMenu* m_menu12;
+    wxGrid* selGrid;
+    int selRow;
+
+    // Virtual event handlers, overide them in your derived class
+    void OnRadioButtonNormal( wxCommandEvent& event );
+    void OnRadioButtonFull( wxCommandEvent& event );
+    void OnSpinCtrlFullh( wxSpinEvent& event );
+    void OnGridCellChangeFull( wxGridEvent& event );
+    void OnRadioButtonIndividual( wxCommandEvent& event );
+    void OnGridCellChangeIndividual( wxGridEvent& event );
+    void OnButtonOKClick( wxCommandEvent& event );
+    void OnClose( wxCloseEvent& event );
+    void OnCancel( wxCommandEvent& event );
+    void OnGridCellRightClickFull( wxGridEvent& event );
+    void OnGridCellRightClickIndividual( wxGridEvent& event );
+    void OnMenuDeleteRow( wxCommandEvent& event );
+    void OnMenuClearAll( wxCommandEvent& event );
+
+
+public:
+    wxRadioButton* m_radioBtnNormalTimer;
+    wxRadioButton* m_radioBtnFullHour;
+
+    TimerInterval( wxWindow* parent, Options* options, wxWindowID id = wxID_ANY, const wxString& title = _( "Set Timer Interval" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 274,452 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~TimerInterval();
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PositionDlg
 ///////////////////////////////////////////////////////////////////////////////
-class PositionDlg : public wxDialog 
+class PositionDlg : public wxDialog
 {
-	private:
-		wxTextCtrl* m_textCtrlDeg1;
-		wxStaticText* m_staticTextDeg1;
-		wxTextCtrl* m_textCtrlmin1;
-		wxStaticText* m_staticTextmin1;
-		wxTextCtrl* m_textCtrlsec1;
-		wxStaticText* m_staticTextsec1;
-		wxTextCtrl* m_textCtrlNS;
-		wxFlexGridSizer* fgSizer441;
-		wxTextCtrl* m_textCtrlDeg2;
-		wxStaticText* m_staticTextDeg2;
-		wxTextCtrl* m_textCtrlmin2;
-		wxStaticText* m_staticTextmin2;
-		wxTextCtrl* m_textCtrlsec2;
-		wxStaticText* m_staticTextsec2;
-		wxTextCtrl* m_textCtrlWE;
-		wxChoice* m_choiceFormat;
-
-		void           init(LogbookDialog* dlg);
-		void           setFormat(int fmt);
-		wxString       replaceComma(wxString s);
-		LogbookDialog* dlg;
-		int            oldSel;
-	
-	protected:
-		wxStaticText* m_staticTextWE;
-		wxStdDialogButtonSizer* m_sdbSizer10;
-		wxButton* m_sdbSizer10OK;
-		wxButton* m_sdbSizer10Cancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		 void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		 void OnOKButtonClick( wxCommandEvent& event );
-		 void OnChoice( wxCommandEvent& event );
-		
-	
-	public:
-		
-		PositionDlg( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Position"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 250,127 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-	    ~PositionDlg();
+private:
+    wxTextCtrl* m_textCtrlDeg1;
+    wxStaticText* m_staticTextDeg1;
+    wxTextCtrl* m_textCtrlmin1;
+    wxStaticText* m_staticTextmin1;
+    wxTextCtrl* m_textCtrlsec1;
+    wxStaticText* m_staticTextsec1;
+    wxTextCtrl* m_textCtrlNS;
+    wxFlexGridSizer* fgSizer441;
+    wxTextCtrl* m_textCtrlDeg2;
+    wxStaticText* m_staticTextDeg2;
+    wxTextCtrl* m_textCtrlmin2;
+    wxStaticText* m_staticTextmin2;
+    wxTextCtrl* m_textCtrlsec2;
+    wxStaticText* m_staticTextsec2;
+    wxTextCtrl* m_textCtrlWE;
+    wxChoice* m_choiceFormat;
+
+    void           init( LogbookDialog* dlg );
+    void           setFormat( int fmt );
+    wxString       replaceComma( wxString s );
+    LogbookDialog* dlg;
+    int            oldSel;
+
+protected:
+    wxStaticText* m_staticTextWE;
+    wxStdDialogButtonSizer* m_sdbSizer10;
+    wxButton* m_sdbSizer10OK;
+    wxButton* m_sdbSizer10Cancel;
+
+    // Virtual event handlers, overide them in your derived class
+    void OnCancelButtonClick( wxCommandEvent& event )
+    {
+        event.Skip();
+    }
+    void OnOKButtonClick( wxCommandEvent& event );
+    void OnChoice( wxCommandEvent& event );
+
+
+public:
+
+    PositionDlg( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _( "Position" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 250,127 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~PositionDlg();
 
-		wxString retstr;
+    wxString retstr;
 };
 
-#if wxCHECK_VERSION(2, 9, 0)
-class myBitmapButton : public wxButton
+#ifdef __WXGTK__
+class myBitmapButton : public wxBitmapButton
 {
 public:
-	myBitmapButton( wxWindow* Statusbar, wxWindowID id = wxID_ANY, wxString text = wxEmptyString, const wxBitmap bm = wxBitmap(), const wxPoint& pos = wxDefaultPosition, 
-		const wxSize& size = wxSize( -1,20 ), long style = wxBU_AUTODRAW, int state = 0 ) : wxButton( Statusbar, id, text, pos, size, style ) 
-	{
-		this->state = state;
-		this->SetBitmapLabel(bm);
-		this->SetBitmapHover(bm);
-		this->SetBitmapPosition(wxRIGHT);
-	}
-	~myBitmapButton(){}
+    myBitmapButton( wxWindow* Statusbar, wxWindowID id = wxID_ANY, const wxBitmap bm = wxBitmap(), const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxSize( 10,10 ), long style = wxBU_AUTODRAW, int state = 0 ) : wxBitmapButton( Statusbar, id, bm, pos, size, style )
+    {
+        this->state = state;
+    }
+    ~myBitmapButton() {}
 
-	int state;
+    int state;
 };
 #else
-class myBitmapButton : public wxBitmapButton
+class myBitmapButton : public wxButton
 {
 public:
-	myBitmapButton( wxWindow* Statusbar, wxWindowID id = wxID_ANY, const wxBitmap bm = wxBitmap(), const wxPoint& pos = wxDefaultPosition, 
-		const wxSize& size = wxSize( 10,10 ), long style = wxBU_AUTODRAW, int state = 0 ) : wxBitmapButton( Statusbar, id, bm, pos, size, style ) {this->state = state;}
-	~myBitmapButton(){}
+    myBitmapButton( wxWindow* Statusbar, wxWindowID id = wxID_ANY, wxString text = wxEmptyString, const wxBitmap bm = wxBitmap(), const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxSize( -1,20 ), long style = wxBU_AUTODRAW, int state = 0 ) : wxButton( Statusbar, id, text, pos, size, style )
+    {
+        this->state = state;
+        this->SetBitmapLabel( bm );
+        this->SetBitmapHover( bm );
+        this->SetBitmapPosition( wxRIGHT );
+    }
+    ~myBitmapButton() {}
 
-	int state;
+    int state;
 };
-#endif 
+#endif
 
 #endif
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Logbook.h opencpn-plugin-logbookkonni-1.2024/src/Logbook.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/Logbook.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Logbook.h	2016-02-25 13:06:29.000000000 +0000
@@ -2,7 +2,7 @@
 #define _LOGBOOK_H_
 
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
 #include "ocpn_plugin.h"
@@ -15,188 +15,198 @@
 class Options;
 class LogbookDialog;
 class PBVEDialog;
-class ActuellWatch;
+class ActualWatch;
 
 class Logbook : public LogbookHTML
 {
 private:
-	struct Pos{
-		double posLat;
-		double latitude;
-		double latmin;
-		char   NSflag;
-		double posLon;
-		double longitude;
-		double lonmin;
-		char   WEflag;
-				}oldPosition,newPosition;
-
-	NMEA0183L      	m_NMEA0183;
-	RMB		tempRMB;
-	wxString	sLat;
-	wxString	sLon;
-	wxDateTime	mUTCDateTime;
-	wxString	sSOG;
-	wxString	sSOW;
-	wxDateTime	dtSOW;
-	bool		bSOW;
-	wxString	sCOG;
-	wxString	sCOW;
-	wxDateTime	dtCOW;
-	wxString	sDistance;
-	wxString	sTemperatureWater;
-	wxDateTime	dtTemperatureWater;
-    	bool		bTemperatureWater;
-    	wxString	sTemperatureAir;
-    	bool		bTemperatureAir;
-    	wxDateTime	dtWimda;
-    	wxString	sPressure;
-    	wxString	sHumidity;
-	wxString	sWindA;
-	wxString	sWindT;
-    	wxDateTime	dtWindA;
-    	wxDateTime	dtWindT;
-    	bool		bWindA;
-    	bool		bWindT;
-	wxString	sWindSpeedA;
-	wxString	sWindSpeedT;
-	wxString	sDepth;
-    	wxDateTime	dtDepth;
-    	bool		bDepth;
-	wxString	sLogText;
-	wxString	sLinesReminder;
-    	wxString	sRPM1;
-    	wxString	sRPM1Shaft;
-    	wxString	sRPM1Source;
-    	wxString	sRPM2Shaft;
-    	wxString	sRPM2Source;
-    	wxString	sRPM2;
-    	wxDateTime	dtRPM2;
-    	long		engine;
-
-	bool		noSentence;
-	bool		bCOW;
-	double		dCOW;
-	double		dCOG;
-	bool		mode;
-	bool		courseChange;
-	bool		everySM;
-	bool		waypointArrived;
-	bool		oldLogbook;
-	bool		wimdaSentence;
-
-	wxString	toSDMM ( int NEflag, double a, bool mode );
-	wxString	toSDMMOpenCPN ( int NEflag, double a, bool hi_precision );
-	void		setPositionString(double lat,int north, double lon, int east);
-	void		setDateTimeString(wxDateTime s);
-	wxString	computeCell(int grid,int row, int col, wxString s, bool mode);
-	wxString	calculateDistance(wxString fromstr, wxString tostr);
-	wxDouble	positionStringToDezimal(wxString pos);
-	wxDouble	positionStringToDezimalModern(wxString pos);
-	void		checkCourseChanged();
-	void		checkGuardChanged();
-	void		checkDistance();
-	wxString	positionTraditional(int NEflag, double a, bool mode );
-	wxString	positionGPSLike(int NEflag, double a, bool mode );
-	void		setOldPosition();
-	void		setWayPointArrivedText();
+    struct Pos
+    {
+        double posLat;
+        double latitude;
+        double latmin;
+        char   NSflag;
+        double posLon;
+        double longitude;
+        double lonmin;
+        char   WEflag;
+    } oldPosition,newPosition;
+
+    NMEA0183L      	m_NMEA0183;
+    RMB		tempRMB;
+    wxString	sLat;
+    wxString	sLon;
+    wxDateTime	mUTCDateTime;
+    wxString	sSOG;
+    wxString	sSOW;
+    wxDateTime	dtSOW;
+    bool		bSOW;
+    wxString	sCOG;
+    wxString	sCOW;
+    wxDateTime	dtCOW;
+    wxString	sDistance;
+    wxString	sTemperatureWater;
+    wxDateTime	dtTemperatureWater;
+    bool		bTemperatureWater;
+    wxString	sTemperatureAir;
+    bool		bTemperatureAir;
+    wxDateTime	dtWimda;
+    wxString	sPressure;
+    wxString	sHumidity;
+    wxString	sWindA;
+    wxString	sWindT;
+    wxDateTime	dtWindA;
+    wxDateTime	dtWindT;
+    bool		bWindA;
+    bool		bWindT;
+    wxString	sWindSpeedA;
+    wxString	sWindSpeedT;
+    wxString	sDepth;
+    wxDateTime	dtDepth;
+    bool		bDepth;
+    wxString	sLogText;
+    wxString	sLinesReminder;
+    wxString	sRPM1;
+    wxString	sRPM1Shaft;
+    wxString	sRPM1Source;
+    wxString	sRPM2Shaft;
+    wxString	sRPM2Source;
+    wxString	sRPM2;
+    wxDateTime	dtRPM2;
+    long		engine;
+
+    bool		noSentence;
+    bool		bCOW;
+    double		dCOW;
+    double		dCOG;
+    bool		mode;
+    bool		courseChange;
+    bool		everySM;
+    bool		waypointArrived;
+    bool		oldLogbook;
+    bool		wimdaSentence;
+    double		minwindA;
+    double		avgwindA;
+    double		maxwindA;
+    double		minwindT;
+    double		avgwindT;
+    double		maxwindT;
+    wxString	swindspeedsA;
+    wxString	swindspeedsT;
+
+    wxString	toSDMM ( int NEflag, double a, bool mode );
+    wxString	toSDMMOpenCPN ( int NEflag, double a, bool hi_precision );
+    void		setPositionString( double lat,int north, double lon, int east );
+    void		setDateTimeString( wxDateTime s );
+    wxString	computeCell( int grid,int row, int col, wxString s, bool mode );
+    wxString	calculateDistance( wxString fromstr, wxString tostr );
+    wxDouble	positionStringToDezimal( wxString pos );
+    wxDouble	positionStringToDezimalModern( wxString pos );
+    void		checkCourseChanged();
+    void		checkGuardChanged();
+    void		checkDistance();
+    wxString	positionTraditional( int NEflag, double a, bool mode );
+    wxString	positionGPSLike( int NEflag, double a, bool mode );
+    void		setOldPosition();
+    void		setWayPointArrivedText();
 
 #ifdef PBVE_DEBUG
-	int pbvecount;
+    int pbvecount;
 #endif
 
 public:
-	enum fields{ ROUTE,RDATE,RTIME,STATUS,WAKE,DISTANCE,DTOTAL,POSITION,COG,COW,SOG,SOW,DEPTH,REMARKS,
-				 BARO,HYDRO,TEMPAIR,TEMPWATER,WIND,WSPD,WINDR,WSPDR,CURRENT,CSPD,WAVE,SWELL,WEATHER,CLOUDS,VISIBILITY,
-				 MOTOR,MOTORT,RPM1,MOTOR1,MOTOR1T,RPM2,FUEL,FUELT,SAILS,REEF,GENE,GENET,BANK1,BANK1T,BANK2,BANK2T,WATERM,WATERMT,WATERMO,WATER,WATERT,MREMARKS,ROUTEID,TRACKID};
-
-	Options		*opt;
-	wxArrayString	mergeList;
-	LogbookDialog*	dialog;
-	LogbookHTML*	logbookHTML;
-	wxString	layout_locn;
-	wxString	layoutODT;
-	wxString	data_locn;
-	bool		modified;
-	wxDateTime	mCorrectedDateTime;
-	long		dLastMinute;
-	PBVEDialog*	pvbe;
-	bool		WP_skipped;
-	wxString	lastWayPoint;
-	bool		OCPN_Message;
-	bool		routeIsActive;
-	wxString	activeRoute;
-	wxString	activeRouteGUID;
-	bool		trackIsActive;
-	wxString	activeMOB;
-
-	wxString	MOB_GUID;
-	bool		MOBIsActive;
-	wxString	activeTrack;
-	wxString	activeTrackGUID;
-
-	wxString	sDate;
-	wxString	sTime;
-	bool		guardChange;
-	bool		rpmSentence;
-	wxDateTime	dtRPM;
-	bool		engine1Manual;
-	bool		engine2Manual;
+    enum fields { ROUTE,RDATE,RTIME,STATUS,WAKE,DISTANCE,DTOTAL,POSITION,COG,COW,SOG,SOW,DEPTH,REMARKS,
+                  BARO,HYDRO,TEMPAIR,TEMPWATER,WIND,WSPD,WINDR,WSPDR,CURRENT,CSPD,WAVE,SWELL,WEATHER,CLOUDS,VISIBILITY,
+                  MOTOR,MOTORT,RPM1,MOTOR1,MOTOR1T,RPM2,FUEL,FUELT,SAILS,REEF,GENE,GENET,BANK1,BANK1T,BANK2,BANK2T,WATERM,WATERMT,WATERMO,WATER,WATERT,MREMARKS,ROUTEID,TRACKID
+                };
+
+    Options		*opt;
+    wxArrayString	mergeList;
+    LogbookDialog*	dialog;
+    LogbookHTML*	logbookHTML;
+    wxString	layout_locn;
+    wxString	layoutODT;
+    wxString	data_locn;
+    bool		modified;
+    wxDateTime	mCorrectedDateTime;
+    long		dLastMinute;
+    PBVEDialog*	pvbe;
+    bool		WP_skipped;
+    wxString	lastWayPoint;
+    bool		OCPN_Message;
+    bool		routeIsActive;
+    wxString	activeRoute;
+    wxString	activeRouteGUID;
+    bool		trackIsActive;
+    wxString	activeMOB;
+
+    wxString	MOB_GUID;
+    bool		MOBIsActive;
+    wxString	activeTrack;
+    wxString	activeTrackGUID;
+
+    wxString	sDate;
+    wxString	sTime;
+    bool		guardChange;
+    bool		rpmSentence;
+    wxDateTime	dtRPM;
+    bool		engine1Manual;
+    bool		engine2Manual;
     bool        generatorManual;
-	wxTimeSpan	dtEngine1Off;
-	wxTimeSpan	dtEngine2Off;
+    wxTimeSpan	dtEngine1Off;
+    wxTimeSpan	dtEngine2Off;
     wxTimeSpan  dtGeneratorOff;
-	bool		bRPM2;
-	bool		bRPM1;
+    bool		bRPM2;
+    bool		bRPM1;
     bool        bGEN;
-	bool		sailsMessage;
-	int		sailsState;
-	int		oldSailsState;
+    bool		sailsMessage;
+    int		sailsState;
+    int		oldSailsState;
 
 public:
-	Logbook(LogbookDialog* parent, wxString data, wxString layout, wxString layoutODT);
-	~Logbook(void);
+    Logbook( LogbookDialog* parent, wxString data, wxString layout, wxString layoutODT );
+    ~Logbook( void );
 
-	void SetSentence(wxString &sentence);
-	void SetPosition(PlugIn_Position_Fix &pfix);
-	void loadData();
-	void loadSelectedData(wxString path);
-	void loadDatanew();
-	void deleteRow(int row);
-	void appendRow(bool showlastline, bool autoline);
-	void update();
-	void clearNMEAData();
-	void newLogbook();
-	void switchToActuellLogbook();
-	void selectLogbook();
-	void changeCellValue(int row, int col, int offset);
-	void setLayoutLocation(wxString loc);
-	void SetGPSStatus(bool status);
-	bool checkGPS(bool appendClick);
-	void checkWayPoint(RMB rmb);
-	void showSearchDlg(int row, int col);
-	void getModifiedCellValue(int grid, int row, int selcol, int col);
-	void clearAllGrids();
-	void recalculateLogbook(int row);
-	void deleteRows();
-    void setTrackToNewID(wxString target);
+    void SetSentence( wxString &sentence );
+    void SetPosition( PlugIn_Position_Fix &pfix );
+    void loadData();
+    void loadSelectedData( wxString path );
+    void loadDatanew();
+    void deleteRow( int row );
+    void appendRow( bool showlastline, bool autoline );
+    void update();
+    void clearNMEAData();
+    void newLogbook();
+    void switchToActualLogbook();
+    void selectLogbook();
+    void changeCellValue( int row, int col, int offset );
+    void setLayoutLocation( wxString loc );
+    void SetGPSStatus( bool status );
+    bool checkGPS( bool appendClick );
+    void checkWayPoint( RMB rmb );
+    void showSearchDlg( int row, int col );
+    void getModifiedCellValue( int grid, int row, int selcol, int col );
+    void clearAllGrids();
+    void recalculateLogbook( int row );
+    void deleteRows();
+    void setTrackToNewID( wxString target );
     void checkNMEADeviceIsOn();
-    void resetEngineManualMode(int enginenumber);
+    void resetEngineManualMode( int enginenumber );
 
-	static wxString makeDateFromFile(wxString date, wxString dateformat);
-	static wxString makeWatchtimeFromFile(wxString time, wxString timeformat);
+    static wxString makeDateFromFile( wxString date, wxString dateformat );
+    static wxString makeWatchtimeFromFile( wxString time, wxString timeformat );
 
-	wxTextFile* logbookFile;
-	wxString	title;
-	bool		gpsStatus;
+    wxTextFile* logbookFile;
+    wxString	title;
+    bool		gpsStatus;
 
 private:
-	void     setCellAlign(int i);
-	wxString decimalToHours(double res, bool b);
-	void     convertTo_1_2();
+    void     setCellAlign( int i );
+    wxString decimalToHours( double res, bool b );
+    void     convertTo_1_2();
 
-	wxString	logbookData_actuell;
-	bool		noAppend; // Old Logbook; append Rows not allowed
+    wxString	logbookData_actual;
+    bool		noAppend; // Old Logbook; append Rows not allowed
     wxString	logbookDescription;
 };
 
@@ -214,100 +224,100 @@
 ///////////////////////////////////////////////////////////////////////////////
 /// Class NoAppendDialog
 ///////////////////////////////////////////////////////////////////////////////
-class NoAppendDialog : public wxDialog 
+class NoAppendDialog : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticText73;
-		wxStdDialogButtonSizer* m_sdbSizer5;
-		wxButton* m_sdbSizer5OK;
-	
-	public:
-		
-		NoAppendDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Information"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 255,130 ), long style = wxDEFAULT_DIALOG_STYLE|wxSTAY_ON_TOP );
-		~NoAppendDialog();
-	
+private:
+
+protected:
+    wxStaticText* m_staticText73;
+    wxStdDialogButtonSizer* m_sdbSizer5;
+    wxButton* m_sdbSizer5OK;
+
+public:
+
+    NoAppendDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _( "Information" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 255,130 ), long style = wxDEFAULT_DIALOG_STYLE|wxSTAY_ON_TOP );
+    ~NoAppendDialog();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LinesReminderDlg
 ///////////////////////////////////////////////////////////////////////////////
-class LinesReminderDlg : public wxDialog 
+class LinesReminderDlg : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticTextreminder;
-		wxStdDialogButtonSizer* m_sdbSizer9;
-		wxButton* m_sdbSizer9OK;
-	
-	public:
-		
-		LinesReminderDlg( wxString str, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Reminder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 263,84 ), long style = wxDEFAULT_DIALOG_STYLE|wxSTAY_ON_TOP ); 
-		~LinesReminderDlg();
-	
+private:
+
+protected:
+    wxStaticText* m_staticTextreminder;
+    wxStdDialogButtonSizer* m_sdbSizer9;
+    wxButton* m_sdbSizer9OK;
+
+public:
+
+    LinesReminderDlg( wxString str, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _( "Reminder" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 263,84 ), long style = wxDEFAULT_DIALOG_STYLE|wxSTAY_ON_TOP );
+    ~LinesReminderDlg();
+
 };
 
 ////////////////////////////
 // PVBE Dialog
 ///////////////////////////
-class PBVEDialog : public wxFrame 
+class PBVEDialog : public wxFrame
 {
-	private:
-		LogbookDialog* dialog;
-	protected:
-
-	
-	public:
-		virtual void PBVEDialogOnClose( wxCloseEvent& event );
-		void OnCloseWindow(wxCloseEvent& ev);
-		wxTextCtrl* m_textCtrlPVBE;		
-		PBVEDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		~PBVEDialog();
-	
+private:
+    LogbookDialog* dialog;
+protected:
+
+
+public:
+    virtual void PBVEDialogOnClose( wxCloseEvent& event );
+    void OnCloseWindow( wxCloseEvent& ev );
+    wxTextCtrl* m_textCtrlPVBE;
+    PBVEDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+    ~PBVEDialog();
+
 };
 
 #include <wx/datectrl.h>
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LogbookSearch
 ///////////////////////////////////////////////////////////////////////////////
-class LogbookSearch : public wxDialog 
+class LogbookSearch : public wxDialog
 {
-	private:
-		LogbookDialog* parent;
-		int row, col;
-		int searchrow;
-		bool direction;
-
-	protected:
-		wxStaticText* m_staticText96;
-		wxStaticLine* m_staticline32;
-		wxStaticText* m_staticText108;
-		wxStaticText* m_staticText110;
-		wxStaticText* m_staticText97;
-		wxStaticLine* m_staticline39;
-		wxButton* m_buttonBack;
-		wxButton* m_buttonForward;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnInitDialog( wxInitDialogEvent& event );
-		virtual void OnButtonClickBack( wxCommandEvent& event );
-		virtual void OnButtonClickForward( wxCommandEvent& event );
-		virtual void OnButtonClickSelectDate( wxCommandEvent& event );
-		
-	
-	public:
-		wxRadioButton* m_radioBtnActuell;
-		wxRadioButton* m_radioBtnAll;
-		wxTextCtrl* m_textCtrl72;
-		wxChoice* m_choice23;
-		wxChoice* m_choiceGreaterEqual;
-		wxDatePickerCtrl* m_datePicker;
-		wxButton* m_buttonSelectDate;
-
-		LogbookSearch( wxWindow* parent, int row, int col, wxWindowID id = wxID_ANY, const wxString& title = _("Search in Logbook"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 353,219 ), long style = wxDEFAULT_DIALOG_STYLE ); 
-		~LogbookSearch();
-	
+private:
+    LogbookDialog* parent;
+    int row, col;
+    int searchrow;
+    bool direction;
+
+protected:
+    wxStaticText* m_staticText96;
+    wxStaticLine* m_staticline32;
+    wxStaticText* m_staticText108;
+    wxStaticText* m_staticText110;
+    wxStaticText* m_staticText97;
+    wxStaticLine* m_staticline39;
+    wxButton* m_buttonBack;
+    wxButton* m_buttonForward;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnInitDialog( wxInitDialogEvent& event );
+    virtual void OnButtonClickBack( wxCommandEvent& event );
+    virtual void OnButtonClickForward( wxCommandEvent& event );
+    virtual void OnButtonClickSelectDate( wxCommandEvent& event );
+
+
+public:
+    wxRadioButton* m_radioBtnActual;
+    wxRadioButton* m_radioBtnAll;
+    wxTextCtrl* m_textCtrl72;
+    wxChoice* m_choice23;
+    wxChoice* m_choiceGreaterEqual;
+    wxDatePickerCtrl* m_datePicker;
+    wxButton* m_buttonSelectDate;
+
+    LogbookSearch( wxWindow* parent, int row, int col, wxWindowID id = wxID_ANY, const wxString& title = _( "Search in Logbook" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 353,219 ), long style = wxDEFAULT_DIALOG_STYLE );
+    ~LogbookSearch();
+
 };
 #endif
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/LogbookHTML.cpp opencpn-plugin-logbookkonni-1.2024/src/LogbookHTML.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/LogbookHTML.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/LogbookHTML.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -3,11 +3,10 @@
 #include "LogbookDialog.h"
 #include "Logbook.h"
 #include "logbook_pi.h"
-#include "MessageBoxOSX.h"
 #include "Options.h"
 
 #ifndef WX_PRECOMP
-      #include <wx/wx.h>
+#include <wx/wx.h>
 #endif
 
 #include <wx/mimetype.h>
@@ -23,1048 +22,1078 @@
 #include <map>
 using namespace std;
 
-LogbookHTML::LogbookHTML(Logbook *l, LogbookDialog *d, wxString data, wxString layout)
+LogbookHTML::LogbookHTML( Logbook *l, LogbookDialog *d, wxString data, wxString layout )
 {
-	parent = d;
-	logbook = l;
-	data_locn = data;
-	layout_locn = layout;
+    parent = d;
+    logbook = l;
+    data_locn = data;
+    layout_locn = layout;
 }
 
-LogbookHTML::~LogbookHTML(void)
+LogbookHTML::~LogbookHTML( void )
 {
 
 }
 
 void LogbookHTML::setPlaceholders()
 {
-	gridc gridcols = { 0,LogbookHTML::ROUTE};
-	placeholders[_T("ROUTE")]=gridcols;
-	placeholders[_T("LROUTE")]=gridcols;
-	gridc gridcols1 = { 0,LogbookHTML::RDATE};
-	placeholders[_T("DATE")]=gridcols1;
-	placeholders[_T("LDATE")]=gridcols1;
-	gridc gridcols2 = { 0,LogbookHTML::RTIME};
-	placeholders[_T("TIME")]=gridcols2;
-	placeholders[_T("LTIME")]=gridcols2;
-	gridc gridcols3 = { 0,LogbookHTML::STATUS};
-	placeholders[_T("STATUS")]=gridcols3;
-	placeholders[_T("LSTATUS")]=gridcols3;
-	gridc gridcols4 = { 0,LogbookHTML::WAKE};
-	placeholders[_T("WAKE")]=gridcols4;
-	placeholders[_T("LWAKE")]=gridcols4;
-	gridc gridcols5 = { 0,LogbookHTML::DISTANCE};
-	placeholders[_T("DISTANCE")]=gridcols5;
-	placeholders[_T("LDISTANCE")]=gridcols5;
-	gridc gridcols6 = { 0,LogbookHTML::DTOTAL};
-	placeholders[_T("DTOTAL")]=gridcols6;
-	placeholders[_T("LDTOTAL")]=gridcols6;
-	gridc gridcols7 = { 0,LogbookHTML::POSITION};
-	placeholders[_T("POSITION")]=gridcols7;
-	placeholders[_T("LPOSITION")]=gridcols7;
-	gridc gridcols8 = { 0,LogbookHTML::COG};
-	placeholders[_T("COG")]=gridcols8;
-	placeholders[_T("LCOG")]=gridcols8;
-	gridc gridcols9 = { 0,LogbookHTML::RTIME};
-	placeholders[_T("COW")]=gridcols9;
-	placeholders[_T("LCOW")]=gridcols9;
-	gridc gridcols10 = { 0,LogbookHTML::COW};
-	placeholders[_T("SOG")]=gridcols10;
-	placeholders[_T("LSOG")]=gridcols10;
-	gridc gridcols11 = { 0,LogbookHTML::SOW};
-	placeholders[_T("SOW")]=gridcols11;
-	placeholders[_T("LSOW")]=gridcols11;
-	gridc gridcols12 = { 0,LogbookHTML::DEPTH};
-	placeholders[_T("DEPTH")]=gridcols12;
-	placeholders[_T("LDEPTH")]=gridcols12;
-	gridc gridcols13 = { 0,LogbookHTML::REMARKS};
-	placeholders[_T("REMARKS")]=gridcols13;
-	placeholders[_T("LREMARKS")]=gridcols13;
-	
-	gridc gridcols14 = { 1,LogbookHTML::BARO};
-	placeholders[_T("BARO")]=gridcols14;
-	placeholders[_T("LBARO")]=gridcols14;
-	gridc gridcols15 = { 1,LogbookHTML::HYDRO };
-	placeholders[_T("HYDRO")]=gridcols15;
-	placeholders[_T("LHYDRO")]=gridcols15;
-	gridc gridcols16 = { 1,LogbookHTML::AIRTE};
-	placeholders[_T("AIRTE")]=gridcols16;
-	placeholders[_T("LAIRTE")]=gridcols16;
-	gridc gridcols17 = { 1,LogbookHTML::WATERTE};
-	placeholders[_T("WTE")]=gridcols17;
-	placeholders[_T("LWTE")]=gridcols17;
-	gridc gridcols18 = { 1,LogbookHTML::WIND};
-	placeholders[_T("WIND")]=gridcols18;
-	placeholders[_T("LWIND")]=gridcols18;
-	gridc gridcols19 = { 1,LogbookHTML::WSPD};
-	placeholders[_T("WSPD")]=gridcols19;
-	placeholders[_T("LWSPD")]=gridcols19;
-	gridc gridcols20 = { 1,LogbookHTML::WINDR};
-	placeholders[_T("WIND")]=gridcols20;
-	placeholders[_T("LWIND")]=gridcols20;
-	gridc gridcols21 = { 1,LogbookHTML::WSPDR};
-	placeholders[_T("WSPD")]=gridcols21;
-	placeholders[_T("LWSPD")]=gridcols21;
-	gridc gridcols22 = { 1,LogbookHTML::CURRENT};
-	placeholders[_T("CUR")]=gridcols22;
-	placeholders[_T("LCUR")]=gridcols22;
-	gridc gridcols23 = { 1,LogbookHTML::CSPD};
-	placeholders[_T("CSPD")]=gridcols23;
-	placeholders[_T("LCSPD")]=gridcols23;
-	gridc gridcols24 = { 1,LogbookHTML::WAVE };
-	placeholders[_T("WAVE")]=gridcols24;
-	placeholders[_T("LWAVE")]=gridcols24;
-	gridc gridcols25 = { 1,LogbookHTML::SWELL };
-	placeholders[_T("SWELL")]=gridcols25;
-	placeholders[_T("LSWELL")]=gridcols25;
-	gridc gridcols26 = { 1,LogbookHTML::WEATHER };
-	placeholders[_T("WEATHER")]=gridcols26;
-	placeholders[_T("LWEATHER")]=gridcols26;
-	gridc gridcols27 = { 1,LogbookHTML::CLOUDS };
-	placeholders[_T("CLOUDS")]=gridcols27;
-	placeholders[_T("LCLOUDS")]=gridcols27;
-	gridc gridcols28 = { 1,LogbookHTML::VISIBILITY };
-	placeholders[_T("VISIBILITY")]=gridcols28;
-	placeholders[_T("LVISIBILITY")]=gridcols28;
-
-	gridc gridcols29 = { 2,LogbookHTML::MOTOR};
-	placeholders[_T("MOTOR")]=gridcols29;
-	placeholders[_T("LMOTOR")]=gridcols29;
-	gridc gridcols30 = { 2,LogbookHTML::MOTORT };
-	placeholders[_T("MOTORT")]=gridcols30;
-	placeholders[_T("LMOTORT")]=gridcols30;
-	gridc gridcols31 = { 2,LogbookHTML::MOTOR1};
-	placeholders[_T("MOTOR1")]=gridcols31;
-	placeholders[_T("LMOTOR1")]=gridcols31;
-	gridc gridcols32 = { 2,LogbookHTML::MOTOR1T};
-	placeholders[_T("MOTOR1T")]=gridcols32;
-	placeholders[_T("LMOTOR1T")]=gridcols32;
-	gridc gridcols33 = { 2,LogbookHTML::FUEL};
-	placeholders[_T("FUEL")]=gridcols33;
-	placeholders[_T("LFUEL")]=gridcols33;
-	gridc gridcols34 = { 2,LogbookHTML::FUELT};
-	placeholders[_T("FUELT")]=gridcols34;
-	placeholders[_T("LFUELT")]=gridcols34;
-	gridc gridcols35 = { 2,LogbookHTML::GENE};
-	placeholders[_T("GENE")]=gridcols35;
-	placeholders[_T("LGENE")]=gridcols35;
-	gridc gridcols36 = { 2,LogbookHTML::GENET};
-	placeholders[_T("GENET")]=gridcols36;
-	placeholders[_T("LGENET")]=gridcols36;
-	gridc gridcols37 = { 2,LogbookHTML::BANK1 };
-	placeholders[_T("BANK1")]=gridcols37;
-	placeholders[_T("LBANK1")]=gridcols37;
-	gridc gridcols38 = { 2,LogbookHTML::BANK1T };
-	placeholders[_T("BANK1T")]=gridcols38;
-	placeholders[_T("LBANK1T")]=gridcols38;
-	gridc gridcols39 = { 2,LogbookHTML::BANK2 };
-	placeholders[_T("BANK2")]=gridcols39;
-	placeholders[_T("LBANK2")]=gridcols39;
-	gridc gridcols40 = { 2,LogbookHTML::BANK2T };
-	placeholders[_T("BANK2T")]=gridcols40;
-	placeholders[_T("LBANK2T")]=gridcols40;
-	gridc gridcols41 = { 2,LogbookHTML::SAILS };
-	placeholders[_T("SAILS")]=gridcols41;
-	placeholders[_T("LSAILS")]=gridcols41;
-	gridc gridcols42 = { 2,LogbookHTML::REEF };
-	placeholders[_T("REEF")]=gridcols42;
-	placeholders[_T("LREEF")]=gridcols42;
-	gridc gridcols43 = { 2,LogbookHTML::WATERM };
-	placeholders[_T("WATERM")]=gridcols43;
-	placeholders[_T("LWATERM")]=gridcols43;
-	gridc gridcols44 = { 2,LogbookHTML::WATERMT };
-	placeholders[_T("WATERMT")]=gridcols44;
-	placeholders[_T("LWATERMT")]=gridcols44;
-	gridc gridcols45 = { 2,LogbookHTML::WATERMO };
-	placeholders[_T("WATERMO")]=gridcols45;
-	placeholders[_T("LWATERMO")]=gridcols45;
-	gridc gridcols46 = { 2,LogbookHTML::WATER };
-	placeholders[_T("WATER")]=gridcols46;
-	placeholders[_T("LWATER")]=gridcols46;
-	gridc gridcols47 = { 2,LogbookHTML::WATERT };
-	placeholders[_T("WATERT")]=gridcols47;
-	placeholders[_T("LWATERT")]=gridcols47;
-	gridc gridcols48 = { 2,LogbookHTML::MREMARKS };
-	placeholders[_T("MREMARKS")]=gridcols48;
-	placeholders[_T("LMREMARKS")]=gridcols48;
-
-	placeholdersboat[_T("LLOGBOOK")]     = parent->m_logbook->GetPageText(0);
-	placeholdersboat[_T("LFROM")]        = _("from");
-	placeholdersboat[_T("LTO")]          = _("to");
-    if(parent->logGrids[0]->GetNumberRows() > 0)
-    {
-	placeholdersboat[_T("SDATE")]        = parent->m_gridGlobal->GetCellValue(0,1);
-	placeholdersboat[_T("EDATE")]        = parent->m_gridGlobal->GetCellValue(parent->m_gridGlobal->GetNumberRows()-1,1);
-    }
-	placeholdersboat[_T("TYPE")]         = parent->boatType->GetValue();
-	placeholdersboat[_T("BOATNAME")]     = parent->boatName->GetValue();
-	placeholdersboat[_T("HOMEPORT")]     = parent->homeport->GetValue();
-	placeholdersboat[_T("CALLSIGN")]     = parent->callsign->GetValue();
-	placeholdersboat[_T("REGISTRATION")] = parent->registration->GetValue();
+    gridc gridcols = { 0,LogbookHTML::ROUTE};
+    placeholders[_T( "ROUTE" )]=gridcols;
+    placeholders[_T( "LROUTE" )]=gridcols;
+    gridc gridcols1 = { 0,LogbookHTML::RDATE};
+    placeholders[_T( "DATE" )]=gridcols1;
+    placeholders[_T( "LDATE" )]=gridcols1;
+    gridc gridcols2 = { 0,LogbookHTML::RTIME};
+    placeholders[_T( "TIME" )]=gridcols2;
+    placeholders[_T( "LTIME" )]=gridcols2;
+    gridc gridcols3 = { 0,LogbookHTML::STATUS};
+    placeholders[_T( "STATUS" )]=gridcols3;
+    placeholders[_T( "LSTATUS" )]=gridcols3;
+    gridc gridcols4 = { 0,LogbookHTML::WAKE};
+    placeholders[_T( "WAKE" )]=gridcols4;
+    placeholders[_T( "LWAKE" )]=gridcols4;
+    gridc gridcols5 = { 0,LogbookHTML::DISTANCE};
+    placeholders[_T( "DISTANCE" )]=gridcols5;
+    placeholders[_T( "LDISTANCE" )]=gridcols5;
+    gridc gridcols6 = { 0,LogbookHTML::DTOTAL};
+    placeholders[_T( "DTOTAL" )]=gridcols6;
+    placeholders[_T( "LDTOTAL" )]=gridcols6;
+    gridc gridcols7 = { 0,LogbookHTML::POSITION};
+    placeholders[_T( "POSITION" )]=gridcols7;
+    placeholders[_T( "LPOSITION" )]=gridcols7;
+    gridc gridcols8 = { 0,LogbookHTML::COG};
+    placeholders[_T( "COG" )]=gridcols8;
+    placeholders[_T( "LCOG" )]=gridcols8;
+    gridc gridcols9 = { 0,LogbookHTML::RTIME};
+    placeholders[_T( "COW" )]=gridcols9;
+    placeholders[_T( "LCOW" )]=gridcols9;
+    gridc gridcols10 = { 0,LogbookHTML::COW};
+    placeholders[_T( "SOG" )]=gridcols10;
+    placeholders[_T( "LSOG" )]=gridcols10;
+    gridc gridcols11 = { 0,LogbookHTML::SOW};
+    placeholders[_T( "SOW" )]=gridcols11;
+    placeholders[_T( "LSOW" )]=gridcols11;
+    gridc gridcols12 = { 0,LogbookHTML::DEPTH};
+    placeholders[_T( "DEPTH" )]=gridcols12;
+    placeholders[_T( "LDEPTH" )]=gridcols12;
+    gridc gridcols13 = { 0,LogbookHTML::REMARKS};
+    placeholders[_T( "REMARKS" )]=gridcols13;
+    placeholders[_T( "LREMARKS" )]=gridcols13;
+
+    gridc gridcols14 = { 1,LogbookHTML::BARO};
+    placeholders[_T( "BARO" )]=gridcols14;
+    placeholders[_T( "LBARO" )]=gridcols14;
+    gridc gridcols15 = { 1,LogbookHTML::HYDRO };
+    placeholders[_T( "HYDRO" )]=gridcols15;
+    placeholders[_T( "LHYDRO" )]=gridcols15;
+    gridc gridcols16 = { 1,LogbookHTML::AIRTE};
+    placeholders[_T( "AIRTE" )]=gridcols16;
+    placeholders[_T( "LAIRTE" )]=gridcols16;
+    gridc gridcols17 = { 1,LogbookHTML::WATERTE};
+    placeholders[_T( "WTE" )]=gridcols17;
+    placeholders[_T( "LWTE" )]=gridcols17;
+    gridc gridcols18 = { 1,LogbookHTML::WIND};
+    placeholders[_T( "WIND" )]=gridcols18;
+    placeholders[_T( "LWIND" )]=gridcols18;
+    gridc gridcols19 = { 1,LogbookHTML::WSPD};
+    placeholders[_T( "WSPD" )]=gridcols19;
+    placeholders[_T( "LWSPD" )]=gridcols19;
+    gridc gridcols20 = { 1,LogbookHTML::WINDR};
+    placeholders[_T( "WIND" )]=gridcols20;
+    placeholders[_T( "LWIND" )]=gridcols20;
+    gridc gridcols21 = { 1,LogbookHTML::WSPDR};
+    placeholders[_T( "WSPD" )]=gridcols21;
+    placeholders[_T( "LWSPD" )]=gridcols21;
+    gridc gridcols22 = { 1,LogbookHTML::CURRENT};
+    placeholders[_T( "CUR" )]=gridcols22;
+    placeholders[_T( "LCUR" )]=gridcols22;
+    gridc gridcols23 = { 1,LogbookHTML::CSPD};
+    placeholders[_T( "CSPD" )]=gridcols23;
+    placeholders[_T( "LCSPD" )]=gridcols23;
+    gridc gridcols24 = { 1,LogbookHTML::WAVE };
+    placeholders[_T( "WAVE" )]=gridcols24;
+    placeholders[_T( "LWAVE" )]=gridcols24;
+    gridc gridcols25 = { 1,LogbookHTML::SWELL };
+    placeholders[_T( "SWELL" )]=gridcols25;
+    placeholders[_T( "LSWELL" )]=gridcols25;
+    gridc gridcols26 = { 1,LogbookHTML::WEATHER };
+    placeholders[_T( "WEATHER" )]=gridcols26;
+    placeholders[_T( "LWEATHER" )]=gridcols26;
+    gridc gridcols27 = { 1,LogbookHTML::CLOUDS };
+    placeholders[_T( "CLOUDS" )]=gridcols27;
+    placeholders[_T( "LCLOUDS" )]=gridcols27;
+    gridc gridcols28 = { 1,LogbookHTML::VISIBILITY };
+    placeholders[_T( "VISIBILITY" )]=gridcols28;
+    placeholders[_T( "LVISIBILITY" )]=gridcols28;
+
+    gridc gridcols29 = { 2,LogbookHTML::MOTOR};
+    placeholders[_T( "MOTOR" )]=gridcols29;
+    placeholders[_T( "LMOTOR" )]=gridcols29;
+    gridc gridcols30 = { 2,LogbookHTML::MOTORT };
+    placeholders[_T( "MOTORT" )]=gridcols30;
+    placeholders[_T( "LMOTORT" )]=gridcols30;
+    gridc gridcols31 = { 2,LogbookHTML::MOTOR1};
+    placeholders[_T( "MOTOR1" )]=gridcols31;
+    placeholders[_T( "LMOTOR1" )]=gridcols31;
+    gridc gridcols32 = { 2,LogbookHTML::MOTOR1T};
+    placeholders[_T( "MOTOR1T" )]=gridcols32;
+    placeholders[_T( "LMOTOR1T" )]=gridcols32;
+    gridc gridcols33 = { 2,LogbookHTML::FUEL};
+    placeholders[_T( "FUEL" )]=gridcols33;
+    placeholders[_T( "LFUEL" )]=gridcols33;
+    gridc gridcols34 = { 2,LogbookHTML::FUELT};
+    placeholders[_T( "FUELT" )]=gridcols34;
+    placeholders[_T( "LFUELT" )]=gridcols34;
+    gridc gridcols35 = { 2,LogbookHTML::GENE};
+    placeholders[_T( "GENE" )]=gridcols35;
+    placeholders[_T( "LGENE" )]=gridcols35;
+    gridc gridcols36 = { 2,LogbookHTML::GENET};
+    placeholders[_T( "GENET" )]=gridcols36;
+    placeholders[_T( "LGENET" )]=gridcols36;
+    gridc gridcols37 = { 2,LogbookHTML::BANK1 };
+    placeholders[_T( "BANK1" )]=gridcols37;
+    placeholders[_T( "LBANK1" )]=gridcols37;
+    gridc gridcols38 = { 2,LogbookHTML::BANK1T };
+    placeholders[_T( "BANK1T" )]=gridcols38;
+    placeholders[_T( "LBANK1T" )]=gridcols38;
+    gridc gridcols39 = { 2,LogbookHTML::BANK2 };
+    placeholders[_T( "BANK2" )]=gridcols39;
+    placeholders[_T( "LBANK2" )]=gridcols39;
+    gridc gridcols40 = { 2,LogbookHTML::BANK2T };
+    placeholders[_T( "BANK2T" )]=gridcols40;
+    placeholders[_T( "LBANK2T" )]=gridcols40;
+    gridc gridcols41 = { 2,LogbookHTML::SAILS };
+    placeholders[_T( "SAILS" )]=gridcols41;
+    placeholders[_T( "LSAILS" )]=gridcols41;
+    gridc gridcols42 = { 2,LogbookHTML::REEF };
+    placeholders[_T( "REEF" )]=gridcols42;
+    placeholders[_T( "LREEF" )]=gridcols42;
+    gridc gridcols43 = { 2,LogbookHTML::WATERM };
+    placeholders[_T( "WATERM" )]=gridcols43;
+    placeholders[_T( "LWATERM" )]=gridcols43;
+    gridc gridcols44 = { 2,LogbookHTML::WATERMT };
+    placeholders[_T( "WATERMT" )]=gridcols44;
+    placeholders[_T( "LWATERMT" )]=gridcols44;
+    gridc gridcols45 = { 2,LogbookHTML::WATERMO };
+    placeholders[_T( "WATERMO" )]=gridcols45;
+    placeholders[_T( "LWATERMO" )]=gridcols45;
+    gridc gridcols46 = { 2,LogbookHTML::WATER };
+    placeholders[_T( "WATER" )]=gridcols46;
+    placeholders[_T( "LWATER" )]=gridcols46;
+    gridc gridcols47 = { 2,LogbookHTML::WATERT };
+    placeholders[_T( "WATERT" )]=gridcols47;
+    placeholders[_T( "LWATERT" )]=gridcols47;
+    gridc gridcols48 = { 2,LogbookHTML::MREMARKS };
+    placeholders[_T( "MREMARKS" )]=gridcols48;
+    placeholders[_T( "LMREMARKS" )]=gridcols48;
+
+    placeholdersboat[_T( "LLOGBOOK" )]     = parent->m_logbook->GetPageText( 0 );
+    placeholdersboat[_T( "LFROM" )]        = _( "from" );
+    placeholdersboat[_T( "LTO" )]          = _( "to" );
+    if ( parent->logGrids[0]->GetNumberRows() > 0 )
+    {
+        placeholdersboat[_T( "SDATE" )]        = parent->m_gridGlobal->GetCellValue( 0,1 );
+        placeholdersboat[_T( "EDATE" )]        = parent->m_gridGlobal->GetCellValue( parent->m_gridGlobal->GetNumberRows()-1,1 );
+    }
+    placeholdersboat[_T( "TYPE" )]         = parent->boatType->GetValue();
+    placeholdersboat[_T( "BOATNAME" )]     = parent->boatName->GetValue();
+    placeholdersboat[_T( "HOMEPORT" )]     = parent->homeport->GetValue();
+    placeholdersboat[_T( "CALLSIGN" )]     = parent->callsign->GetValue();
+    placeholdersboat[_T( "REGISTRATION" )] = parent->registration->GetValue();
 //	placeholdersboat[_T("LOCATION")]     = layout_locn + layout + _T(".html");
 }
 
-void LogbookHTML::viewHTML(wxString path, wxString layout, bool mode)
+void LogbookHTML::viewHTML( wxString path, wxString layout, bool mode )
 {
-	if(layout.Contains(_T("Help")))
-	{
-		path = layout_locn+layout+_T(".html");
-		parent->startBrowser(path);
-		return;
-	}
-
-	setSelection();
-
-	wxString prefix = logbook->opt->engineStr[logbook->opt->engines]+logbook->opt->layoutPrefix[LogbookDialog::LOGBOOK];
-    if(logbook->opt->filterLayout[LogbookDialog::LOGBOOK])
-        layout.Prepend(prefix);
-    wxString file = toHTML(path, layout, mode);
-	if(file != wxT(""))
-		parent->startBrowser(file);
+    if ( layout.Contains( _T( "Help" ) ) )
+    {
+        path = layout_locn+layout+_T( ".html" );
+        parent->startBrowser( path );
+        return;
+    }
+
+    setSelection();
+
+    wxString prefix = logbook->opt->engineStr[logbook->opt->engines]+logbook->opt->layoutPrefix[LogbookDialog::LOGBOOK];
+    if ( logbook->opt->filterLayout[LogbookDialog::LOGBOOK] )
+        layout.Prepend( prefix );
+    wxString file = toHTML( path, layout, mode );
+    if ( file != wxT( "" ) )
+        parent->startBrowser( file );
 }
 
 void LogbookHTML::setSelection()
 {
-	int row = parent->selGridRow;
-	int z = 0 , r = 1, topRow, bottomRow, first, last;
+    int row = parent->selGridRow;
+    int z = 0 , r = 1, topRow, bottomRow, first, last;
 
-	first = last = 0;
-	
-	if(parent->logGrids[0]->GetRows() == 0) return;
-
-	if(parent->logGrids[parent->m_notebook8->GetSelection()]->IsSelection())
-	{
-		wxGridCellCoordsArray top = 
-			parent->logGrids[parent->m_notebook8->GetSelection()]->GetSelectionBlockTopLeft();
-		wxGridCellCoordsArray bottom = 
-			parent->logGrids[parent->m_notebook8->GetSelection()]->GetSelectionBlockBottomRight();
-		if(top.Count() != 0)
-		{
-			topRow = top[0].GetRow();
-			bottomRow = bottom[0].GetRow();
-			r = bottomRow-topRow+1;
-		}
-	}
-
-	z = parent->m_gridGlobal->GetNumberRows();
-	if(r == z)
-	{
-		parent->m_gridGlobal->SelectAll();
-		parent->m_gridWeather->SelectAll();
-		parent->m_gridMotorSails->SelectAll();
-	}
-	else
-	{
-		parent->m_gridGlobal->ClearSelection();	
-		parent->m_gridWeather->ClearSelection();	
-		parent->m_gridMotorSails->ClearSelection();	
-	}
-
-	wxString selRoute = parent->m_gridGlobal->GetCellValue(row,0);
-	
-	while(row > -1 && parent->m_gridGlobal->GetCellValue(row,0) == selRoute)
-		first = row--;
-	row = parent->selGridRow;
-	while(row < parent->m_gridGlobal->GetNumberRows() && parent->m_gridGlobal->GetCellValue(row,0) == selRoute)
-		last = row++;
-
-	for(row = first; row <= last; row++)
-	{
-		parent->m_gridGlobal->SelectRow(row,true);
-		parent->m_gridWeather->SelectRow(row,true);
-		parent->m_gridMotorSails->SelectRow(row,true);
-	}
-}
-
-wxString LogbookHTML::toHTML(wxString path, wxString layout, bool mode)
-{
-	wxArrayInt arrayRows;
-	int count = 0, selCount = 0;
-	bool selection = false;
-	route = wxEmptyString;
-
-	selCount = parent->m_gridGlobal->GetSelectedRows().Count() ;
-
-	if(selCount > 0)
-	{
-		selection = true;
-		arrayRows = parent->m_gridGlobal->GetSelectedRows();
-	}
+    first = last = 0;
 
-	if(layout == _T(""))
-	{
-#ifdef __WXOSX__
-        MessageBoxOSX(NULL,_("Sorry, no Layout installed"),_T("Information"),wxID_OK);
-#else
-		wxMessageBox(_("Sorry, no Layout installed"),_("Information"),wxOK);
-#endif
-		return _T("");
-	}
+    if ( parent->logGrids[0]->GetRows() == 0 ) return;
+
+    if ( parent->logGrids[parent->m_notebook8->GetSelection()]->IsSelection() )
+    {
+        wxGridCellCoordsArray top =
+            parent->logGrids[parent->m_notebook8->GetSelection()]->GetSelectionBlockTopLeft();
+        wxGridCellCoordsArray bottom =
+            parent->logGrids[parent->m_notebook8->GetSelection()]->GetSelectionBlockBottomRight();
+        if ( top.Count() != 0 )
+        {
+            topRow = top[0].GetRow();
+            bottomRow = bottom[0].GetRow();
+            r = bottomRow-topRow+1;
+        }
+    }
 
-	wxString html = readLayoutFile(layout);
+    z = parent->m_gridGlobal->GetNumberRows();
+    if ( r == z )
+    {
+        parent->m_gridGlobal->SelectAll();
+        parent->m_gridWeather->SelectAll();
+        parent->m_gridMotorSails->SelectAll();
+    }
+    else
+    {
+        parent->m_gridGlobal->ClearSelection();
+        parent->m_gridWeather->ClearSelection();
+        parent->m_gridMotorSails->ClearSelection();
+    }
 
-	wxString topHTML;
-	wxString bottomHTML;
-	wxString headerHTML;
-	wxString middleHTML;
-
-	wxString seperatorTop = _T("<!--Repeat -->");
-	wxString seperatorBottom = _T("<!--Repeat End -->");
-	wxString seperatorHeaderTop = _T("<!--Header -->");
-	wxString seperatorHeaderBottom = _T("<!--Header end -->");
-
-	int indexTop = html.Find(seperatorTop);
-	if(!checkLayoutError(indexTop,seperatorTop,layout)) return _T("");
-	indexTop += seperatorTop.Len();
-	int indexBottom = html.Find(seperatorBottom);
-	if(!checkLayoutError(indexBottom,seperatorBottom,layout)) return _T("");
-	indexBottom += seperatorBottom.Len();
-	int indexHeaderTop = html.Find(seperatorHeaderTop);
-	if(!checkLayoutError(indexHeaderTop,seperatorHeaderTop,layout)) return _T("");
-	indexHeaderTop += seperatorHeaderTop.Len();
-	int indexHeaderBottom = html.Find(seperatorHeaderBottom);
-	if(!checkLayoutError(indexHeaderBottom,seperatorHeaderBottom,layout)) return _T("");
-	indexHeaderBottom += seperatorHeaderBottom.Len();
-
-	topHTML = html.substr(0,indexHeaderTop);
-	bottomHTML = html.substr(indexBottom,html.Len()-1);
-	middleHTML = html.substr(indexTop,indexBottom-indexTop);
-	headerHTML = html.substr(indexHeaderTop,indexHeaderBottom-indexHeaderTop);
-
-	wxString filename = this->fileName;
-
-	if(mode == false)
-	{
-		filename.Replace(wxT("txt"),wxT("html"));
-	}
-	else
-		filename = path;
-
-	if(::wxFileExists(filename))
-		::wxRemoveFile(filename);
-	
-	wxFileOutputStream output( filename );
-	wxTextOutputStream htmlFile(output);
-
-	wxString newMiddleHTML;
-
-	topHTML.Replace(wxT("#LLOGBOOK#"),parent->m_logbook->GetPageText(0),false);
-	topHTML.Replace(wxT("#LFROM#"),_("from"),false);
-	topHTML.Replace(wxT("#LTO#"),_("to"),false);
-	topHTML.Replace(wxT("#SDATE#"),parent->m_gridGlobal->GetCellValue(0,1),false);
-	topHTML.Replace(wxT("#EDATE#"),parent->m_gridGlobal->GetCellValue(
-		parent->m_gridGlobal->GetNumberRows()-1,1),false);
-	topHTML.Replace(wxT("#TYPE#"),parent->boatType->GetValue(),false);
-	topHTML.Replace(wxT("#BOATNAME#"),parent->boatName->GetValue(),false);
-	topHTML.Replace(wxT("#HOMEPORT#"),parent->homeport->GetValue(),false);
-	topHTML.Replace(wxT("#CALLSIGN#"),parent->callsign->GetValue(),false);
-	topHTML.Replace(wxT("#REGISTRATION#"),parent->registration->GetValue(),false);
-	topHTML.Replace(wxT("#LOCATION#"),layout_locn + layout + _T(".html"),false);
-	htmlFile << topHTML;
-
-	int rowsMax = parent->m_gridGlobal->GetNumberRows();
-	for(int row = 0; row < rowsMax; row++)
-	{
-		count++;
-		if(selection && arrayRows[0]+1 > count) continue;
-		if(selection && arrayRows[selCount-1]+1 < count) break;
+    wxString selRoute = parent->m_gridGlobal->GetCellValue( row,0 );
+
+    while ( row > -1 && parent->m_gridGlobal->GetCellValue( row,0 ) == selRoute )
+        first = row--;
+    row = parent->selGridRow;
+    while ( row < parent->m_gridGlobal->GetNumberRows() && parent->m_gridGlobal->GetCellValue( row,0 ) == selRoute )
+        last = row++;
+
+    for ( row = first; row <= last; row++ )
+    {
+        parent->m_gridGlobal->SelectRow( row,true );
+        parent->m_gridWeather->SelectRow( row,true );
+        parent->m_gridMotorSails->SelectRow( row,true );
+    }
+}
+
+wxString LogbookHTML::toHTML( wxString path, wxString layout, bool mode )
+{
+    wxArrayInt arrayRows;
+    int count = 0, selCount = 0;
+    bool selection = false;
+    route = wxEmptyString;
+
+    selCount = parent->m_gridGlobal->GetSelectedRows().Count() ;
+
+    if ( selCount > 0 )
+    {
+        selection = true;
+        arrayRows = parent->m_gridGlobal->GetSelectedRows();
+    }
+
+    if ( layout == _T( "" ) )
+    {
+        wxMessageBox( _( "Sorry, no Layout installed" ),_( "Information" ),wxOK );
+        return _T( "" );
+    }
+
+    wxString html = readLayoutFile( layout );
+
+    wxString topHTML;
+    wxString bottomHTML;
+    wxString headerHTML;
+    wxString middleHTML;
+
+    wxString seperatorTop = _T( "<!--Repeat -->" );
+    wxString seperatorBottom = _T( "<!--Repeat End -->" );
+    wxString seperatorHeaderTop = _T( "<!--Header -->" );
+    wxString seperatorHeaderBottom = _T( "<!--Header end -->" );
+
+    int indexTop = html.Find( seperatorTop );
+    if ( !checkLayoutError( indexTop,seperatorTop,layout ) ) return _T( "" );
+    indexTop += seperatorTop.Len();
+    int indexBottom = html.Find( seperatorBottom );
+    if ( !checkLayoutError( indexBottom,seperatorBottom,layout ) ) return _T( "" );
+    indexBottom += seperatorBottom.Len();
+    int indexHeaderTop = html.Find( seperatorHeaderTop );
+    if ( !checkLayoutError( indexHeaderTop,seperatorHeaderTop,layout ) ) return _T( "" );
+    indexHeaderTop += seperatorHeaderTop.Len();
+    int indexHeaderBottom = html.Find( seperatorHeaderBottom );
+    if ( !checkLayoutError( indexHeaderBottom,seperatorHeaderBottom,layout ) ) return _T( "" );
+    indexHeaderBottom += seperatorHeaderBottom.Len();
+
+    topHTML = html.substr( 0,indexHeaderTop );
+    bottomHTML = html.substr( indexBottom,html.Len()-1 );
+    middleHTML = html.substr( indexTop,indexBottom-indexTop );
+    headerHTML = html.substr( indexHeaderTop,indexHeaderBottom-indexHeaderTop );
+
+    wxString filename = this->fileName;
+
+    if ( mode == false )
+    {
+        filename.Replace( wxT( "txt" ),wxT( "html" ) );
+    }
+    else
+        filename = path;
+
+    if ( ::wxFileExists( filename ) )
+        ::wxRemoveFile( filename );
+
+    wxFileOutputStream output( filename );
+    wxTextOutputStream htmlFile( output );
+
+    wxString newMiddleHTML;
+
+    topHTML.Replace( wxT( "#LLOGBOOK#" ),parent->m_logbook->GetPageText( 0 ),false );
+    topHTML.Replace( wxT( "#LFROM#" ),_( "from" ),false );
+    topHTML.Replace( wxT( "#LTO#" ),_( "to" ),false );
+    topHTML.Replace( wxT( "#SDATE#" ),parent->m_gridGlobal->GetCellValue( 0,1 ),false );
+    topHTML.Replace( wxT( "#EDATE#" ),parent->m_gridGlobal->GetCellValue(
+                         parent->m_gridGlobal->GetNumberRows()-1,1 ),false );
+    topHTML.Replace( wxT( "#TYPE#" ),parent->boatType->GetValue(),false );
+    topHTML.Replace( wxT( "#BOATNAME#" ),parent->boatName->GetValue(),false );
+    topHTML.Replace( wxT( "#HOMEPORT#" ),parent->homeport->GetValue(),false );
+    topHTML.Replace( wxT( "#CALLSIGN#" ),parent->callsign->GetValue(),false );
+    topHTML.Replace( wxT( "#REGISTRATION#" ),parent->registration->GetValue(),false );
+    topHTML.Replace( wxT( "#LOCATION#" ),layout_locn + layout + _T( ".html" ),false );
+    htmlFile << topHTML;
+
+    int rowsMax = parent->m_gridGlobal->GetNumberRows();
+    for ( int row = 0; row < rowsMax; row++ )
+    {
+        count++;
+        if ( selection && arrayRows[0]+1 > count ) continue;
+        if ( selection && arrayRows[selCount-1]+1 < count ) break;
+
+        newMiddleHTML = middleHTML;
 
-		newMiddleHTML = middleHTML;
-        
 #ifdef __WXMSW__
-		unsigned int first = 0, ofirst = 0;
+        unsigned int first = 0, ofirst = 0;
 #endif
-		for(int grid = 0; grid < 3; grid++)
-		{
-			wxGrid* g = parent->logGrids[grid];
-			for(int col = 0; col < g->GetNumberCols(); col++)
-			{
-				if(grid == 0 && col == 0)
-				{
-					replacePlaceholder(newMiddleHTML,headerHTML,grid,row,0,0,htmlFile);
-					continue;
-				}
+        for ( int grid = 0; grid < 3; grid++ )
+        {
+            wxGrid* g = parent->logGrids[grid];
+            for ( int col = 0; col < g->GetNumberCols(); col++ )
+            {
+                if ( grid == 0 && col == 0 )
+                {
+                    replacePlaceholder( newMiddleHTML,headerHTML,grid,row,0,0,htmlFile );
+                    continue;
+                }
 #ifdef __WXMSW__
-				first = newMiddleHTML.find_first_of('#')-1;
-				if(first != ofirst)
-				{
-					htmlFile << newMiddleHTML.SubString(0,first);
-					newMiddleHTML.Remove(0,first+1);
-					ofirst = first;
-				}
+                first = newMiddleHTML.find_first_of( '#' )-1;
+                if ( first != ofirst )
+                {
+                    htmlFile << newMiddleHTML.SubString( 0,first );
+                    newMiddleHTML.Remove( 0,first+1 );
+                    ofirst = first;
+                }
 #endif
-				newMiddleHTML = replacePlaceholder(newMiddleHTML,headerHTML,grid,row,col,0,htmlFile);
-			}
-		}
-		htmlFile << newMiddleHTML;
-	}
-	htmlFile << bottomHTML;
+                newMiddleHTML = replacePlaceholder( newMiddleHTML,headerHTML,grid,row,col,0,htmlFile );
+            }
+        }
+        htmlFile << newMiddleHTML;
+    }
+    htmlFile << bottomHTML;
 
-	if(count <= 0)
-	{
-#ifdef __WXOSX__
-        MessageBoxOSX(NULL,_("Sorry, Logbook has no lines"),_T("Information"),wxID_OK);
-#else
-		wxMessageBox(_("Sorry, Logbook has no lines"),_("Information"),wxOK);
-#endif
-		return _T("");
-	}
+    if ( count <= 0 )
+    {
+        wxMessageBox( _( "Sorry, Logbook has no lines" ),_( "Information" ),wxOK );
+        return _T( "" );
+    }
 
-	output.Close();
+    output.Close();
 
-	return filename;
+    return filename;
 }
 
-wxString LogbookHTML::replacePlaceholder(wxString html,wxString htmlHeader,int grid, int row, int col, bool mode, wxTextOutputStream &htmlFile)
-{
-
-		wxString s;
-		wxGrid* g = parent->logGrids[grid];
-
-			switch(grid)
-			{
-			case 0:
-					switch(col)
-					{
-						case ROUTE:	if(route != Export::replaceNewLine(mode,g->GetCellValue(row,col),false))
-									{
-										htmlHeader.Replace(wxT("#ROUTE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false));
-										htmlHeader.Replace(wxT("#LROUTE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-										htmlFile << htmlHeader;
-									}
-										route = Export::replaceNewLine(mode,g->GetCellValue(row,col),false);
-
-								break;
-						case RDATE:		html.Replace(wxT("#DATE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LDATE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-										html.Replace(wxT("#NO.#"),wxString::Format(_T("%i"),row+1));
-								break;
-						case RTIME:		html.Replace(wxT("#TIME#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LTIME#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case STATUS:		html.Replace(wxT("#STATUS#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LSTATUS#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WAKE:		html.Replace(wxT("#WAKE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWAKE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case DISTANCE:	html.Replace(wxT("#DISTANCE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LDISTANCE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case DTOTAL:	html.Replace(wxT("#DTOTAL#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LDTOTAL#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case POSITION:	html.Replace(wxT("#POSITION#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LPOSITION#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case COG:		html.Replace(wxT("#COG#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LCOG#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case COW:		html.Replace(wxT("#COW#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LCOW#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case SOG:		html.Replace(wxT("#SOG#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LSOG#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case SOW:		html.Replace(wxT("#SOW#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LSOW#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case DEPTH:		html.Replace(wxT("#DEPTH#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LDEPTH#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case REMARKS:	html.Replace(wxT("#REMARKS#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LREMARKS#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-					}
-					break;
-			case 1:
-					switch(col)
-					{
-						case BARO:		html.Replace(wxT("#BARO#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LBARO#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case HYDRO:		html.Replace(wxT("#HYDRO#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LHYDRO#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case AIRTE:		html.Replace(wxT("#AIRTE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LAIRTE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WATERTE:	html.Replace(wxT("#WTE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWTE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WIND:		html.Replace(wxT("#WIND#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWIND#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WSPD:		html.Replace(wxT("#WSPD#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWSPD#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WINDR:		html.Replace(wxT("#WINDR#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWINDR#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WSPDR:		html.Replace(wxT("#WSPDR#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWSPDR#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case CURRENT:	html.Replace(wxT("#CUR#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LCUR#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case CSPD:		html.Replace(wxT("#CSPD#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LCSPD#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WAVE:		html.Replace(wxT("#WAVE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWAVE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);	
-								break;
-						case SWELL:		html.Replace(wxT("#SWELL#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LSWELL#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WEATHER:	html.Replace(wxT("#WEATHER#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWEATHER#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case CLOUDS:	html.Replace(wxT("#CLOUDS#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false));
-										html.Replace(wxT("#LCLOUDS#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true));
-										{
-										wxString cl = Export::replaceNewLine(mode,g->GetCellValue(row,col),false).Lower();
-										if(cl.IsEmpty())
-											cl = _T("nocloud");
-										if(cl.Contains(_T(" ")))
-											cl = cl.SubString(0,cl.find_first_of(' ')-1);
-										if(html.Contains(wxT("#PCLOUDS%23")))
-										{
-											wxString s = parent->data;
-											s.Replace(_T("\\"),_T("/"));
-											html.Replace(wxT("Clouds/#PCLOUDS%23"),s+_T("Clouds/")+cl,false);
-										}
-										else
-											html.Replace(wxT("#PCLOUDS#"),cl,false);
-										}
-								break;
-						case VISIBILITY:html.Replace(wxT("#VISIBILITY#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LVISIBILITY#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-					}
-					break;
-			case 2:
-					switch(col)
-					{
-						case MOTOR:		html.Replace(wxT("#MOTOR#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LMOTOR#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case MOTORT:	html.Replace(wxT("#MOTORT#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LMOTORT#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-                        case RPM1:	 	html.Replace(wxT("#RPM1#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-                                        html.Replace(wxT("#LRPM1#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-                                break;
-						case MOTOR1:	html.Replace(wxT("#MOTOR1#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LMOTOR1#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case MOTOR1T:	html.Replace(wxT("#MOTOR1T#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LMOTOR1T#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-                        case RPM2:		html.Replace(wxT("#RPM2#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-                                        html.Replace(wxT("#LRPM2#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-                                break;
-						case FUEL:		html.Replace(wxT("#FUEL#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LFUEL#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case FUELT:		html.Replace(wxT("#FUELT#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LFUELT#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case GENE:		html.Replace(wxT("#GENE#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LGENE#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case GENET: 	html.Replace(wxT("#GENET#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LGENET#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case BANK1:		html.Replace(wxT("#BANK1#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LBANK1#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case BANK1T: 	html.Replace(wxT("#BANK1T#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LBANK1T#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case BANK2:		html.Replace(wxT("#BANK2#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LBANK2#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case BANK2T: 	html.Replace(wxT("#BANK2T#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LBANK2T#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case SAILS:		html.Replace(wxT("#SAILS#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LSAILS#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case REEF:		html.Replace(wxT("#REEF#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LREEF#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WATERM:	html.Replace(wxT("#WATERM#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWATERM#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WATERMT:	html.Replace(wxT("#WATERMT#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWATERMT#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WATERMO:	html.Replace(wxT("#WATERMO#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWATERMO#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WATER:		html.Replace(wxT("#WATER#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWATER#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case WATERT:	html.Replace(wxT("#WATERT#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LWATERT#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-						case MREMARKS:	html.Replace(wxT("#MREMARKS#"),Export::replaceNewLine(mode,g->GetCellValue(row,col),false),false);
-										html.Replace(wxT("#LMREMARKS#"),Export::replaceNewLine(mode,g->GetColLabelValue(col),true),false);
-								break;
-					}
-					break;
-			}
-
-	if(mode == 0)
-		return html;
-	else 
-	{
+wxString LogbookHTML::replacePlaceholder( wxString html,wxString htmlHeader,int grid, int row, int col, bool mode, wxTextOutputStream &htmlFile )
+{
+
+    wxString s;
+    wxGrid* g = parent->logGrids[grid];
+
+    switch ( grid )
+    {
+    case 0:
+        switch ( col )
+        {
+        case ROUTE:
+            if ( route != Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ) )
+            {
+                htmlHeader.Replace( wxT( "#ROUTE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ) );
+                htmlHeader.Replace( wxT( "#LROUTE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+                htmlFile << htmlHeader;
+            }
+            route = Export::replaceNewLine( mode,g->GetCellValue( row,col ),false );
+
+            break;
+        case RDATE:
+            html.Replace( wxT( "#DATE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LDATE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            html.Replace( wxT( "#NO.#" ),wxString::Format( _T( "%i" ),row+1 ) );
+            break;
+        case RTIME:
+            html.Replace( wxT( "#TIME#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LTIME#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case STATUS:
+            html.Replace( wxT( "#STATUS#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LSTATUS#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WAKE:
+            html.Replace( wxT( "#WAKE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWAKE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case DISTANCE:
+            html.Replace( wxT( "#DISTANCE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LDISTANCE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case DTOTAL:
+            html.Replace( wxT( "#DTOTAL#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LDTOTAL#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case POSITION:
+            html.Replace( wxT( "#POSITION#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LPOSITION#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case COG:
+            html.Replace( wxT( "#COG#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LCOG#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case COW:
+            html.Replace( wxT( "#COW#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LCOW#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case SOG:
+            html.Replace( wxT( "#SOG#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LSOG#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case SOW:
+            html.Replace( wxT( "#SOW#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LSOW#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case DEPTH:
+            html.Replace( wxT( "#DEPTH#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LDEPTH#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case REMARKS:
+            html.Replace( wxT( "#REMARKS#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LREMARKS#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        }
+        break;
+    case 1:
+        switch ( col )
+        {
+        case BARO:
+            html.Replace( wxT( "#BARO#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LBARO#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case HYDRO:
+            html.Replace( wxT( "#HYDRO#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LHYDRO#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case AIRTE:
+            html.Replace( wxT( "#AIRTE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LAIRTE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WATERTE:
+            html.Replace( wxT( "#WTE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWTE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WIND:
+            html.Replace( wxT( "#WIND#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWIND#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WSPD:
+            html.Replace( wxT( "#WSPD#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWSPD#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WINDR:
+            html.Replace( wxT( "#WINDR#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWINDR#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WSPDR:
+            html.Replace( wxT( "#WSPDR#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWSPDR#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case CURRENT:
+            html.Replace( wxT( "#CUR#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LCUR#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case CSPD:
+            html.Replace( wxT( "#CSPD#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LCSPD#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WAVE:
+            html.Replace( wxT( "#WAVE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWAVE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case SWELL:
+            html.Replace( wxT( "#SWELL#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LSWELL#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WEATHER:
+            html.Replace( wxT( "#WEATHER#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWEATHER#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case CLOUDS:
+            html.Replace( wxT( "#CLOUDS#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ) );
+            html.Replace( wxT( "#LCLOUDS#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ) );
+            {
+                wxString cl = Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ).Lower();
+                if ( cl.IsEmpty() )
+                    cl = _T( "nocloud" );
+                if ( cl.Contains( _T( " " ) ) )
+                    cl = cl.SubString( 0,cl.find_first_of( ' ' )-1 );
+                if ( html.Contains( wxT( "#PCLOUDS%23" ) ) )
+                {
+                    wxString s = parent->data;
+                    s.Replace( _T( "\\" ),_T( "/" ) );
+                    html.Replace( wxT( "Clouds/#PCLOUDS%23" ),s+_T( "Clouds/" )+cl,false );
+                }
+                else
+                    html.Replace( wxT( "#PCLOUDS#" ),cl,false );
+            }
+            break;
+        case VISIBILITY:
+            html.Replace( wxT( "#VISIBILITY#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LVISIBILITY#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        }
+        break;
+    case 2:
+        switch ( col )
+        {
+        case MOTOR:
+            html.Replace( wxT( "#MOTOR#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LMOTOR#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case MOTORT:
+            html.Replace( wxT( "#MOTORT#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LMOTORT#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case RPM1:
+            html.Replace( wxT( "#RPM1#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LRPM1#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case MOTOR1:
+            html.Replace( wxT( "#MOTOR1#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LMOTOR1#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case MOTOR1T:
+            html.Replace( wxT( "#MOTOR1T#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LMOTOR1T#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case RPM2:
+            html.Replace( wxT( "#RPM2#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LRPM2#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case FUEL:
+            html.Replace( wxT( "#FUEL#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LFUEL#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case FUELT:
+            html.Replace( wxT( "#FUELT#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LFUELT#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case GENE:
+            html.Replace( wxT( "#GENE#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LGENE#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case GENET:
+            html.Replace( wxT( "#GENET#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LGENET#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case BANK1:
+            html.Replace( wxT( "#BANK1#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LBANK1#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case BANK1T:
+            html.Replace( wxT( "#BANK1T#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LBANK1T#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case BANK2:
+            html.Replace( wxT( "#BANK2#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LBANK2#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case BANK2T:
+            html.Replace( wxT( "#BANK2T#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LBANK2T#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case SAILS:
+            html.Replace( wxT( "#SAILS#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LSAILS#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case REEF:
+            html.Replace( wxT( "#REEF#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LREEF#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WATERM:
+            html.Replace( wxT( "#WATERM#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWATERM#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WATERMT:
+            html.Replace( wxT( "#WATERMT#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWATERMT#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WATERMO:
+            html.Replace( wxT( "#WATERMO#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWATERMO#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WATER:
+            html.Replace( wxT( "#WATER#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWATER#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case WATERT:
+            html.Replace( wxT( "#WATERT#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LWATERT#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        case MREMARKS:
+            html.Replace( wxT( "#MREMARKS#" ),Export::replaceNewLine( mode,g->GetCellValue( row,col ),false ),false );
+            html.Replace( wxT( "#LMREMARKS#" ),Export::replaceNewLine( mode,g->GetColLabelValue( col ),true ),false );
+            break;
+        }
+        break;
+    }
+
+    if ( mode == 0 )
+        return html;
+    else
+    {
 #ifdef __WXOSX__
-               wxString str(html.wx_str(), wxConvUTF8);
+        wxString str( html.wx_str(), wxConvUTF8 );
 #else
-		wxString str(html.wx_str(),wxConvUTF8);
+        wxString str( html.wx_str(),wxConvUTF8 );
 #endif
-		return str;
-	}
+        return str;
+    }
 }
 
-bool LogbookHTML::checkLayoutError(int result, wxString html, wxString layout)
+bool LogbookHTML::checkLayoutError( int result, wxString html, wxString layout )
 {
-	if(result == wxNOT_FOUND)
-	{
-#ifdef __WXOSX__
-        MessageBoxOSX(NULL,html+_("\nnot found in layoutfile ")+layout+_("!\n\nDid you forget to add this line in your layout ?"),_("Information"),wxID_OK);
+    if ( result == wxNOT_FOUND )
+    {
+        wxMessageBox( html+_( "\nnot found in layoutfile " )+layout+_( "!\n\nDid you forget to add this line in your layout ?" ),_( "Information" ) );
         return false;
-#else
-		wxMessageBox(html+_("\nnot found in layoutfile ")+layout+_("!\n\nDid you forget to add this line in your layout ?"),_("Information"));
-		return false;
-#endif
-	}
-	return true;
+    }
+    return true;
 }
 
-void LogbookHTML::setFileName(wxString s, wxString l)
+void LogbookHTML::setFileName( wxString s, wxString l )
 {
-	fileName = s;
-	layout_locn = l;
+    fileName = s;
+    layout_locn = l;
 }
 
-wxString LogbookHTML::readLayoutFile(wxString layout)
+wxString LogbookHTML::readLayoutFile( wxString layout )
 {
-	wxString html;
+    wxString html;
 
-	wxString filename = layout_locn + layout + _T(".html");
-	wxTextFile *layoutfile = new wxTextFile(filename);
+    wxString filename = layout_locn + layout + _T( ".html" );
+    wxTextFile *layoutfile = new wxTextFile( filename );
 
-	if(wxFileExists(filename))
-	{
-		layoutfile->Open();
+    if ( wxFileExists( filename ) )
+    {
+        layoutfile->Open();
 
-		for(unsigned row = 0; row < layoutfile->GetLineCount(); row++)
-		{
-			html += layoutfile->GetLine(row)+wxT("\n");
-		}
-	}
-	layoutfile->Close();
-	return html;
+        for ( unsigned row = 0; row < layoutfile->GetLineCount(); row++ )
+        {
+            html += layoutfile->GetLine( row )+wxT( "\n" );
+        }
+    }
+    layoutfile->Close();
+    return html;
 }
 
-wxString LogbookHTML::readLayoutFileODT(wxString layout)
+wxString LogbookHTML::readLayoutFileODT( wxString layout )
 {
-	auto_ptr<wxZipEntry> entry;
-	wxString odt = _T("");
-	wxString filename = layout_locn + layout + _T(".odt");
-	if(wxFileExists(filename))
-	{
+    auto_ptr<wxZipEntry> entry;
+    wxString odt = _T( "" );
+    wxString filename = layout_locn + layout + _T( ".odt" );
+    if ( wxFileExists( filename ) )
+    {
 //#ifdef __WXOSX__
 
-        static const wxString fn = _T("content.xml");
-        wxString name = wxZipEntry::GetInternalName(fn);
-        wxFFileInputStream in(filename);
-        wxZipInputStream zip(in);
+        static const wxString fn = _T( "content.xml" );
+        wxString name = wxZipEntry::GetInternalName( fn );
+        wxFFileInputStream in( filename );
+        wxZipInputStream zip( in );
         do
         {
-            entry.reset(zip.GetNextEntry());
+            entry.reset( zip.GetNextEntry() );
         }
-        while (entry.get() != NULL && entry->GetInternalName() != name);
-        if (entry.get() != NULL)
+        while ( entry.get() != NULL && entry->GetInternalName() != name );
+        if ( entry.get() != NULL )
         {
-            wxTextInputStream txt(zip,_T("\n"),wxConvUTF8);
-            while(!zip.Eof())
+            wxTextInputStream txt( zip,_T( "\n" ),wxConvUTF8 );
+            while ( !zip.Eof() )
                 odt += txt.ReadLine();
         }
 //#else
-/*        static const wxString fn = _T("content.xml");
-		wxFileInputStream in(filename);
-        wxZipInputStream zip(in);
-		wxTextInputStream txt(zip);
-		while(!zip.Eof())
-			odt += txt.ReadLine();
-//#endif*/
-	}
-	return odt;
-}
-
-void LogbookHTML::viewODT(wxString path, wxString layout, bool mode)
-{
-	wxString prefix = logbook->opt->engineStr[logbook->opt->engines]+logbook->opt->layoutPrefix[LogbookDialog::LOGBOOK];
-    if(logbook->opt->filterLayout[LogbookDialog::LOGBOOK])
-        layout.Prepend(prefix);
+        /*        static const wxString fn = _T("content.xml");
+        		wxFileInputStream in(filename);
+                wxZipInputStream zip(in);
+        		wxTextInputStream txt(zip);
+        		while(!zip.Eof())
+        			odt += txt.ReadLine();
+        //#endif*/
+    }
+    return odt;
+}
+
+void LogbookHTML::viewODT( wxString path, wxString layout, bool mode )
+{
+    wxString prefix = logbook->opt->engineStr[logbook->opt->engines]+logbook->opt->layoutPrefix[LogbookDialog::LOGBOOK];
+    if ( logbook->opt->filterLayout[LogbookDialog::LOGBOOK] )
+        layout.Prepend( prefix );
 
     setSelection();
 
-	wxString file = toODT(path, layout, mode);
-	if(file != wxT(""))
-		parent->startApplication(file,_T(".odt"));
+    wxString file = toODT( path, layout, mode );
+    if ( file != wxT( "" ) )
+        parent->startApplication( file,_T( ".odt" ) );
 }
 
-wxString LogbookHTML::toODT(wxString path,wxString layout, bool mode)
+wxString LogbookHTML::toODT( wxString path,wxString layout, bool mode )
 {
-	wxArrayInt arrayRows;
-	int count = 0, selCount = 0;
-	bool selection = false;
-	route = wxEmptyString;
+    wxArrayInt arrayRows;
+    int count = 0, selCount = 0;
+    bool selection = false;
+    route = wxEmptyString;
 
-	selCount = parent->m_gridGlobal->GetSelectedRows().Count() ;
+    selCount = parent->m_gridGlobal->GetSelectedRows().Count() ;
 
-	if(selCount > 0)
-	{
-		selection = true;
-		arrayRows = parent->m_gridGlobal->GetSelectedRows();
-	}
+    if ( selCount > 0 )
+    {
+        selection = true;
+        arrayRows = parent->m_gridGlobal->GetSelectedRows();
+    }
 
-	if(layout == _T(""))
-	{
-#ifdef __WXOSX__
-        MessageBoxOSX(NULL,_("Sorry, no Layout installed"),_T("Information"),wxID_OK);
-#else
-		wxMessageBox(_("Sorry, no Layout installed"),_("Information"),wxOK);
-#endif
-		return _T("");
-	}
+    if ( layout == _T( "" ) )
+    {
+        wxMessageBox( _( "Sorry, no Layout installed" ),_( "Information" ),wxOK );
+        return _T( "" );
+    }
 
-	wxString odt = readLayoutFileODT(layout);
+    wxString odt = readLayoutFileODT( layout );
 
-	if(!odt.Contains(_T("[[")) && !odt.Contains(_T("{{")))
-	{
-#ifdef __WXOSX__
-        MessageBoxOSX(NULL,_("Have You forgotten to enclose the Header with [[ and ]]\n or Data with {{ and }} ?"),_T("Information"),wxID_OK);
-#else
-		wxMessageBox(_("Have You forgotten to enclose the Header with [[ and ]]\n or Data with {{ and }} ?"));
-#endif
-		return _T("");
-	}
+    if ( !odt.Contains( _T( "[[" ) ) && !odt.Contains( _T( "{{" ) ) )
+    {
+        wxMessageBox( _( "Have You forgotten to enclose the Header with [[ and ]]\n or Data with {{ and }} ?" ) );
+        return _T( "" );
+    }
+
+    wxString topODT;
+    wxString bottomODT;
+    wxString headerODT;
+    wxString middleODT;
+
+    wxString seperatorTop = _T( "{{" );
+    wxString seperatorBottom = _T( "}}" );
+    wxString seperatorHeaderTop = _T( "[[" );
+    wxString seperatorHeaderBottom = _T( "]]" );
+    wxString textbegin = _T( "<text:p" );
+    wxString textend = _T( "</text:p" );
+
+    odt.Replace( wxT( "#LLOGBOOK#" ),parent->m_logbook->GetPageText( 0 ),false );
+    odt.Replace( wxT( "#LFROM#" ),_( "from" ),false );
+    odt.Replace( wxT( "#LTO#" ),_( "to" ),false );
+    odt.Replace( wxT( "#SDATE#" ),parent->m_gridGlobal->GetCellValue( 0,1 ),false );
+    odt.Replace( wxT( "#EDATE#" ),parent->m_gridGlobal->GetCellValue( parent->m_gridGlobal->GetNumberRows()-1,1 ),false );
+    odt.Replace( wxT( "#TYPE#" ),parent->boatType->GetValue(),false );
+    odt.Replace( wxT( "#BOATNAME#" ),parent->boatName->GetValue(),false );
+    odt.Replace( wxT( "#HOMEPORT#" ),parent->homeport->GetValue(),false );
+    odt.Replace( wxT( "#CALLSIGN#" ),parent->callsign->GetValue(),false );
+    odt.Replace( wxT( "#REGISTRATION#" ),parent->registration->GetValue(),false );
+
+    int indexTopODT = odt.Find( seperatorHeaderTop );
+    int top = indexTopODT;
+    topODT = odt.substr( 0,indexTopODT );
+    indexTopODT = topODT.find_last_of( '<' );
+    topODT = topODT.substr( 0,indexTopODT );
+    odt = odt.substr( top );
+
+    int headerStart = odt.find_first_of( '>' )+1;
+    odt = odt.substr( headerStart );
+
+    int indexBottomODT = odt.Find( seperatorHeaderBottom );
+    headerODT = odt.substr( 0,indexBottomODT );
+    odt = odt.substr( indexBottomODT );
+    int headerEnd = odt.find_first_of( '>' )+1;
+    odt = odt.substr( headerEnd );
+    indexBottomODT = headerODT.find_first_of( '<' );
+    headerODT = headerODT.substr( indexBottomODT );
+    headerODT = headerODT.substr( 0,headerODT.find_last_of( '<' ) );
+
+    indexBottomODT = odt.Find( seperatorTop );
+    middleODT = odt.substr( indexBottomODT );
+    odt = odt.substr( indexBottomODT );
+
+    int middleStart = middleODT.find_first_of( '>' )+1;
+    middleODT = middleODT.substr( middleStart );
+    odt = odt.substr( odt.find_first_of( '>' )+1 );
+
+    indexBottomODT = odt.Find( seperatorBottom );
+    middleODT = odt.substr( 0,indexBottomODT );
+    odt = odt.substr( indexBottomODT );
+
+    int middleEnd = odt.find_first_of( '>' )+1;
+    odt = odt.substr( middleEnd );
+    middleODT = middleODT.substr( 0,middleODT.find_last_of( '<' ) );
 
-	wxString topODT;
-	wxString bottomODT;
-	wxString headerODT;
-	wxString middleODT;
-
-	wxString seperatorTop = _T("{{");
-	wxString seperatorBottom = _T("}}");
-	wxString seperatorHeaderTop = _T("[[");
-	wxString seperatorHeaderBottom = _T("]]");
-	wxString textbegin = _T("<text:p");
-	wxString textend = _T("</text:p");
-
-	odt.Replace(wxT("#LLOGBOOK#"),parent->m_logbook->GetPageText(0),false);
-	odt.Replace(wxT("#LFROM#"),_("from"),false);
-	odt.Replace(wxT("#LTO#"),_("to"),false);
-	odt.Replace(wxT("#SDATE#"),parent->m_gridGlobal->GetCellValue(0,1),false);
-	odt.Replace(wxT("#EDATE#"),parent->m_gridGlobal->GetCellValue(parent->m_gridGlobal->GetNumberRows()-1,1),false);
-	odt.Replace(wxT("#TYPE#"),parent->boatType->GetValue(),false);
-	odt.Replace(wxT("#BOATNAME#"),parent->boatName->GetValue(),false);
-	odt.Replace(wxT("#HOMEPORT#"),parent->homeport->GetValue(),false);
-	odt.Replace(wxT("#CALLSIGN#"),parent->callsign->GetValue(),false);
-	odt.Replace(wxT("#REGISTRATION#"),parent->registration->GetValue(),false);
-
-	int indexTopODT = odt.Find(seperatorHeaderTop);
-	int top = indexTopODT;
-	topODT = odt.substr(0,indexTopODT);
-	indexTopODT = topODT.find_last_of('<');
-	topODT = topODT.substr(0,indexTopODT);
-	odt = odt.substr(top);
-
-	int headerStart = odt.find_first_of('>')+1;
-	odt = odt.substr(headerStart);
-
-	int indexBottomODT = odt.Find(seperatorHeaderBottom);
-	headerODT = odt.substr(0,indexBottomODT);
-	odt = odt.substr(indexBottomODT);
-	int headerEnd = odt.find_first_of('>')+1;
-	odt = odt.substr(headerEnd);
-	indexBottomODT = headerODT.find_first_of('<');
-	headerODT = headerODT.substr(indexBottomODT);
-	headerODT = headerODT.substr(0,headerODT.find_last_of('<'));
-
-	indexBottomODT = odt.Find(seperatorTop);
-	middleODT = odt.substr(indexBottomODT);
-	odt = odt.substr(indexBottomODT);
-
-	int middleStart = middleODT.find_first_of('>')+1;
-	middleODT = middleODT.substr(middleStart);
-	odt = odt.substr(odt.find_first_of('>')+1);
-
-	indexBottomODT = odt.Find(seperatorBottom);
-	middleODT = odt.substr(0,indexBottomODT);
-	odt = odt.substr(indexBottomODT);
-
-	int middleEnd = odt.find_first_of('>')+1;
-	odt = odt.substr(middleEnd);
-	middleODT = middleODT.substr(0,middleODT.find_last_of('<'));
-
-	wxString filename = this->fileName;
-
-	if(mode == false)
-	{
-		filename.Replace(wxT("txt"),wxT("odt"));
-	}
-	else
-		filename = path;
-
-	if(::wxFileExists(filename))
-		::wxRemoveFile(filename);
-	
-    auto_ptr<wxFFileInputStream> in(new wxFFileInputStream(layout_locn + layout + _T(".odt")));
-    wxTempFileOutputStream out(filename);
-
-    wxZipInputStream inzip(*in);
-    wxZipOutputStream outzip(out);
-	wxTextOutputStream odtFile(outzip);
+    wxString filename = this->fileName;
+
+    if ( mode == false )
+    {
+        filename.Replace( wxT( "txt" ),wxT( "odt" ) );
+    }
+    else
+        filename = path;
+
+    if ( ::wxFileExists( filename ) )
+        ::wxRemoveFile( filename );
+
+    auto_ptr<wxFFileInputStream> in( new wxFFileInputStream( layout_locn + layout + _T( ".odt" ) ) );
+    wxTempFileOutputStream out( filename );
+
+    wxZipInputStream inzip( *in );
+    wxZipOutputStream outzip( out );
+    wxTextOutputStream odtFile( outzip );
     auto_ptr<wxZipEntry> entry;
 
-    outzip.CopyArchiveMetaData(inzip);
+    outzip.CopyArchiveMetaData( inzip );
 
-    while (entry.reset(inzip.GetNextEntry()), entry.get() != NULL)
-        if (!entry->GetName().Matches(_T("content.xml")))
-            if (!outzip.CopyEntry(entry.release(), inzip))
+    while ( entry.reset( inzip.GetNextEntry() ), entry.get() != NULL )
+        if ( !entry->GetName().Matches( _T( "content.xml" ) ) )
+            if ( !outzip.CopyEntry( entry.release(), inzip ) )
                 break;
 
     in.reset();
 
-	outzip.PutNextEntry(_T("content.xml"));
+    outzip.PutNextEntry( _T( "content.xml" ) );
+
+    odtFile << topODT;
 
-	odtFile << topODT;
+    wxString newMiddleODT;
+    int rowsMax = parent->m_gridGlobal->GetNumberRows();
+    for ( int row = 0; row < rowsMax; row++ )
+    {
+        count++;
+        if ( selection && arrayRows[0]+1 > count ) continue;
+        if ( selection && arrayRows[selCount-1]+1 < count ) break;
 
-	wxString newMiddleODT;
-	int rowsMax = parent->m_gridGlobal->GetNumberRows();
-	for(int row = 0; row < rowsMax; row++)
-	{
-		count++;
-		if(selection && arrayRows[0]+1 > count) continue;
-		if(selection && arrayRows[selCount-1]+1 < count) break;
-
-		newMiddleODT = middleODT;
-		for(int grid = 0; grid < 3; grid++)
-		{
-			wxGrid* g = parent->logGrids[grid];
-			for(int col = 0; col < g->GetNumberCols(); col++)
-				newMiddleODT = replacePlaceholder(newMiddleODT,headerODT,grid,row,col,1,odtFile);
-		}
-		odtFile << newMiddleODT;
-	}
+        newMiddleODT = middleODT;
+        for ( int grid = 0; grid < 3; grid++ )
+        {
+            wxGrid* g = parent->logGrids[grid];
+            for ( int col = 0; col < g->GetNumberCols(); col++ )
+                newMiddleODT = replacePlaceholder( newMiddleODT,headerODT,grid,row,col,1,odtFile );
+        }
+        odtFile << newMiddleODT;
+    }
 
-	odtFile << odt;
+    odtFile << odt;
 
     inzip.Eof() && outzip.Close() && out.Commit();
-	return filename;
-	
+    return filename;
+
 }
 
-void LogbookHTML::toCSV(wxString path)
+void LogbookHTML::toCSV( wxString path )
 {
-	wxString s, temp;
+    wxString s, temp;
+
+    if ( ::wxFileExists( path ) )
+        ::wxRemoveFile( path );
 
-	if(::wxFileExists(path))
-		::wxRemoveFile(path);
-	
-	wxFileOutputStream output( path );
-	wxTextOutputStream csvFile(output);
+    wxFileOutputStream output( path );
+    wxTextOutputStream csvFile( output );
 
-	for(int n = 0; n < parent->numPages; n++)
-	{
-		for(int i = 0; i < parent->logGrids[n]->GetNumberCols(); i++)
+    for ( int n = 0; n < parent->numPages; n++ )
+    {
+        for ( int i = 0; i < parent->logGrids[n]->GetNumberCols(); i++ )
         {
-            wxString str = _T("\"")+parent->logGrids[n]->GetColLabelValue(i)+_T("\",");
-            if(i == LogbookHTML::POSITION && n == 0)
+            wxString str = _T( "\"" )+parent->logGrids[n]->GetColLabelValue( i )+_T( "\"," );
+            if ( i == LogbookHTML::POSITION && n == 0 )
             {
                 csvFile << str;
                 csvFile << str;
-			}
+            }
             else
                 csvFile << str;
-            }
         }
-        csvFile << _T("\n");
-        for(int row = 0; row < parent->m_gridGlobal->GetNumberRows(); row++)
+    }
+    csvFile << _T( "\n" );
+    for ( int row = 0; row < parent->m_gridGlobal->GetNumberRows(); row++ )
+    {
+        for ( int grid = 0; grid < parent->numPages; grid++ )
         {
-            for(int grid = 0; grid < parent->numPages; grid++)
-			{
-                for(int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++)
+            for ( int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++ )
+            {
+                temp = parent->logGrids[grid]->GetCellValue( row,col );
+                if ( col == LogbookHTML::POSITION && grid == 0 )
                 {
-                    temp = parent->logGrids[grid]->GetCellValue(row,col);
-                    if(col == LogbookHTML::POSITION && grid == 0)
-                    {
-                        wxStringTokenizer p(temp,_T("\n"));
-                        wxString lat = p.GetNextToken();
-                        wxString lon = p.GetNextToken();
-                        temp =  lat+_T("\",\"")+lon;
-                    }
-                    s +=  _T("\"")+temp+_T("\",");
+                    wxStringTokenizer p( temp,_T( "\n" ) );
+                    wxString lat = p.GetNextToken();
+                    wxString lon = p.GetNextToken();
+                    temp =  lat+_T( "\",\"" )+lon;
                 }
-			}
-            s.RemoveLast();
-            csvFile << s + _T("\n");
-            s = wxEmptyString;
-		}
-	output.Close();
-}
-
-void LogbookHTML::toXML(wxString path)
-{
-	wxString s = _T("");
-	wxString temp;
-
-    if(::wxFileExists(path))
-        ::wxRemoveFile(path);
-
-	wxFileOutputStream output( path );
-	wxTextOutputStream xmlFile(output);
-
-	xmlFile << parent->xmlHead;
-
-	s = wxString::Format(_T("<Row>"));
-	for(int n = 0; n < parent->numPages; n++)
-	{
-		for(int i = 0; i < parent->logGrids[n]->GetNumberCols(); i++)
-		{
-			s += _T("<Cell>\n");
-			s += _T("<Data ss:Type=\"String\">#DATA#</Data>\n");
-			s.Replace(_T("#DATA#"),parent->logGrids[n]->GetColLabelValue(i));
-			s += _T("</Cell>");
-		}
-	}
-	s += _T("</Row>>");
-	xmlFile << s;
-    for(int row = 0; row < parent->m_gridGlobal->GetNumberRows(); row++)
-	{
-        xmlFile << wxString::Format(_T("<Row ss:Height=\"%u\">"),parent->m_gridGlobal->GetRowHeight(row));
-        for(int grid = 0; grid < parent->numPages; grid++)
+                s +=  _T( "\"" )+temp+_T( "\"," );
+            }
+        }
+        s.RemoveLast();
+        csvFile << s + _T( "\n" );
+        s = wxEmptyString;
+    }
+    output.Close();
+}
+
+void LogbookHTML::toXML( wxString path )
+{
+    wxString s = _T( "" );
+    wxString temp;
+
+    if ( ::wxFileExists( path ) )
+        ::wxRemoveFile( path );
+
+    wxFileOutputStream output( path );
+    wxTextOutputStream xmlFile( output );
+
+    xmlFile << parent->xmlHead;
+
+    s = wxString::Format( _T( "<Row>" ) );
+    for ( int n = 0; n < parent->numPages; n++ )
+    {
+        for ( int i = 0; i < parent->logGrids[n]->GetNumberCols(); i++ )
+        {
+            s += _T( "<Cell>\n" );
+            s += _T( "<Data ss:Type=\"String\">#DATA#</Data>\n" );
+            s.Replace( _T( "#DATA#" ),parent->logGrids[n]->GetColLabelValue( i ) );
+            s += _T( "</Cell>" );
+        }
+    }
+    s += _T( "</Row>>" );
+    xmlFile << s;
+    for ( int row = 0; row < parent->m_gridGlobal->GetNumberRows(); row++ )
+    {
+        xmlFile << wxString::Format( _T( "<Row ss:Height=\"%u\">" ),parent->m_gridGlobal->GetRowHeight( row ) );
+        for ( int grid = 0; grid < parent->numPages; grid++ )
         {
-            for(int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++)
-			{
-                s = _T("<Cell>\n");
-                s += _T("<Data ss:Type=\"String\">#DATA#</Data>\n");
-                temp = parent->logGrids[grid]->GetCellValue(row,col);
-                temp.Replace(_T("&"),_T("&amp;"));
-                temp.Replace(_T("\\n"),_T("&#xA;"));
-                temp.Replace(_T("\""),_T("&quot;"));
-                temp.Replace(_T("<"),_T("&lt;"));
-                temp.Replace(_T(">"),_T("&gt;"));
-                temp.Replace(_T("'"),_T("&apos;"));
-                s.Replace(_T("#DATA#"),temp);
-                s += _T("</Cell>");
+            for ( int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++ )
+            {
+                s = _T( "<Cell>\n" );
+                s += _T( "<Data ss:Type=\"String\">#DATA#</Data>\n" );
+                temp = parent->logGrids[grid]->GetCellValue( row,col );
+                temp.Replace( _T( "&" ),_T( "&amp;" ) );
+                temp.Replace( _T( "\\n" ),_T( "&#xA;" ) );
+                temp.Replace( _T( "\"" ),_T( "&quot;" ) );
+                temp.Replace( _T( "<" ),_T( "&lt;" ) );
+                temp.Replace( _T( ">" ),_T( "&gt;" ) );
+                temp.Replace( _T( "'" ),_T( "&apos;" ) );
+                s.Replace( _T( "#DATA#" ),temp );
+                s += _T( "</Cell>" );
                 xmlFile << s;
-			}
-		}
-		xmlFile << _T("</Row>>");;
-	}
-	xmlFile << parent->xmlEnd;
-	output.Close();
+            }
+        }
+        xmlFile << _T( "</Row>>" );;
+    }
+    xmlFile << parent->xmlEnd;
+    output.Close();
 }
 
 
-void LogbookHTML::toODS(wxString path)
-{
-	wxString s = _T("");
-	wxString line;
-	wxString temp;
-
-	wxFFileOutputStream out(path);
-	wxZipOutputStream zip(out);
-	wxTextOutputStream txt(zip);
-	wxString sep(wxFileName::GetPathSeparator());
-
-	zip.PutNextEntry(wxT("content.xml"));
-	txt << parent->content;
-
-	txt << _T("<table:table-row table:style-name=\"ro2\">");
-
-	for(int n = 0; n < parent->numPages; n++)
-	{
-		for(int i = 0; i < parent->logGrids[n]->GetNumberCols(); i++)
-		{
-			txt << _T("<table:table-cell office:value-type=\"string\">");
-			txt << _T("<text:p>");
-			txt << parent->logGrids[n]->GetColLabelValue(i);
-			txt << _T("</text:p>");
-			txt << _T("</table:table-cell>");
-		}
-	}
-	txt << _T("</table:table-row>");
-    for(int row = 0; row < parent->m_gridGlobal->GetNumberRows(); row++)
-	{
-		txt << _T("<table:table-row table:style-name=\"ro2\">");
-        for(int grid = 0; grid < parent->numPages; grid++)
+void LogbookHTML::toODS( wxString path )
+{
+    wxString s = _T( "" );
+    wxString line;
+    wxString temp;
+
+    wxFFileOutputStream out( path );
+    wxZipOutputStream zip( out );
+    wxTextOutputStream txt( zip );
+    wxString sep( wxFileName::GetPathSeparator() );
+
+    zip.PutNextEntry( wxT( "content.xml" ) );
+    txt << parent->content;
+
+    txt << _T( "<table:table-row table:style-name=\"ro2\">" );
+
+    for ( int n = 0; n < parent->numPages; n++ )
+    {
+        for ( int i = 0; i < parent->logGrids[n]->GetNumberCols(); i++ )
         {
-            for(int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++)
-			{
-				wxString s = parent->logGrids[grid]->GetCellValue(row,col);
-                s.Replace(_T("&"),_T("&amp;"));
-                s.Replace(_T("\""),_T("&quot;"));
-                s.Replace(_T("<"),_T("&lt;"));
-                s.Replace(_T(">"),_T("&gt;"));
-                s.Replace(_T("'"),_T("&apos;"));
-
-                txt << _T("<table:table-cell office:value-type=\"string\">");
-				txt << _T("<text:p>");
-				txt << s;
-				txt << _T("</text:p>");
-                txt << _T("</table:table-cell>");
-			}
-		}
-		txt << _T("</table:table-row>");
-	}
-        txt << parent->contentEnd;
-
-	zip.PutNextEntry(wxT("mimetype"));
-	txt << wxT("application/vnd.oasis.opendocument.spreadsheet");
-
-	zip.PutNextEntry(wxT("styles.xml"));
-	txt << parent->styles;
-
-	zip.PutNextEntry(wxT("meta.xml"));
-	txt << parent->meta;
-
-	zip.PutNextEntry(wxT("META-INF") + sep + wxT("manifest.xml"));
-	txt << parent->manifest;
-
-	zip.PutNextEntry(wxT("Thumbnails") + sep);
-
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("floater"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("menubar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("popupmenu"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("progressbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("statusbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("toolbar"));
-	zip.PutNextEntry(wxT("Configurations2") + sep + wxT("images") + sep + wxT("Bitmaps"));
+            txt << _T( "<table:table-cell office:value-type=\"string\">" );
+            txt << _T( "<text:p>" );
+            txt << parent->logGrids[n]->GetColLabelValue( i );
+            txt << _T( "</text:p>" );
+            txt << _T( "</table:table-cell>" );
+        }
+    }
+    txt << _T( "</table:table-row>" );
+    for ( int row = 0; row < parent->m_gridGlobal->GetNumberRows(); row++ )
+    {
+        txt << _T( "<table:table-row table:style-name=\"ro2\">" );
+        for ( int grid = 0; grid < parent->numPages; grid++ )
+        {
+            for ( int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++ )
+            {
+                wxString s = parent->logGrids[grid]->GetCellValue( row,col );
+                s.Replace( _T( "&" ),_T( "&amp;" ) );
+                s.Replace( _T( "\"" ),_T( "&quot;" ) );
+                s.Replace( _T( "<" ),_T( "&lt;" ) );
+                s.Replace( _T( ">" ),_T( "&gt;" ) );
+                s.Replace( _T( "'" ),_T( "&apos;" ) );
+
+                txt << _T( "<table:table-cell office:value-type=\"string\">" );
+                txt << _T( "<text:p>" );
+                txt << s;
+                txt << _T( "</text:p>" );
+                txt << _T( "</table:table-cell>" );
+            }
+        }
+        txt << _T( "</table:table-row>" );
+    }
+    txt << parent->contentEnd;
+
+    zip.PutNextEntry( wxT( "mimetype" ) );
+    txt << wxT( "application/vnd.oasis.opendocument.spreadsheet" );
+
+    zip.PutNextEntry( wxT( "styles.xml" ) );
+    txt << parent->styles;
+
+    zip.PutNextEntry( wxT( "meta.xml" ) );
+    txt << parent->meta;
+
+    zip.PutNextEntry( wxT( "META-INF" ) + sep + wxT( "manifest.xml" ) );
+    txt << parent->manifest;
 
+    zip.PutNextEntry( wxT( "Thumbnails" ) + sep );
 
-	zip.Close();
-	out.Close();
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "floater" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "menubar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "popupmenu" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "progressbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "statusbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "toolbar" ) );
+    zip.PutNextEntry( wxT( "Configurations2" ) + sep + wxT( "images" ) + sep + wxT( "Bitmaps" ) );
+
+
+    zip.Close();
+    out.Close();
 }
 
-void LogbookHTML::backup(wxString path)
+void LogbookHTML::backup( wxString path )
 {
     logbook->update();
-	wxCopyFile(data_locn+parent->backupFile+_T(".txt"),path);
+    wxCopyFile( data_locn+parent->backupFile+_T( ".txt" ),path );
 }
 
-void LogbookHTML::toKML(wxString path)
+void LogbookHTML::toKML( wxString path )
 {
     wxString datetime, position, description, temp, folder, t, header, logpointName,
-    route = _T("nil") , oldroute, remarks, fRemarks, label, pathXML;
-    wxString snil = _T("---");
+             route = _T( "nil" ) , oldroute, remarks, fRemarks, label, pathXML;
+    wxString snil = _T( "---" );
     wxString trackID = wxEmptyString, trackOldID = wxEmptyString;
     wxString routeID = wxEmptyString, routeOldID = wxEmptyString;
 
@@ -1072,254 +1101,256 @@
     wxDateTime dt;
     int maxRow = parent->m_gridGlobal->GetNumberRows(), row = 0;
 
-    if(::wxFileExists(path))
-        ::wxRemoveFile(path);
+    if ( ::wxFileExists( path ) )
+        ::wxRemoveFile( path );
 
-        wxFileOutputStream output( path );
-        wxTextOutputStream kmlFile1(output);
+    wxFileOutputStream output( path );
+    wxTextOutputStream kmlFile1( output );
 
-        kmlFile = &kmlFile1 ;
+    kmlFile = &kmlFile1 ;
 
-        wxString h = parent->kmlHead;
-        h.Replace(_T("#TITLE#"),logbook->title);
-        *kmlFile << h;
-        h = parent->kmlLine;
-    	h.Replace(_T("#LWIDTH#"),logbook->opt->kmlLineWidth);
-    	h.Replace(_T("#LTRANS#"),logbook->opt->kmlTrans.Item(logbook->opt->kmlLineTransparancy));
-    	h.Replace(_T("#LCOLORR#"),logbook->opt->kmlColor.Item(logbook->opt->kmlRouteColor));
-    	h.Replace(_T("#LCOLORT#"),logbook->opt->kmlColor.Item(logbook->opt->kmlTrackColor));
-    	*kmlFile << h;
+    wxString h = parent->kmlHead;
+    h.Replace( _T( "#TITLE#" ),logbook->title );
+    *kmlFile << h;
+    h = parent->kmlLine;
+    h.Replace( _T( "#LWIDTH#" ),logbook->opt->kmlLineWidth );
+    h.Replace( _T( "#LTRANS#" ),logbook->opt->kmlTrans.Item( logbook->opt->kmlLineTransparancy ) );
+    h.Replace( _T( "#LCOLORR#" ),logbook->opt->kmlColor.Item( logbook->opt->kmlRouteColor ) );
+    h.Replace( _T( "#LCOLORT#" ),logbook->opt->kmlColor.Item( logbook->opt->kmlTrackColor ) );
+    *kmlFile << h;
 
 
-        for(; row < parent->m_gridGlobal->GetNumberRows(); row++)
+    for ( ; row < parent->m_gridGlobal->GetNumberRows(); row++ )
+    {
+        temp = parent->kmlBody;
+        folder = parent->kmlFolder;
+        error = false;
+        remarks = wxEmptyString;
+        for ( int grid = 0; grid < parent->numPages; grid++ )
         {
-            temp = parent->kmlBody;
-            folder = parent->kmlFolder;
-            error = false;
-            remarks = wxEmptyString;
-            for(int grid = 0; grid < parent->numPages; grid++)
+            for ( int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++ )
             {
-                for(int col = 0; col < parent->logGrids[grid]->GetNumberCols(); col++)
+                wxString e = parent->logGrids[grid]->GetCellValue( row,col );
+                if ( grid == 0 )
+                {
+                    switch ( col )
+                    {
+                    case LogbookHTML::ROUTE:
+                        //temp.Replace(_T("#ROW#"),wxString::Format(_("Row: %i"),row));
+                        if ( e != route )
+                        {
+                            if ( !first )
+                                ( *kmlFile ) << parent->kmlEndFolder;
+                            first = false;
+
+                            e = replaceKMLCharacters( e );
+                            folder.Replace( _T( "#NAME#" ),e );
+                            ( *kmlFile ) << folder;
+
+                            route = e;
+                            rfirst = true;
+                            routeID = wxEmptyString;
+
+                        }
+                        else
+                        {
+                            first = false;
+                            rfirst = false;
+                        }
+                        break;
+                    case LogbookHTML::RDATE:
+                        logpointName = e +_T( " " );
+                        break;
+                    case LogbookHTML::RTIME:
+                        logpointName += e;
+                        break;
+                    case LogbookHTML::POSITION:
+                        if ( e.IsEmpty() )
+                        {
+                            error = true;
+                            break;
+                        }
+                        position = e;
+                        e = replaceKMLCharacters( e );
+                        description += position+_T( "\n" ) ;
+                        position = convertPositionToDecimalDegrees( position );
+                        temp.Replace( _T( "#POSITION#" ),position,false );
+                        break;
+                    case LogbookHTML::COG:
+                        label = parent->m_gridGlobal->GetColLabelValue( LogbookHTML::COG );
+                        label.Replace( _T( "\n" ),_T( " " ) );
+                        if ( e.IsEmpty() ) e = snil;
+                        e = replaceKMLCharacters( e );
+                        description += label + _T( " " ) + e +_T( "  " ) ;
+                        break;
+                    case LogbookHTML::SOG:
+                        label = parent->m_gridGlobal->GetColLabelValue( LogbookHTML::SOG );
+                        label.Replace( _T( "\n" ),_T( " " ) );
+                        if ( e.IsEmpty() ) e = snil;
+                        e = replaceKMLCharacters( e );
+                        description += label + _T( " " ) + e +_T( "\n" ) ;
+                        break;
+                    case LogbookHTML::DEPTH:
+                        label = parent->m_gridGlobal->GetColLabelValue( LogbookHTML::DEPTH );
+                        label.Replace( _T( "\n" ),_T( " " ) );
+                        if ( e.IsEmpty() ) e = snil;
+                        e = replaceKMLCharacters( e );
+                        description += label + _T( " " ) + e +_T( "\n" ) ;
+                        break;
+                    case LogbookHTML::REMARKS:
+                        e = replaceKMLCharacters( e );
+                        fRemarks = e;
+                        if ( rfirst )
+                        {
+                            remarks = wxEmptyString; //e.SubString(0,50)+_T("...");
+                            folder.Replace( _T( "#CREATED#" ),remarks,false );
+                            rfirst = false;
+                        }
+                        break;
+                    }
+                }
+                else if ( grid == 1 )
                 {
-                    wxString e = parent->logGrids[grid]->GetCellValue(row,col);
-                    if(grid == 0)
+                    switch ( col )
                     {
-                        switch(col)
+                    case WIND:
+                        label = parent->m_gridWeather->GetColLabelValue( WIND );
+                        label.Replace( _T( "\n" ),_T( " " ) );
+                        if ( e.IsEmpty() ) e = snil;
+                        e = replaceKMLCharacters( e );
+                        description += label + _T( " " ) + e +_T( "  " ) ;
+                        break;
+                    case WSPD:
+                        label = parent->m_gridWeather->GetColLabelValue( WSPD );
+                        label.Replace( _T( "\n" ),_T( " " ) );
+                        if ( e.IsEmpty() ) e = snil;
+                        e = replaceKMLCharacters( e );
+                        description += label + _T( " " ) + e +_T( "\n" ) ;
+                        break;
+                    }
+                }
+                else if ( grid == 2 )
+                {
+                    switch ( col )
+                    {
+                    case MREMARKS:
+                        e = replaceKMLCharacters( e );
+                        temp.Replace( _T( "#NAME#" ),logpointName );
+                        temp.Replace( _T( "#DESCRIPTION#" ),description+( ( fRemarks.IsEmpty() )?_T( "" ):_T( "\n" )+fRemarks )+_T( "\n" )+e,false );
+                        break;
+                    case ROUTEID:
+                        routeOldID = routeID;
+                        routeID = e;
+                        if ( ( logbook->opt->kmlRoute && !routeID.IsEmpty() ) && ( routeID != routeOldID ) )
+                        {
+                            wxJSONWriter w;
+                            wxString out;
+                            wxJSONValue v;
+                            v[_T( "Route_ID" )] =   parent->logGrids[2]->GetCellValue( row,ROUTEID );
+                            w.Write( v, out );
+                            SendPluginMessage( wxString( _T( "OCPN_ROUTE_REQUEST" ) ),out );
+
+                            ::wxSafeYield();
+                        }
+                        break;
+                    case TRACKID:
+                        trackOldID = trackID;
+                        trackID = e;
+                        if ( ( logbook->opt->kmlTrack && !trackID.IsEmpty() ) && ( trackID != trackOldID ) )
                         {
-                            case LogbookHTML::ROUTE:
-                                //temp.Replace(_T("#ROW#"),wxString::Format(_("Row: %i"),row));
-                                if(e != route )
-                                {
-                                    if(!first)
-                                        (*kmlFile) << parent->kmlEndFolder;
-                                        first = false;
-
-                                        e = replaceKMLCharacters(e);
-                                        folder.Replace(_T("#NAME#"),e);
-                                        (*kmlFile) << folder;
-
-                                        route = e;
-                                        rfirst = true;
-                                        routeID = wxEmptyString;
-
-                                    }
-                                    else
-                                    {
-                                        first = false;
-                                        rfirst = false;
-                                    }
-                                    break;
-                                case LogbookHTML::RDATE:
-                                    logpointName = e +_T(" ");
-                                    break;
-                                case LogbookHTML::RTIME:
-                                    logpointName += e;
-                                    break;
-                                case LogbookHTML::POSITION:
-                                    if(e.IsEmpty())
-                                    {
-                                        error = true;
-                                        break;
-                                    }
-                                    position = e;
-                                    e = replaceKMLCharacters(e);
-                                    description += position+_T("\n") ;
-                                    position = convertPositionToDecimalDegrees(position);
-                                    temp.Replace(_T("#POSITION#"),position,false);
-                                    break;
-                                case LogbookHTML::COG:
-                                    label = parent->m_gridGlobal->GetColLabelValue(LogbookHTML::COG);
-                                    label.Replace(_T("\n"),_T(" "));
-                                    if(e.IsEmpty()) e = snil;
-                                    e = replaceKMLCharacters(e);
-                                    description += label + _T(" ") + e +_T("  ") ;
-                                    break;
-                                case LogbookHTML::SOG:
-                                    label = parent->m_gridGlobal->GetColLabelValue(LogbookHTML::SOG);
-                                    label.Replace(_T("\n"),_T(" "));
-                                    if(e.IsEmpty()) e = snil;
-                                    e = replaceKMLCharacters(e);
-                                    description += label + _T(" ") + e +_T("\n") ;
-                                    break;
-                                case LogbookHTML::DEPTH:
-                                    label = parent->m_gridGlobal->GetColLabelValue(LogbookHTML::DEPTH);
-                                    label.Replace(_T("\n"),_T(" "));
-                                    if(e.IsEmpty()) e = snil;
-                                    e = replaceKMLCharacters(e);
-                                    description += label + _T(" ") + e +_T("\n") ;
-                                    break;
-                                case LogbookHTML::REMARKS:
-                                    e = replaceKMLCharacters(e);
-                                    fRemarks = e;
-                                    if(rfirst)
-                                    {
-                                        remarks = wxEmptyString; //e.SubString(0,50)+_T("...");
-                                        folder.Replace(_T("#CREATED#"),remarks,false);
-                                        rfirst = false;
-                                    }
-                                    break;
-                                }
-                            }
-                            else if(grid == 1)
-                            {
-                                switch(col)
-                                {
-                                case WIND:
-                                    label = parent->m_gridWeather->GetColLabelValue(WIND);
-                                    label.Replace(_T("\n"),_T(" "));
-                                    if(e.IsEmpty()) e = snil;
-                                    e = replaceKMLCharacters(e);
-                                    description += label + _T(" ") + e +_T("  ") ;
-                                    break;
-                                case WSPD:
-                                    label = parent->m_gridWeather->GetColLabelValue(WSPD);
-                                    label.Replace(_T("\n"),_T(" "));
-                                    if(e.IsEmpty()) e = snil;
-                                    e = replaceKMLCharacters(e);
-                                    description += label + _T(" ") + e +_T("\n") ;
-                                    break;
-                                }
-                            }
-                            else if(grid == 2)
-                            {
-                                switch(col)
-                                {
-                                case MREMARKS:
-                                    e = replaceKMLCharacters(e);
-                                    temp.Replace(_T("#NAME#"),logpointName);
-                                    temp.Replace(_T("#DESCRIPTION#"),description+((fRemarks.IsEmpty())?_T(""):_T("\n")+fRemarks)+_T("\n")+e,false);
-                                    break;
-                                case ROUTEID:
-                                    routeOldID = routeID;
-                                    routeID = e;
-                                    if((logbook->opt->kmlRoute && !routeID.IsEmpty()) && (routeID != routeOldID))
-                                    {
-                                        wxJSONWriter w;
-                                        wxString out;
-                                        wxJSONValue v;
-                                        v[_T("Route_ID")] =   parent->logGrids[2]->GetCellValue(row,ROUTEID);
-                                        w.Write(v, out);
-                                        SendPluginMessage(wxString(_T("OCPN_ROUTE_REQUEST")),out);
-
-                                        ::wxSafeYield();
-                                    }
-                                    break;
-                                case TRACKID:
-                                    trackOldID = trackID;
-                                    trackID = e;
-                                    if((logbook->opt->kmlTrack && !trackID.IsEmpty()) && (trackID != trackOldID))
-                                    {
-                                        wxJSONWriter w;
-                                        wxString out;
-                                        wxJSONValue v;
-                                        v[_T("Track_ID")] =   parent->logGrids[2]->GetCellValue(row,TRACKID);
-                                        w.Write(v, out);
-                                        SendPluginMessage(wxString(_T("OCPN_TRACK_REQUEST")),out);
-
-                                        ::wxSafeYield();
-                                    }
-                                    break;
-                                }
-                            }
+                            wxJSONWriter w;
+                            wxString out;
+                            wxJSONValue v;
+                            v[_T( "Track_ID" )] =   parent->logGrids[2]->GetCellValue( row,TRACKID );
+                            w.Write( v, out );
+                            SendPluginMessage( wxString( _T( "OCPN_TRACK_REQUEST" ) ),out );
+
+                            ::wxSafeYield();
                         }
+                        break;
                     }
-            if(!error)
-            {
-                temp.Replace(_T("#icon#"),_T("http://maps.google.com/mapfiles/kml/shapes/placemark_circle.png"));
-                (*kmlFile) << temp;
+                }
             }
-            description = wxEmptyString;
         }
-        if(row == maxRow-1) *kmlFile << parent->kmlEndFolder;
-        (*kmlFile) << parent->kmlEnd;
-        output.Close();
+        if ( !error )
+        {
+            temp.Replace( _T( "#icon#" ),_T( "http://maps.google.com/mapfiles/kml/shapes/placemark_circle.png" ) );
+            ( *kmlFile ) << temp;
+        }
+        description = wxEmptyString;
+    }
+    if ( row == maxRow-1 ) *kmlFile << parent->kmlEndFolder;
+    ( *kmlFile ) << parent->kmlEnd;
+    output.Close();
 
-        wxFileType *filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("kml"));
-        wxString cmd = filetype->GetOpenCommand(path);
-		if(!cmd.IsEmpty())
-			wxExecute(cmd);
+    wxFileType *filetype = wxTheMimeTypesManager->GetFileTypeFromExtension( _T( "kml" ) );
+    wxString cmd = filetype->GetOpenCommand( path );
+    if ( !cmd.IsEmpty() )
+        wxExecute( cmd );
 }
 
-void LogbookHTML::writeTrackToKML(wxJSONValue data)
+void LogbookHTML::writeTrackToKML( wxJSONValue data )
 {
     wxString trkLine = parent->kmlPathHeader;
-    trkLine.Replace(_T("#NAME#"),_T("Trackline"));
+    trkLine.Replace( _T( "#NAME#" ),_T( "Trackline" ) );
 
     *kmlFile << trkLine;
-    for(int i = 0; i < data.Size(); i++)
-        (*kmlFile) << wxString::Format(_T("%.13f,%.13f\n"),data[i][1].AsDouble(),data[i][0].AsDouble());
+    for ( int i = 0; i < data.Size(); i++ )
+        ( *kmlFile ) << wxString::Format( _T( "%.13f,%.13f\n" ),data[i][1].AsDouble(),data[i][0].AsDouble() );
 
-    (*kmlFile) << parent->kmlPathFooter;
+    ( *kmlFile ) << parent->kmlPathFooter;
 }
 
-void LogbookHTML::writeRouteToKML(wxJSONValue data)
+void LogbookHTML::writeRouteToKML( wxJSONValue data )
 {
     wxString routeLine = parent->kmlPathHeader;
-    routeLine.Replace(_T("#NAME#"),_T("Routeline"));
-    routeLine.Replace(_T("#LINE#"),_T("#LineRoute"));
+    routeLine.Replace( _T( "#NAME#" ),_T( "Routeline" ) );
+    routeLine.Replace( _T( "#LINE#" ),_T( "#LineRoute" ) );
     *kmlFile << routeLine;
 
-    for(int i = 0; i < data.Size(); i++)
-        (*kmlFile) << wxString::Format(_T("%f,%f\n"),data[i][_T("lon")].AsDouble(),data[i][_T("lat")].AsDouble());
+    for ( int i = 0; i < data.Size(); i++ )
+        ( *kmlFile ) << wxString::Format( _T( "%f,%f\n" ),data[i][_T( "lon" )].AsDouble(),data[i][_T( "lat" )].AsDouble() );
 
-    (*kmlFile) << parent->kmlPathFooter;
+    ( *kmlFile ) << parent->kmlPathFooter;
 
     wxString n = parent->kmlFolder;
-    n.Replace(_T("#NAME#"),_("Routepoints"));
+    n.Replace( _T( "#NAME#" ),_( "Routepoints" ) );
     *kmlFile << n;
 
-    for(int i = 0; i < data.Size(); i++)
+    for ( int i = 0; i < data.Size(); i++ )
     {
         wxString routeWP = parent->kmlBody;
-        routeWP.Replace(_T("#icon#"),_T("http://maps.google.com/mapfiles/kml/pal4/icon48.png"));
+        routeWP.Replace( _T( "#icon#" ),_T( "http://maps.google.com/mapfiles/kml/pal4/icon48.png" ) );
 
-        routeWP.Replace(_T("#NAME#"),data[i][_T("WPName")].AsString());
-        wxString description = data[i][_T("WPDescription")].AsString()+_T("<br>");
+        routeWP.Replace( _T( "#NAME#" ),data[i][_T( "WPName" )].AsString() );
+        wxString description = data[i][_T( "WPDescription" )].AsString()+_T( "<br>" );
 
-        int li = 1; wxString links = wxEmptyString; wxString desc = wxEmptyString;
+        int li = 1;
+        wxString links = wxEmptyString;
+        wxString desc = wxEmptyString;
 
-        while(true)
+        while ( true )
         {
-            wxString count = wxString::Format(_T("%d"),li);
+            wxString count = wxString::Format( _T( "%d" ),li );
 
-            if(data[i].HasMember(_T("WPLink")+count))
-                links = data[i][_T("WPLink")+count].AsString();
+            if ( data[i].HasMember( _T( "WPLink" )+count ) )
+                links = data[i][_T( "WPLink" )+count].AsString();
             else
                 break;
 
-            if(data[i].HasMember(_T("WPLinkDesciption")+count))
+            if ( data[i].HasMember( _T( "WPLinkDesciption" )+count ) )
             {
-                desc = data[i][_T("WPLinkDesciption")+count].AsString();
-                description += _T("<a href=\"")+links+_T("\">")+desc+_T("</a><br>");
+                desc = data[i][_T( "WPLinkDesciption" )+count].AsString();
+                description += _T( "<a href=\"" )+links+_T( "\">" )+desc+_T( "</a><br>" );
             }
             else
 
                 break;
             li++;
         }
-        routeWP.Replace(_T("#DESCRIPTION#"),_T(" <![CDATA[\n")+description+_T("\n]]>"));
-        routeWP.Replace(_T("#POSITION#"),wxString::Format(_T("%f,%f\n"),data[i][_T("lon")].AsDouble(),data[i][_T("lat")].AsDouble()));
-        (*kmlFile) << routeWP;
+        routeWP.Replace( _T( "#DESCRIPTION#" ),_T( " <![CDATA[\n" )+description+_T( "\n]]>" ) );
+        routeWP.Replace( _T( "#POSITION#" ),wxString::Format( _T( "%f,%f\n" ),data[i][_T( "lon" )].AsDouble(),data[i][_T( "lat" )].AsDouble() ) );
+        ( *kmlFile ) << routeWP;
 
     }
     *kmlFile << parent->kmlEndFolder;
@@ -1334,10 +1365,10 @@
           +	offsetNavobj.clear();
           +
           +	if(wxFile::Exists(patho))
-          +		insertTracks(patho,&offsetChanges,&offsetChangesGuid);		
+          +		insertTracks(patho,&offsetChanges,&offsetChangesGuid);
           +	else
           +		insertTracks(path,&offsetNavobj,&offsetNavobjGuid);
-          +	
+          +
           +}
           +
           +void LogbookHTML::insertTracks(wxString file, std::map<wxString,long> *navobj, std::map<wxString,long> *navobjgui )
@@ -1362,7 +1393,7 @@
           +				temp.Trim(false);
           +				temp.Replace(_T("<name>"),_T(""));
           +				temp.Replace(_T("</name>"),_T(""));
-          +				navobj->insert(pair(temp,n));			
+          +				navobj->insert(pair(temp,n));
           +			}
           +
           +			do{
@@ -1371,20 +1402,20 @@
           +			}while(!temp.Contains(_T("<opencpn:guid>")));
           +
           +			temp.Trim(false);
-          +			temp = temp.AfterFirst('>'); 
+          +			temp = temp.AfterFirst('>');
           +			temp = temp.BeforeFirst('<');
           +			navobjgui->insert(pair(temp,n));
           +		}
           +	}
           +}
           +*/
-wxString LogbookHTML::replaceKMLCharacters(wxString e)
+wxString LogbookHTML::replaceKMLCharacters( wxString e )
 {
-    e.Replace(_T("\""),_T("&quot;"));
-    e.Replace(_T("<"),_T("&lt;"));
-    e.Replace(_T(">"),_T("&gt;"));
-    e.Replace(_T("'"),_T("&apos;"));
-    e.Replace(_T("&"),_T("&amp;"));
+    e.Replace( _T( "\"" ),_T( "&quot;" ) );
+    e.Replace( _T( "<" ),_T( "&lt;" ) );
+    e.Replace( _T( ">" ),_T( "&gt;" ) );
+    e.Replace( _T( "'" ),_T( "&apos;" ) );
+    e.Replace( _T( "&" ),_T( "&amp;" ) );
 
     return e;
 }
@@ -1412,8 +1443,8 @@
           +					if(temp.Contains(_T("<name>")))
           +						{
           +							temp.Trim(false);
-          +							temp = temp.AfterFirst('>'); 
-          +							temp = temp.BeforeFirst('<');	
+          +							temp = temp.AfterFirst('>');
+          +							temp = temp.BeforeFirst('<');
           +							*name = temp;
           +						}
           +					}
@@ -1423,8 +1454,8 @@
           +							temp = in.GetNextLine();
           +						}while(!temp.Contains(_T("<opencpn:guid>")));
           +						temp.Trim(false);
-          +						temp = temp.AfterFirst('>'); 
-          +						trkguid = temp.BeforeFirst('<');	
+          +						temp = temp.AfterFirst('>');
+          +						trkguid = temp.BeforeFirst('<');
           +					}
           +
           +					do
@@ -1446,7 +1477,7 @@
           +						if(temp.Contains(_T("<time>")))
           +						{
           +							temp.Trim(false);
-          +							temp = temp.AfterFirst('>'); 
+          +							temp = temp.AfterFirst('>');
           +							temp = temp.BeforeFirst('<');
           +							temp.Replace(_T("T"),_T(" "));
           +
@@ -1485,47 +1516,47 @@
           +		return wxEmptyString;
           +}
           +*/
-wxString LogbookHTML::convertPositionToDecimalDegrees(wxString str)
+wxString LogbookHTML::convertPositionToDecimalDegrees( wxString str )
 {
     wxString pos;
 
-    wxStringTokenizer tkz(str,_T("\n"));
-    pos = positionToDecimalDegrees(tkz.GetNextToken());
-    pos.Prepend(positionToDecimalDegrees(tkz.GetNextToken())+_T(","));
+    wxStringTokenizer tkz( str,_T( "\n" ) );
+    pos = positionToDecimalDegrees( tkz.GetNextToken() );
+    pos.Prepend( positionToDecimalDegrees( tkz.GetNextToken() )+_T( "," ) );
 
     return pos;
 }
-wxString LogbookHTML::positionToDecimalDegrees(wxString str)
+wxString LogbookHTML::positionToDecimalDegrees( wxString str )
 {
     double deg, min, sec = 0;
     wxString ind;
 
-    wxStringTokenizer tkz(str,_T(" "));
+    wxStringTokenizer tkz( str,_T( " " ) );
 
-    if(tkz.CountTokens() == 4)
+    if ( tkz.CountTokens() == 4 )
     {
-        deg = wxAtof(tkz.GetNextToken());
-        min = wxAtof(tkz.GetNextToken());
+        deg = wxAtof( tkz.GetNextToken() );
+        min = wxAtof( tkz.GetNextToken() );
         wxString t = tkz.GetNextToken();
-        t.Replace(_T(","),_T("."));
-        sec = wxAtof(t);
+        t.Replace( _T( "," ),_T( "." ) );
+        sec = wxAtof( t );
 
         sec = min*60+sec;
-        deg = deg+(sec/3600);
+        deg = deg+( sec/3600 );
     }
     else
     {
-        deg = wxAtof(tkz.GetNextToken());
+        deg = wxAtof( tkz.GetNextToken() );
         wxString t = tkz.GetNextToken();
-        t.Replace(_T(","),_T("."));
-        min = wxAtof(t);
+        t.Replace( _T( "," ),_T( "." ) );
+        min = wxAtof( t );
         min = min / 60;
         deg += min;
     }
 
     ind = tkz.GetNextToken();
-    if(ind == 'W' || ind == 'S')
+    if ( ind == 'W' || ind == 'S' )
         deg = -deg;
 
-    return wxString::Format(_T("%f"),deg);
+    return wxString::Format( _T( "%f" ),deg );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/LogbookHTML.h opencpn-plugin-logbookkonni-1.2024/src/LogbookHTML.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/LogbookHTML.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/LogbookHTML.h	2016-02-25 13:06:29.000000000 +0000
@@ -12,38 +12,38 @@
 class LogbookHTML
 {
 public:
-	LogbookHTML(Logbook* l, LogbookDialog* d, wxString data, wxString layout);
-	~LogbookHTML(void);
+    LogbookHTML( Logbook* l, LogbookDialog* d, wxString data, wxString layout );
+    ~LogbookHTML( void );
 
-	void viewHTML(wxString path,wxString layout, bool mode);
-	void viewODT(wxString path, wxString layout, bool mode);
-	wxString toHTML(wxString path,wxString layout, bool mode);
-	wxString toODT(wxString path,wxString layout, bool mode);
-    void toKML(wxString path);
-    void writeTrackToKML(wxJSONValue data);
-    void writeRouteToKML(wxJSONValue data);
-	void toCSV(wxString path);
-	void toXML(wxString path);
-	void toODS(wxString path);
-	void backup(wxString path);
-	void setFileName(wxString s, wxString l);
-	void setPlaceholders();
+    void viewHTML( wxString path,wxString layout, bool mode );
+    void viewODT( wxString path, wxString layout, bool mode );
+    wxString toHTML( wxString path,wxString layout, bool mode );
+    wxString toODT( wxString path,wxString layout, bool mode );
+    void toKML( wxString path );
+    void writeTrackToKML( wxJSONValue data );
+    void writeRouteToKML( wxJSONValue data );
+    void toCSV( wxString path );
+    void toXML( wxString path );
+    void toODS( wxString path );
+    void backup( wxString path );
+    void setFileName( wxString s, wxString l );
+    void setPlaceholders();
 
 public:
-	enum fieldsGlobal{ ROUTE,RDATE,RTIME,STATUS,WAKE,DISTANCE,DTOTAL,POSITION,COG,COW,SOG,SOW,DEPTH,REMARKS};
-	enum fieldsWeather{ BARO,HYDRO, AIRTE,WATERTE,WIND,WSPD,WINDR,WSPDR,CURRENT,CSPD,WAVE,SWELL,WEATHER,CLOUDS,VISIBILITY};
-	enum fieldsMotor{ MOTOR,MOTORT,RPM1,MOTOR1,MOTOR1T,RPM2,FUEL,FUELT,SAILS,REEF,GENE,GENET,BANK1,BANK1T,BANK2,BANK2T,WATERM,WATERMT,WATERMO,WATER,WATERT,MREMARKS,ROUTEID,TRACKID};	
-
-	struct gridc 
-	{ 
-		int grid; 
-		int col;
-	};
-
-	map<wxString,gridc> placeholders;
-	map<wxString,wxString> placeholdersboat;
-	map<wxString,gridc>::iterator its;
-	map<wxString,wxString>::iterator it;
+    enum fieldsGlobal { ROUTE,RDATE,RTIME,STATUS,WAKE,DISTANCE,DTOTAL,POSITION,COG,COW,SOG,SOW,DEPTH,REMARKS};
+    enum fieldsWeather { BARO,HYDRO, AIRTE,WATERTE,WIND,WSPD,WINDR,WSPDR,CURRENT,CSPD,WAVE,SWELL,WEATHER,CLOUDS,VISIBILITY};
+    enum fieldsMotor { MOTOR,MOTORT,RPM1,MOTOR1,MOTOR1T,RPM2,FUEL,FUELT,SAILS,REEF,GENE,GENET,BANK1,BANK1T,BANK2,BANK2T,WATERM,WATERMT,WATERMO,WATER,WATERT,MREMARKS,ROUTEID,TRACKID};
+
+    struct gridc
+    {
+        int grid;
+        int col;
+    };
+
+    map<wxString,gridc> placeholders;
+    map<wxString,wxString> placeholdersboat;
+    map<wxString,gridc>::iterator its;
+    map<wxString,wxString>::iterator it;
 
     // KML export
     map<wxString,long> offsetChanges;
@@ -56,28 +56,28 @@
     map<wxString,long>::iterator itng;
     typedef std::pair<wxString, long> pair;
 
-    wxString	readLayoutFile(wxString layout);
-    wxString	readLayoutFileODT(wxString layout);
+    wxString	readLayoutFile( wxString layout );
+    wxString	readLayoutFileODT( wxString layout );
     void		setSelection();
-    bool		checkLayoutError(int result, wxString html, wxString layout);
-    wxString	replacePlaceholder(wxString html, wxString htmlHeader, int grid, int row, int col, bool mode,wxTextOutputStream &htmlFile);
-    wxString	replaceNewLine(wxString s, bool mode, bool label);
-    int			setTableValues(bool mode, int index, int row, wxString html, wxTextOutputStream &d);
-    wxString	convertPositionToDecimalDegrees(wxString str);
-    wxString	positionToDecimalDegrees(wxString);
-    wxString	replaceKMLCharacters(wxString);
+    bool		checkLayoutError( int result, wxString html, wxString layout );
+    wxString	replacePlaceholder( wxString html, wxString htmlHeader, int grid, int row, int col, bool mode,wxTextOutputStream &htmlFile );
+    wxString	replaceNewLine( wxString s, bool mode, bool label );
+    int			setTableValues( bool mode, int index, int row, wxString html, wxTextOutputStream &d );
+    wxString	convertPositionToDecimalDegrees( wxString str );
+    wxString	positionToDecimalDegrees( wxString );
+    wxString	replaceKMLCharacters( wxString );
     //	wxString	getPathFromTrack(wxDateTime datetime, wxString route, wxString trackguid, long offset, bool file, bool mode);
     //	wxString	findTrackInXML(wxDateTime dt, wxString file, wxString *name, wxString route, wxString track, long offset, bool ind, bool mode);
     //	void		createJumpTable();
     //	void		insertTracks(wxString file, std::map<wxString,long> *navobj, std::map<wxString,long> *navobjgui );
 
-	LogbookDialog *parent;
-	Logbook		  *logbook;
-	wxString data_locn;
-	wxString layout_locn;
-	wxString fileName;
+    LogbookDialog *parent;
+    Logbook		  *logbook;
+    wxString data_locn;
+    wxString layout_locn;
+    wxString fileName;
 
-	wxString route;
+    wxString route;
 
     wxTextOutputStream *kmlFile;
 };
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/LogbookOptions.cpp opencpn-plugin-logbookkonni-1.2024/src/LogbookOptions.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/LogbookOptions.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/LogbookOptions.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -26,971 +26,947 @@
 ///////////////////////////////////////////////////////////////////////////
 LogbookOptions::LogbookOptions( wxWindow* parent, Options* opt, logbookkonni_pi* log_pi, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->opt = opt;
-	this->log_pi = log_pi;
+    this->opt = opt;
+    this->log_pi = log_pi;
 
-	// for small screens: don't let boat dialog be larger than screen
-	int w,h;
-	wxDisplaySize( &w, &h );
-	w = wxMin(w, GetMinWidth());
-	h = wxMin(h-32, GetMinHeight());
-	SetMinSize(wxSize(w/2, h/2)); // allow to half normal dimensions
-	SetSize(wxSize(w, h));
+    // for small screens: don't let boat dialog be larger than screen
+    int w,h;
+    wxDisplaySize( &w, &h );
+    w = wxMin( w, GetMinWidth() );
+    h = wxMin( h-32, GetMinHeight() );
+    SetMinSize( wxSize( w/2, h/2 ) ); // allow to half normal dimensions
+    SetSize( wxSize( w, h ) );
 
 //	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer21;
-	bSizer21 = new wxBoxSizer( wxVERTICAL );
-	
-	m_scrolledWindow1 = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_scrolledWindow1->SetScrollRate( 5, 5 );
-	wxBoxSizer* bSizer29;
-	bSizer29 = new wxBoxSizer( wxVERTICAL );
-	
-	m_notebook4 = new wxNotebook( m_scrolledWindow1, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_notebook4->SetBackgroundColour( wxColour(255,255,255) );
-	
-	m_panel15 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer51;
-	bSizer51 = new wxBoxSizer( wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer10;
-	fgSizer10 = new wxFlexGridSizer( 12, 1, 0, 0 );
-	fgSizer10->SetFlexibleDirection( wxBOTH );
-	fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxFlexGridSizer* fgSizer51;
-	fgSizer51 = new wxFlexGridSizer( 2, 6, 0, 0 );
-	fgSizer51->SetFlexibleDirection( wxBOTH );
-	fgSizer51->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer51->Add( 10, 0, 1, wxEXPAND, 0 );
-	
-	m_staticText132 = new wxStaticText( m_panel15, wxID_ANY, _("Date-Format:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText132->Wrap( -1 );
-	fgSizer51->Add( m_staticText132, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceDateFormatChoices[] = { _("Local Format"), _("Individual") };
-	int m_choiceDateFormatNChoices = sizeof( m_choiceDateFormatChoices ) / sizeof( wxString );
-	m_choiceDateFormat = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceDateFormatNChoices, m_choiceDateFormatChoices, 0 );
-	m_choiceDateFormat->SetSelection( 0 );
-	fgSizer51->Add( m_choiceDateFormat, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 0 );
-	
-	wxFlexGridSizer* fgSizer52;
-	fgSizer52 = new wxFlexGridSizer( 1, 3, 0, 0 );
-	fgSizer52->SetFlexibleDirection( wxBOTH );
-	fgSizer52->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxString m_choiceDate1Choices[] = { _("Month"), _("Day"), _("Year") };
-	int m_choiceDate1NChoices = sizeof( m_choiceDate1Choices ) / sizeof( wxString );
-	m_choiceDate1 = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceDate1NChoices, m_choiceDate1Choices, 0 );
-	m_choiceDate1->SetSelection( 0 );
-	fgSizer52->Add( m_choiceDate1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceDate2Choices[] = { _("Month"), _("Day"), _("Year") };
-	int m_choiceDate2NChoices = sizeof( m_choiceDate2Choices ) / sizeof( wxString );
-	m_choiceDate2 = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceDate2NChoices, m_choiceDate2Choices, 0 );
-	m_choiceDate2->SetSelection( 0 );
-	fgSizer52->Add( m_choiceDate2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceDate3Choices[] = { _("Month"), _("Day"), _("Year") };
-	int m_choiceDate3NChoices = sizeof( m_choiceDate3Choices ) / sizeof( wxString );
-	m_choiceDate3 = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceDate3NChoices, m_choiceDate3Choices, 0 );
-	m_choiceDate3->SetSelection( 0 );
-	fgSizer52->Add( m_choiceDate3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	
-	fgSizer51->Add( fgSizer52, 1, wxEXPAND, 0 );
-	
-	wxFlexGridSizer* fgSizer53;
-	fgSizer53 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer53->SetFlexibleDirection( wxBOTH );
-	fgSizer53->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText128 = new wxStaticText( m_panel15, wxID_ANY, _("Separator"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText128->Wrap( -1 );
-	fgSizer53->Add( m_staticText128, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_textCtrlDateSeparator = new wxTextCtrl( m_panel15, wxID_ANY, _("."), wxDefaultPosition, wxSize( 20,-1 ), 0 );
-	m_textCtrlDateSeparator->SetMaxLength( 1 ); 
-	fgSizer53->Add( m_textCtrlDateSeparator, 0, wxALIGN_CENTER_VERTICAL, 0 );
-	
-	
-	fgSizer51->Add( fgSizer53, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextDate = new wxStaticText( m_panel15, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDate->Wrap( -1 );
-	fgSizer51->Add( m_staticTextDate, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	fgSizer51->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText133 = new wxStaticText( m_panel15, wxID_ANY, _("Time-Format:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText133->Wrap( -1 );
-	fgSizer51->Add( m_staticText133, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceTimeFormatChoices[] = { _("24 Hour Format"), _("12 Hour Format") };
-	int m_choiceTimeFormatNChoices = sizeof( m_choiceTimeFormatChoices ) / sizeof( wxString );
-	m_choiceTimeFormat = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceTimeFormatNChoices, m_choiceTimeFormatChoices, 0 );
-	m_choiceTimeFormat->SetSelection( 0 );
-	fgSizer51->Add( m_choiceTimeFormat, 0, wxLEFT, 0 );
-	
-	m_checkBoxNoSeconds = new wxCheckBox( m_panel15, wxID_ANY, _("No Seconds"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer51->Add( m_checkBoxNoSeconds, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 0 );
-	
-	
-	fgSizer51->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextTime = new wxStaticText( m_panel15, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTime->Wrap( -1 );
-	fgSizer51->Add( m_staticTextTime, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	fgSizer10->Add( fgSizer51, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
-	
-	wxFlexGridSizer* fgSizer18;
-	fgSizer18 = new wxFlexGridSizer( 1, 7, 0, 0 );
-	fgSizer18->SetFlexibleDirection( wxBOTH );
-	fgSizer18->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer18->Add( 100, 0, 1, wxEXPAND, 5 );
-	
-	m_radioBtnUTC = new wxRadioButton( m_panel15, wxID_ANY, _("UTC"), wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	fgSizer18->Add( m_radioBtnUTC, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_radioBtnLocal = new wxRadioButton( m_panel15, wxID_ANY, _("Local = UTC"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnLocal->SetValue( true ); 
-	fgSizer18->Add( m_radioBtnLocal, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceTzIndicatorChoices[] = { _T("+"), _T("-") };
-	int m_choiceTzIndicatorNChoices = sizeof( m_choiceTzIndicatorChoices ) / sizeof( wxString );
+
+    wxBoxSizer* bSizer21;
+    bSizer21 = new wxBoxSizer( wxVERTICAL );
+
+    m_scrolledWindow1 = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_scrolledWindow1->SetScrollRate( 5, 5 );
+    wxBoxSizer* bSizer29;
+    bSizer29 = new wxBoxSizer( wxVERTICAL );
+
+    m_notebook4 = new wxNotebook( m_scrolledWindow1, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_notebook4->SetBackgroundColour( wxColour( 255,255,255 ) );
+
+    m_panel15 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer51;
+    bSizer51 = new wxBoxSizer( wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer10;
+    fgSizer10 = new wxFlexGridSizer( 12, 1, 0, 0 );
+    fgSizer10->SetFlexibleDirection( wxBOTH );
+    fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxFlexGridSizer* fgSizer51;
+    fgSizer51 = new wxFlexGridSizer( 2, 6, 0, 0 );
+    fgSizer51->SetFlexibleDirection( wxBOTH );
+    fgSizer51->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer51->Add( 10, 0, 1, wxEXPAND, 0 );
+
+    m_staticText132 = new wxStaticText( m_panel15, wxID_ANY, _( "Date-Format:" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText132->Wrap( -1 );
+    fgSizer51->Add( m_staticText132, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceDateFormatChoices[] = { _( "Local Format" ), _( "Individual" ) };
+    int m_choiceDateFormatNChoices = sizeof( m_choiceDateFormatChoices ) / sizeof( wxString );
+    m_choiceDateFormat = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceDateFormatNChoices, m_choiceDateFormatChoices, 0 );
+    m_choiceDateFormat->SetSelection( 0 );
+    fgSizer51->Add( m_choiceDateFormat, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 0 );
+
+    wxFlexGridSizer* fgSizer52;
+    fgSizer52 = new wxFlexGridSizer( 1, 3, 0, 0 );
+    fgSizer52->SetFlexibleDirection( wxBOTH );
+    fgSizer52->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxString m_choiceDate1Choices[] = { _( "Month" ), _( "Day" ), _( "Year" ) };
+    int m_choiceDate1NChoices = sizeof( m_choiceDate1Choices ) / sizeof( wxString );
+    m_choiceDate1 = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceDate1NChoices, m_choiceDate1Choices, 0 );
+    m_choiceDate1->SetSelection( 0 );
+    fgSizer52->Add( m_choiceDate1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceDate2Choices[] = { _( "Month" ), _( "Day" ), _( "Year" ) };
+    int m_choiceDate2NChoices = sizeof( m_choiceDate2Choices ) / sizeof( wxString );
+    m_choiceDate2 = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceDate2NChoices, m_choiceDate2Choices, 0 );
+    m_choiceDate2->SetSelection( 0 );
+    fgSizer52->Add( m_choiceDate2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceDate3Choices[] = { _( "Month" ), _( "Day" ), _( "Year" ) };
+    int m_choiceDate3NChoices = sizeof( m_choiceDate3Choices ) / sizeof( wxString );
+    m_choiceDate3 = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceDate3NChoices, m_choiceDate3Choices, 0 );
+    m_choiceDate3->SetSelection( 0 );
+    fgSizer52->Add( m_choiceDate3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+
+    fgSizer51->Add( fgSizer52, 1, wxEXPAND, 0 );
+
+    wxFlexGridSizer* fgSizer53;
+    fgSizer53 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer53->SetFlexibleDirection( wxBOTH );
+    fgSizer53->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText128 = new wxStaticText( m_panel15, wxID_ANY, _( "Separator" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText128->Wrap( -1 );
+    fgSizer53->Add( m_staticText128, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_textCtrlDateSeparator = new wxTextCtrl( m_panel15, wxID_ANY, _( "." ), wxDefaultPosition, wxSize( 20,-1 ), 0 );
+    m_textCtrlDateSeparator->SetMaxLength( 1 );
+    fgSizer53->Add( m_textCtrlDateSeparator, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
+
+    fgSizer51->Add( fgSizer53, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextDate = new wxStaticText( m_panel15, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDate->Wrap( -1 );
+    fgSizer51->Add( m_staticTextDate, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    fgSizer51->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText133 = new wxStaticText( m_panel15, wxID_ANY, _( "Time-Format:" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText133->Wrap( -1 );
+    fgSizer51->Add( m_staticText133, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceTimeFormatChoices[] = { _( "24 Hour Format" ), _( "12 Hour Format" ) };
+    int m_choiceTimeFormatNChoices = sizeof( m_choiceTimeFormatChoices ) / sizeof( wxString );
+    m_choiceTimeFormat = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceTimeFormatNChoices, m_choiceTimeFormatChoices, 0 );
+    m_choiceTimeFormat->SetSelection( 0 );
+    fgSizer51->Add( m_choiceTimeFormat, 0, wxLEFT, 0 );
+
+    m_checkBoxNoSeconds = new wxCheckBox( m_panel15, wxID_ANY, _( "No Seconds" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer51->Add( m_checkBoxNoSeconds, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 0 );
+
+
+    fgSizer51->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextTime = new wxStaticText( m_panel15, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTime->Wrap( -1 );
+    fgSizer51->Add( m_staticTextTime, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    fgSizer10->Add( fgSizer51, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 5 );
+
+    wxFlexGridSizer* fgSizer18;
+    fgSizer18 = new wxFlexGridSizer( 1, 7, 0, 0 );
+    fgSizer18->SetFlexibleDirection( wxBOTH );
+    fgSizer18->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer18->Add( 100, 0, 1, wxEXPAND, 5 );
+
+    m_radioBtnUTC = new wxRadioButton( m_panel15, wxID_ANY, _( "UTC" ), wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    fgSizer18->Add( m_radioBtnUTC, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_radioBtnLocal = new wxRadioButton( m_panel15, wxID_ANY, _( "Local = UTC" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnLocal->SetValue( true );
+    fgSizer18->Add( m_radioBtnLocal, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceTzIndicatorChoices[] = { _T( "+" ), _T( "-" ) };
+    int m_choiceTzIndicatorNChoices = sizeof( m_choiceTzIndicatorChoices ) / sizeof( wxString );
 #ifdef __WXOSX__
-	m_choiceTzIndicator = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), m_choiceTzIndicatorNChoices, m_choiceTzIndicatorChoices, 0 );
+    m_choiceTzIndicator = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), m_choiceTzIndicatorNChoices, m_choiceTzIndicatorChoices, 0 );
 #else
-	m_choiceTzIndicator = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 40,-1 ), m_choiceTzIndicatorNChoices, m_choiceTzIndicatorChoices, 0 );
+    m_choiceTzIndicator = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 40,-1 ), m_choiceTzIndicatorNChoices, m_choiceTzIndicatorChoices, 0 );
 #endif
-	m_choiceTzIndicator->SetSelection( 0 );
-	fgSizer18->Add( m_choiceTzIndicator, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceTzHoursChoices[] = { _T("0"), _T("1"), _T("2"), _T("3"), _T("4"), _T("5"), _T("6"), _T("7"), _T("8"), _T("9"), _T("10"), _T("11"), _T("12"), _T("13"), _T("14") };
-	int m_choiceTzHoursNChoices = sizeof( m_choiceTzHoursChoices ) / sizeof( wxString );
+    m_choiceTzIndicator->SetSelection( 0 );
+    fgSizer18->Add( m_choiceTzIndicator, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceTzHoursChoices[] = { _T( "0" ), _T( "1" ), _T( "2" ), _T( "3" ), _T( "4" ), _T( "5" ), _T( "6" ), _T( "7" ), _T( "8" ), _T( "9" ), _T( "10" ), _T( "11" ), _T( "12" ), _T( "13" ), _T( "14" ) };
+    int m_choiceTzHoursNChoices = sizeof( m_choiceTzHoursChoices ) / sizeof( wxString );
 #ifdef __WXOSX__
-	m_choiceTzHours = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), m_choiceTzHoursNChoices, m_choiceTzHoursChoices, 0 );
+    m_choiceTzHours = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), m_choiceTzHoursNChoices, m_choiceTzHoursChoices, 0 );
 #else
-	m_choiceTzHours = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 40,-1 ), m_choiceTzHoursNChoices, m_choiceTzHoursChoices, 0 );
+    m_choiceTzHours = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxSize( 40,-1 ), m_choiceTzHoursNChoices, m_choiceTzHoursChoices, 0 );
 #endif
-	fgSizer18->Add( m_choiceTzHours, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+    fgSizer18->Add( m_choiceTzHours, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_staticText71 = new wxStaticText( m_panel15, wxID_ANY, _( "h" ), wxDefaultPosition, wxSize( 35,-1 ), 0 );
+    m_staticText71->Wrap( -1 );
+    fgSizer18->Add( m_staticText71, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_radioBtnGPSAuto = new wxRadioButton( m_panel15, wxID_ANY, _( "GPS Auto" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnGPSAuto->SetToolTip( _( "every 15 Degrees +/- 1 hour" ) );
+
+    fgSizer18->Add( m_radioBtnGPSAuto, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+
+    fgSizer10->Add( fgSizer18, 1, wxEXPAND, 5 );
+
+    m_staticline44 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer10->Add( m_staticline44, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    wxFlexGridSizer* fgSizer29;
+    fgSizer29 = new wxFlexGridSizer( 8, 4, 0, 0 );
+    fgSizer29->SetFlexibleDirection( wxBOTH );
+    fgSizer29->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxShowLogbook = new wxCheckBox( m_panel15, wxID_ANY, _( "Show Logbook Icon" ), wxDefaultPosition, wxSize( -1,-1 ), wxCHK_2STATE );
+    m_checkBoxShowLogbook->SetValue( true );
+    fgSizer29->Add( m_checkBoxShowLogbook, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
+
+    m_staticText76 = new wxStaticText( m_panel15, wxID_ANY, _( "Show Position Format" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText76->Wrap( -1 );
+    fgSizer29->Add( m_staticText76, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 0 );
+
+    wxString m_choicePositionFormatChoices[] = { wxString::Format( _T( "054%s 12.1234%s" ),opt->Deg.c_str(),opt->Min.c_str() ),
+                                                 wxString::Format( _T( "054%s 12%s.12,34%s" ),opt->Deg.c_str(),opt->Min.c_str(),opt->Sec.c_str() )
+                                               };//_T("054� 12.1234'"), _T("054� 12' 12.34\"") };
+    int m_choicePositionFormatNChoices = sizeof( m_choicePositionFormatChoices ) / sizeof( wxString );
+    m_choicePositionFormat = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePositionFormatNChoices, m_choicePositionFormatChoices, 0 );
+    m_choicePositionFormat->SetSelection( 0 );
+    fgSizer29->Add( m_choicePositionFormat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
 
-	m_staticText71 = new wxStaticText( m_panel15, wxID_ANY, _("h"), wxDefaultPosition, wxSize( 35,-1 ), 0 );
-	m_staticText71->Wrap( -1 );
-	fgSizer18->Add( m_staticText71, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_radioBtnGPSAuto = new wxRadioButton( m_panel15, wxID_ANY, _("GPS Auto"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnGPSAuto->SetToolTip( _("every 15 Degrees +/- 1 hour") );
-	
-	fgSizer18->Add( m_radioBtnGPSAuto, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	
-	fgSizer10->Add( fgSizer18, 1, wxEXPAND, 5 );
-	
-	m_staticline44 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer10->Add( m_staticline44, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	wxFlexGridSizer* fgSizer29;
-	fgSizer29 = new wxFlexGridSizer( 8, 4, 0, 0 );
-	fgSizer29->SetFlexibleDirection( wxBOTH );
-	fgSizer29->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 250, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 10, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxShowLogbook = new wxCheckBox( m_panel15, wxID_ANY, _("Show Logbook Icon"), wxDefaultPosition, wxSize( -1,-1 ), wxCHK_2STATE );
-	m_checkBoxShowLogbook->SetValue(true); 
-	fgSizer29->Add( m_checkBoxShowLogbook, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
-	
-	m_staticText76 = new wxStaticText( m_panel15, wxID_ANY, _("Show Position Format"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText76->Wrap( -1 );
-	fgSizer29->Add( m_staticText76, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 0 );
-	
-	wxString m_choicePositionFormatChoices[] = { wxString::Format(_T("054%s 12.1234%s"),opt->Deg.c_str(),opt->Min.c_str()),
-												 wxString::Format(_T("054%s 12%s.12,34%s"),opt->Deg.c_str(),opt->Min.c_str(),opt->Sec.c_str()) };//_T("054� 12.1234'"), _T("054� 12' 12.34\"") };
-	int m_choicePositionFormatNChoices = sizeof( m_choicePositionFormatChoices ) / sizeof( wxString );
-	m_choicePositionFormat = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePositionFormatNChoices, m_choicePositionFormatChoices, 0 );
-	m_choicePositionFormat->SetSelection( 0 );
-	fgSizer29->Add( m_choicePositionFormat, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxToolTips = new wxCheckBox( m_panel15, wxID_ANY, _("Show ToolTips"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxToolTips->SetValue(true); 
-	fgSizer29->Add( m_checkBoxToolTips, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxStaticText* m_staticText1391 = new wxStaticText( m_panel15, wxID_ANY, _("No. of Inboard Engines"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1391->Wrap( -1 );
-	fgSizer29->Add( m_staticText1391, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
-	
-	wxString m_choiceNoEnginesChoices[] = { _("1"), _("2") };
-	int m_choiceNoEnginesNChoices = sizeof( m_choiceNoEnginesChoices ) / sizeof( wxString );
-	m_choiceNoEngines = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceNoEnginesNChoices, m_choiceNoEnginesChoices, 0 );
-	m_choiceNoEngines->SetSelection( 0 );
-	fgSizer29->Add( m_choiceNoEngines, 0, wxRIGHT, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxEngine = new wxCheckBox( m_panel15, wxID_ANY, _("Sails Messages"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxEngine->SetValue(true); 
-	fgSizer29->Add( m_checkBoxEngine, 0, wxTOP, 5 );
-	
-    
     fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxGenerator = new wxCheckBox( m_panel15, wxID_ANY, _("Generator On Board"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxGenerator->SetValue(true);
-    m_checkBoxGenerator->SetToolTip( _("Check if there is a Generator onboard.\nIf unchecked the Generator columns will not show in Logbook") );
+
+    m_checkBoxToolTips = new wxCheckBox( m_panel15, wxID_ANY, _( "Show ToolTips" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxToolTips->SetValue( true );
+    fgSizer29->Add( m_checkBoxToolTips, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxStaticText* m_staticText1391 = new wxStaticText( m_panel15, wxID_ANY, _( "No. of Inboard Engines" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1391->Wrap( -1 );
+    fgSizer29->Add( m_staticText1391, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxLEFT, 5 );
+
+    wxString m_choiceNoEnginesChoices[] = { _( "1" ), _( "2" ) };
+    int m_choiceNoEnginesNChoices = sizeof( m_choiceNoEnginesChoices ) / sizeof( wxString );
+    m_choiceNoEngines = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceNoEnginesNChoices, m_choiceNoEnginesChoices, 0 );
+    m_choiceNoEngines->SetSelection( 0 );
+    fgSizer29->Add( m_choiceNoEngines, 0, wxRIGHT, 5 );
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxStatusBar = new wxCheckBox( m_panel15, wxID_ANY, _( "StatusBar at bottom of the page" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxStatusBar->SetValue( true );
+    m_checkBoxStatusBar->SetToolTip( _( "If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons" ) );
+    fgSizer29->Add( m_checkBoxStatusBar, 0, 0, 5 );
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxGenerator = new wxCheckBox( m_panel15, wxID_ANY, _( "Generator On Board" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxGenerator->SetValue( true );
+    m_checkBoxGenerator->SetToolTip( _( "Check if there is a Generator onboard.\nIf unchecked the Generator columns will not show in Logbook" ) );
     fgSizer29->Add( m_checkBoxGenerator, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxNoGPS = new wxCheckBox( m_panel15, wxID_ANY, _("Write warning \"No GPS\""), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxNoGPS->SetValue(true); 
-	m_checkBoxNoGPS->SetToolTip( _("Uncheck if You have no GPS\nIf GPS is out of order, uncheck to\nprevent that the message repeats.") );
-	
-	fgSizer29->Add( m_checkBoxNoGPS, 0, wxTOP|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-    m_checkBoxEngineRunning = new wxCheckBox( m_panel15, wxID_ANY, _("Write message \"Engine running\" "), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxEngineRunning->SetValue(true);
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxWindspeeds = new wxCheckBox( m_panel15, wxID_ANY, _( "Show Min|Avg|Max wind speeds" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxWindspeeds->SetValue( false );
+    m_checkBoxWindspeeds->SetToolTip( _( "If checked the TWS and AWS will display Min|Avg|Max windspeeds" ) );
+    fgSizer29->Add( m_checkBoxWindspeeds, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxEngine = new wxCheckBox( m_panel15, wxID_ANY, _( "Sails Messages" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxEngine->SetValue( true );
+    fgSizer29->Add( m_checkBoxEngine, 0, wxTOP, 5 );
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxOverview = new wxCheckBox( m_panel15, wxID_ANY, _( "Show daily entries in Overview" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxOverview->SetValue( false );
+    m_checkBoxOverview->SetToolTip( _( "If checked the Overview for Active or Selected logbook will show daily lines-" ) );
+    fgSizer29->Add( m_checkBoxOverview, 0, wxTOP, 5 );
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxNoGPS = new wxCheckBox( m_panel15, wxID_ANY, _( "Write warning \"No GPS\"" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxNoGPS->SetValue( true );
+    m_checkBoxNoGPS->SetToolTip( _( "Uncheck if You have no GPS\nIf GPS is out of order, uncheck to\nprevent that the message repeats." ) );
+
+    fgSizer29->Add( m_checkBoxNoGPS, 0, wxTOP|wxALIGN_CENTER_VERTICAL, 0 );
+
+    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxEngineRunning = new wxCheckBox( m_panel15, wxID_ANY, _( "Write message \"Engine running\" " ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxEngineRunning->SetValue( true );
+    m_checkBoxEngineRunning->SetToolTip( _( "If checked the message will be in Remarks when engine is started." ) );
     fgSizer29->Add( m_checkBoxEngineRunning, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
-    
+
     fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText741 = new wxStaticText( m_panel15, wxID_ANY, _("     Winddirection set to:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText741->Wrap( -1 );
-	fgSizer29->Add( m_staticText741, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxString m_choiceWindToChoices[] = { _("default"), _("Heading") };
-	int m_choiceWindToNChoices = sizeof( m_choiceWindToChoices ) / sizeof( wxString );
-	m_choiceWindTo = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceWindToNChoices, m_choiceWindToChoices, 0 );
-	m_choiceWindTo->SetSelection( 0 );
-	m_choiceWindTo->SetToolTip( _("default = Relative to Boat\nHeading = Actual wind direction") );
-	
-	fgSizer29->Add( m_choiceWindTo, 0, wxRIGHT, 5 );
-	
-//	fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-    m_checkBoxSailsDown = new wxCheckBox( m_panel15, wxID_ANY, _("On engine start set always all sails down"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_checkBoxSailsDown = new wxCheckBox( m_panel15, wxID_ANY, _( "On engine start set always all sails down" ), wxDefaultPosition, wxDefaultSize, 0 );
     fgSizer29->Add( m_checkBoxSailsDown, 0, 0, 5 );
-    
-    fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-    m_checkBoxStatusBar = new wxCheckBox( m_panel15, wxID_ANY, _("StatusBar at bottom of the page"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxStatusBar->SetValue(true);
-    m_checkBoxStatusBar->SetToolTip( _("If unchecked the StatusBar will be placed above the Navigation/Meteo/Motor-Sails buttons") );
-    fgSizer29->Add( m_checkBoxStatusBar, 0, 0, 5 );
-    
+
     fgSizer29->Add( 0, 0, 1, wxEXPAND, 5 );
 
+    m_staticText741 = new wxStaticText( m_panel15, wxID_ANY, _( "     Winddirection set to:" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText741->Wrap( -1 );
+    fgSizer29->Add( m_staticText741, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxString m_choiceWindToChoices[] = { _( "default" ), _( "Heading" ) };
+    int m_choiceWindToNChoices = sizeof( m_choiceWindToChoices ) / sizeof( wxString );
+    m_choiceWindTo = new wxChoice( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceWindToNChoices, m_choiceWindToChoices, 0 );
+    m_choiceWindTo->SetSelection( 0 );
+    m_choiceWindTo->SetToolTip( _( "default = Relative to Boat\nHeading = Actual wind direction" ) );
+
+    fgSizer29->Add( m_choiceWindTo, 0, wxRIGHT, 5 );
+
     fgSizer10->Add( fgSizer29, 1, 0, 0 );
-	
-	m_staticline25 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer10->Add( m_staticline25, 0, wxEXPAND|wxTOP, 5 );
-	
-	m_staticText54 = new wxStaticText( m_panel15, wxID_ANY, _("Events"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText54->Wrap( -1 );
-	m_staticText54->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	fgSizer10->Add( m_staticText54, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 0 );
-	
-	m_staticline22 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer10->Add( m_staticline22, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	m_staticText123 = new wxStaticText( m_panel15, wxID_ANY, _("Writes this text to the logbook when the event occurs, alter texts as desired"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText123->Wrap( -1 );
-	fgSizer10->Add( m_staticText123, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxFlexGridSizer* fgSizer14;
-	fgSizer14 = new wxFlexGridSizer( 6, 3, 0, 0 );
-	fgSizer14->SetFlexibleDirection( wxBOTH );
-	fgSizer14->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	fgSizer14->Add( 10, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText56 = new wxStaticText( m_panel15, wxID_ANY, _("Timer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	fgSizer14->Add( m_staticText56, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_timerText = new wxTextCtrl( m_panel15, wxID_ANY, _("automatic line by timer\nYou can set/unset a timer\n by clicking the bullet\nChange this text in options"), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
-	fgSizer14->Add( m_timerText, 0, 0, 5 );
-	
-	
-	fgSizer14->Add( 10, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText121 = new wxStaticText( m_panel15, wxID_ANY, _("Waypoint"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText121->Wrap( -1 );
-	fgSizer14->Add( m_staticText121, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlWayPoint = new wxTextCtrl( m_panel15, wxID_ANY, _("automatic line\nWaypoint arrived:"), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
-	fgSizer14->Add( m_textCtrlWayPoint, 0, wxALL|wxEXPAND, 0 );
-	
-	
-	fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText122 = new wxStaticText( m_panel15, wxID_ANY, _("Watch"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText122->Wrap( -1 );
-	fgSizer14->Add( m_staticText122, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlGuradChanged = new wxTextCtrl( m_panel15, wxID_ANY, _("automatic line\nchange of guards"), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
-//	m_textCtrlGuradChanged->SetMaxLength( 0 ); 
-	fgSizer14->Add( m_textCtrlGuradChanged, 0, wxALL|wxEXPAND, 0 );
-	
-	
-	fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText1231 = new wxStaticText( m_panel15, wxID_ANY, _("Distance"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1231->Wrap( -1 );
-	fgSizer14->Add( m_staticText1231, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlEverySMText = new wxTextCtrl( m_panel15, wxID_ANY, _("automatic line\nDistance > "), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
-//	m_textCtrlEverySMText->SetMaxLength( 0 ); 
-	fgSizer14->Add( m_textCtrlEverySMText, 0, wxALL|wxEXPAND, 0 );
-	
-	
-	fgSizer14->Add( 10, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText124 = new wxStaticText( m_panel15, wxID_ANY, _("Course changes"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText124->Wrap( -1 );
-	fgSizer14->Add( m_staticText124, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlChancedCourse = new wxTextCtrl( m_panel15, wxID_ANY, _("automatic line\nchange of course >"), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
-//	m_textCtrlChancedCourse->SetMaxLength( 0 ); 
-	fgSizer14->Add( m_textCtrlChancedCourse, 0, wxALL|wxEXPAND, 0 );
-	
-	
-	fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxPopUp = new wxCheckBox( m_panel15, wxID_ANY, _("Popup logbook on event"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxPopUp->SetValue(true); 
-	fgSizer14->Add( m_checkBoxPopUp, 0, wxALL, 5 );
-	
-	
-	fgSizer10->Add( fgSizer14, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline10 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer10->Add( m_staticline10, 0, wxEXPAND|wxTOP, 5 );
-	
-	wxFlexGridSizer* fgSizer28;
-	fgSizer28 = new wxFlexGridSizer( 3, 2, 0, 0 );
-	fgSizer28->SetFlexibleDirection( wxBOTH );
-	fgSizer28->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText731 = new wxStaticText( m_panel15, wxID_ANY, _("Install Layouts"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText731->Wrap( -1 );
-	fgSizer28->Add( m_staticText731, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText751 = new wxStaticText( m_panel15, wxID_ANY, _("Uninstall Logbook"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText751->Wrap( -1 );
-	fgSizer28->Add( m_staticText751, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonInstallHTMLFiles = new wxButton( m_panel15, wxID_ANY, _("Install"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonInstallHTMLFiles->SetToolTip( _("Install OpenCPN_Logbook_Layouts.zip") );
-	
-	fgSizer28->Add( m_buttonInstallHTMLFiles, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-		
-	m_buttonUninstall = new wxButton( m_panel15, wxID_ANY, _("Uninstall"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonUninstall->SetToolTip( _("Uninstalls\nLogbook-Plugin,\nall Logbook-Data,\nall Logbook-Layouts,\nall Logbook-Languages\nand cleans the OpenCPN.ini") );
-	
-	fgSizer28->Add( m_buttonUninstall, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	fgSizer10->Add( fgSizer28, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline261 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer10->Add( m_staticline261, 0, wxEXPAND, 5 );
-	
-	
-	bSizer51->Add( fgSizer10, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	m_panel15->SetSizer( bSizer51 );
-	m_panel15->Layout();
-	fgSizer10->Fit( m_panel15 );
-	m_notebook4->AddPage( m_panel15, _("Behavior"), true );
-	m_panel20 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer30;
-	bSizer30 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer30->Add( 0, 0, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer31;
-	bSizer31 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer31->Add( 0, 20, 0, wxEXPAND, 5 );
-	
-	m_staticText1041 = new wxStaticText( m_panel20, wxID_ANY, _("Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText1041->Wrap( -1 );
-	m_staticText1041->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_staticText1041, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline34 = new wxStaticLine( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline34, 0, wxEXPAND | wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer44;
-
-	fgSizer44 = new wxFlexGridSizer( 3, 3, 0, 0 );
-	fgSizer44->SetFlexibleDirection( wxBOTH );
-	fgSizer44->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText99 = new wxStaticText( m_panel20, wxID_ANY, _("Water"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText99->Wrap( -1 );
-	m_staticText99->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_staticText99->SetMinSize( wxSize( 150,-1 ) );
-	fgSizer44->Add( m_staticText99, 0, wxALL, 0 );
-	fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText100 = new wxStaticText( m_panel20, wxID_ANY, _("Tank"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText100->Wrap( -1 );
-	m_staticText100->SetMinSize( wxSize( 120,-1 ) );
-	
-	fgSizer44->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlTankWater = new wxTextCtrl( m_panel20, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
-	m_textCtrlTankWater->SetToolTip( _("Set gal/liter in Abbreviations ") );
-	fgSizer44->Add( m_textCtrlTankWater, 0, wxALL, 5 );
-	
-	
-	fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText102 = new wxStaticText( m_panel20, wxID_ANY, _("Watermaker"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText102->Wrap( -1 );
-	m_staticText102->SetMinSize( wxSize( 120,-1 ) );
-	
-	fgSizer44->Add( m_staticText102, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlWatermaker = new wxTextCtrl( m_panel20, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
-	m_textCtrlWatermaker->SetToolTip( _("Set gal/liter in Abbreviations ") );
-	
-	fgSizer44->Add( m_textCtrlWatermaker, 0, wxALL, 5 );
-	
-	bSizer31->Add( fgSizer44, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline33 = new wxStaticLine( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline33, 0, wxEXPAND | wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer43;
-
-	fgSizer43 = new wxFlexGridSizer( 2, 3, 0, 0 );
-	fgSizer43->SetFlexibleDirection( wxBOTH );
-	fgSizer43->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText96 = new wxStaticText( m_panel20, wxID_ANY, _("Fuel"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	m_staticText96->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_staticText96->SetMinSize( wxSize( 150,-1 ) );
-	fgSizer43->Add( m_staticText96, 0, wxALL, 0 );
-	fgSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText97 = new wxStaticText( m_panel20, wxID_ANY, _("Tank"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText97->Wrap( -1 );
-	m_staticText97->SetMinSize( wxSize( 120,-1 ) );
-	
-	fgSizer43->Add( m_staticText97, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlTankFuel = new wxTextCtrl( m_panel20, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
-	m_textCtrlTankFuel->SetToolTip( _("Set gal/liter in Abbreviations ") );
-	fgSizer43->Add( m_textCtrlTankFuel, 0, wxALL, 5 );
-	
-	bSizer31->Add( fgSizer43, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline32 = new wxStaticLine( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline32, 0, wxALL|wxEXPAND, 5 );
-	
-	wxFlexGridSizer* fgSizer45;
-
-	fgSizer45 = new wxFlexGridSizer( 3, 3, 0, 0 );
-	fgSizer45->SetFlexibleDirection( wxBOTH );
-	fgSizer45->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText104 = new wxStaticText( m_panel20, wxID_ANY, _("Battery"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText104->Wrap( -1 );
-	m_staticText104->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_staticText104->SetMinSize( wxSize( 150,-1 ) );
-	fgSizer45->Add( m_staticText104, 0, wxALL, 0 );
-	fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText105 = new wxStaticText( m_panel20, wxID_ANY, _("Bank #1"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText105->Wrap( -1 );
-	m_staticText105->SetMinSize( wxSize( 120,-1 ) );
-	
-	fgSizer45->Add( m_staticText105, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlBank1 = new wxTextCtrl( m_panel20, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
-	fgSizer45->Add( m_textCtrlBank1, 0, wxALL, 5 );
-	
-	
-	fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText107 = new wxStaticText( m_panel20, wxID_ANY, _("Bank #2"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText107->Wrap( -1 );
-	m_staticText107->SetMinSize( wxSize( 120,-1 ) );
-	
-	fgSizer45->Add( m_staticText107, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlBank2 = new wxTextCtrl( m_panel20, wxID_ANY, wxT("0"), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
-	fgSizer45->Add( m_textCtrlBank2, 0, wxALL, 5 );
-	
-	bSizer31->Add( fgSizer45, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer30->Add( bSizer31, 1, wxEXPAND, 5 );
-	
-	m_panel20->SetSizer( bSizer30 );
-	m_panel20->Layout();
-	bSizer30->Fit( m_panel20 );
-	m_notebook4->AddPage( m_panel20, _("Capacity"), false );
-	m_panel16 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer30;
-
-	fgSizer30 = new wxFlexGridSizer( 6, 1, 5, 0 );
-	fgSizer30->SetFlexibleDirection( wxBOTH );
-	fgSizer30->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxFlexGridSizer* fgSizer91;
-
-	fgSizer91 = new wxFlexGridSizer( 13, 7, 5, 0 );
-	fgSizer91->SetFlexibleDirection( wxBOTH );
-	fgSizer91->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	fgSizer91->Add( 140, 30, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 100, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 80, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 80, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 60, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 50, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 100, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText34 = new wxStaticText( m_panel16, wxID_ANY, _("Navigation"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText34->Wrap( -1 );
-	m_staticText34->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer91->Add( m_staticText34, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText31 = new wxStaticText( m_panel16, wxID_ANY, _("Degrees"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText31->Wrap( -1 );
-	fgSizer91->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline25 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer10->Add( m_staticline25, 0, wxEXPAND|wxTOP, 5 );
+
+    m_staticText54 = new wxStaticText( m_panel15, wxID_ANY, _( "Events" ), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticText54->Wrap( -1 );
+    m_staticText54->SetFont( wxFont( 10, 74, 90, 92, false, wxT( "Tahoma" ) ) );
+
+    fgSizer10->Add( m_staticText54, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 0 );
+
+    m_staticline22 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer10->Add( m_staticline22, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    m_staticText123 = new wxStaticText( m_panel15, wxID_ANY, _( "Writes this text to the logbook when the event occurs, alter texts as desired" ), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticText123->Wrap( -1 );
+    fgSizer10->Add( m_staticText123, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxFlexGridSizer* fgSizer14;
+    fgSizer14 = new wxFlexGridSizer( 6, 3, 0, 0 );
+    fgSizer14->SetFlexibleDirection( wxBOTH );
+    fgSizer14->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    fgSizer14->Add( 10, 0, 1, wxEXPAND, 5 );
+
+    m_staticText56 = new wxStaticText( m_panel15, wxID_ANY, _( "Timer" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText56->Wrap( -1 );
+    fgSizer14->Add( m_staticText56, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_timerText = new wxTextCtrl( m_panel15, wxID_ANY, _( "automatic line by timer\nYou can set/unset a timer\n by clicking the bullet\nChange this text in options" ), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
+    fgSizer14->Add( m_timerText, 0, 0, 5 );
+
+
+    fgSizer14->Add( 10, 0, 1, wxEXPAND, 5 );
+
+    m_staticText121 = new wxStaticText( m_panel15, wxID_ANY, _( "Waypoint" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText121->Wrap( -1 );
+    fgSizer14->Add( m_staticText121, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlWayPoint = new wxTextCtrl( m_panel15, wxID_ANY, _( "automatic line\nWaypoint arrived:" ), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
+    fgSizer14->Add( m_textCtrlWayPoint, 0, wxALL|wxEXPAND, 0 );
+
+
+    fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText122 = new wxStaticText( m_panel15, wxID_ANY, _( "Watch" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText122->Wrap( -1 );
+    fgSizer14->Add( m_staticText122, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlGuradChanged = new wxTextCtrl( m_panel15, wxID_ANY, _( "automatic line\nchange of guards" ), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
+//	m_textCtrlGuradChanged->SetMaxLength( 0 );
+    fgSizer14->Add( m_textCtrlGuradChanged, 0, wxALL|wxEXPAND, 0 );
+
+
+    fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText1231 = new wxStaticText( m_panel15, wxID_ANY, _( "Distance" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1231->Wrap( -1 );
+    fgSizer14->Add( m_staticText1231, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlEverySMText = new wxTextCtrl( m_panel15, wxID_ANY, _( "automatic line\nDistance > " ), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
+//	m_textCtrlEverySMText->SetMaxLength( 0 );
+    fgSizer14->Add( m_textCtrlEverySMText, 0, wxALL|wxEXPAND, 0 );
+
+
+    fgSizer14->Add( 10, 0, 1, wxEXPAND, 5 );
+
+    m_staticText124 = new wxStaticText( m_panel15, wxID_ANY, _( "Course changes" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText124->Wrap( -1 );
+    fgSizer14->Add( m_staticText124, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlChancedCourse = new wxTextCtrl( m_panel15, wxID_ANY, _( "automatic line\nchange of course >" ), wxDefaultPosition, wxSize( 250,40 ), wxTE_MULTILINE );
+//	m_textCtrlChancedCourse->SetMaxLength( 0 );
+    fgSizer14->Add( m_textCtrlChancedCourse, 0, wxALL|wxEXPAND, 0 );
+
+
+    fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    fgSizer14->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxPopUp = new wxCheckBox( m_panel15, wxID_ANY, _( "Popup logbook on event" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxPopUp->SetValue( true );
+    fgSizer14->Add( m_checkBoxPopUp, 0, wxALL, 5 );
+
+
+    fgSizer10->Add( fgSizer14, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline10 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer10->Add( m_staticline10, 0, wxEXPAND|wxTOP, 5 );
+
+    wxFlexGridSizer* fgSizer28;
+    fgSizer28 = new wxFlexGridSizer( 3, 2, 0, 0 );
+    fgSizer28->SetFlexibleDirection( wxBOTH );
+    fgSizer28->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText731 = new wxStaticText( m_panel15, wxID_ANY, _( "Install Layouts" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText731->Wrap( -1 );
+    fgSizer28->Add( m_staticText731, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_staticText751 = new wxStaticText( m_panel15, wxID_ANY, _( "Uninstall Logbook" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText751->Wrap( -1 );
+    fgSizer28->Add( m_staticText751, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonInstallHTMLFiles = new wxButton( m_panel15, wxID_ANY, _( "Install" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonInstallHTMLFiles->SetToolTip( _( "Install OpenCPN_Logbook_Layouts.zip" ) );
+
+    fgSizer28->Add( m_buttonInstallHTMLFiles, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonUninstall = new wxButton( m_panel15, wxID_ANY, _( "Uninstall" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonUninstall->SetToolTip( _( "Uninstalls\nLogbook-Plugin,\nall Logbook-Data,\nall Logbook-Layouts,\nall Logbook-Languages\nand cleans the OpenCPN.ini" ) );
+
+    fgSizer28->Add( m_buttonUninstall, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    fgSizer10->Add( fgSizer28, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline261 = new wxStaticLine( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer10->Add( m_staticline261, 0, wxEXPAND, 5 );
+
+
+    bSizer51->Add( fgSizer10, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    m_panel15->SetSizer( bSizer51 );
+    m_panel15->Layout();
+    fgSizer10->Fit( m_panel15 );
+    m_notebook4->AddPage( m_panel15, _( "Behavior" ), true );
+    m_panel20 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer30;
+    bSizer30 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer30->Add( 0, 0, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer31;
+    bSizer31 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer31->Add( 0, 20, 0, wxEXPAND, 5 );
+
+    m_staticText1041 = new wxStaticText( m_panel20, wxID_ANY, _( "Only used when you enter 1/2, 1/4 ... in a total-field, or to calculate the watermaker\n" ), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticText1041->Wrap( -1 );
+    m_staticText1041->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer31->Add( m_staticText1041, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline34 = new wxStaticLine( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline34, 0, wxEXPAND | wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer44;
+
+    fgSizer44 = new wxFlexGridSizer( 3, 3, 0, 0 );
+    fgSizer44->SetFlexibleDirection( wxBOTH );
+    fgSizer44->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText99 = new wxStaticText( m_panel20, wxID_ANY, _( "Water" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText99->Wrap( -1 );
+    m_staticText99->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_staticText99->SetMinSize( wxSize( 150,-1 ) );
+    fgSizer44->Add( m_staticText99, 0, wxALL, 0 );
+    fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText100 = new wxStaticText( m_panel20, wxID_ANY, _( "Tank" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText100->Wrap( -1 );
+    m_staticText100->SetMinSize( wxSize( 120,-1 ) );
+
+    fgSizer44->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlTankWater = new wxTextCtrl( m_panel20, wxID_ANY, wxT( "0" ), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    m_textCtrlTankWater->SetToolTip( _( "Set gal/liter in Abbreviations " ) );
+    fgSizer44->Add( m_textCtrlTankWater, 0, wxALL, 5 );
+
+
+    fgSizer44->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText102 = new wxStaticText( m_panel20, wxID_ANY, _( "Watermaker" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText102->Wrap( -1 );
+    m_staticText102->SetMinSize( wxSize( 120,-1 ) );
+
+    fgSizer44->Add( m_staticText102, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlWatermaker = new wxTextCtrl( m_panel20, wxID_ANY, wxT( "0" ), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    m_textCtrlWatermaker->SetToolTip( _( "Set gal/liter in Abbreviations " ) );
+
+    fgSizer44->Add( m_textCtrlWatermaker, 0, wxALL, 5 );
+
+    bSizer31->Add( fgSizer44, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline33 = new wxStaticLine( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline33, 0, wxEXPAND | wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer43;
+
+    fgSizer43 = new wxFlexGridSizer( 2, 3, 0, 0 );
+    fgSizer43->SetFlexibleDirection( wxBOTH );
+    fgSizer43->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText96 = new wxStaticText( m_panel20, wxID_ANY, _( "Fuel" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    m_staticText96->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_staticText96->SetMinSize( wxSize( 150,-1 ) );
+    fgSizer43->Add( m_staticText96, 0, wxALL, 0 );
+    fgSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText97 = new wxStaticText( m_panel20, wxID_ANY, _( "Tank" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText97->Wrap( -1 );
+    m_staticText97->SetMinSize( wxSize( 120,-1 ) );
+
+    fgSizer43->Add( m_staticText97, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlTankFuel = new wxTextCtrl( m_panel20, wxID_ANY, wxT( "0" ), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    m_textCtrlTankFuel->SetToolTip( _( "Set gal/liter in Abbreviations " ) );
+    fgSizer43->Add( m_textCtrlTankFuel, 0, wxALL, 5 );
+
+    bSizer31->Add( fgSizer43, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline32 = new wxStaticLine( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline32, 0, wxALL|wxEXPAND, 5 );
+
+    wxFlexGridSizer* fgSizer45;
+
+    fgSizer45 = new wxFlexGridSizer( 3, 3, 0, 0 );
+    fgSizer45->SetFlexibleDirection( wxBOTH );
+    fgSizer45->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText104 = new wxStaticText( m_panel20, wxID_ANY, _( "Battery" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText104->Wrap( -1 );
+    m_staticText104->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_staticText104->SetMinSize( wxSize( 150,-1 ) );
+    fgSizer45->Add( m_staticText104, 0, wxALL, 0 );
+    fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText105 = new wxStaticText( m_panel20, wxID_ANY, _( "Bank #1" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText105->Wrap( -1 );
+    m_staticText105->SetMinSize( wxSize( 120,-1 ) );
+
+    fgSizer45->Add( m_staticText105, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlBank1 = new wxTextCtrl( m_panel20, wxID_ANY, wxT( "0" ), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    fgSizer45->Add( m_textCtrlBank1, 0, wxALL, 5 );
+
+
+    fgSizer45->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText107 = new wxStaticText( m_panel20, wxID_ANY, _( "Bank #2" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText107->Wrap( -1 );
+    m_staticText107->SetMinSize( wxSize( 120,-1 ) );
+
+    fgSizer45->Add( m_staticText107, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlBank2 = new wxTextCtrl( m_panel20, wxID_ANY, wxT( "0" ), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    fgSizer45->Add( m_textCtrlBank2, 0, wxALL, 5 );
+
+    bSizer31->Add( fgSizer45, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer30->Add( bSizer31, 1, wxEXPAND, 5 );
+
+    m_panel20->SetSizer( bSizer30 );
+    m_panel20->Layout();
+    bSizer30->Fit( m_panel20 );
+    m_notebook4->AddPage( m_panel20, _( "Capacity" ), false );
+    m_panel16 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer30;
+
+    fgSizer30 = new wxFlexGridSizer( 6, 1, 5, 0 );
+    fgSizer30->SetFlexibleDirection( wxBOTH );
+    fgSizer30->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxFlexGridSizer* fgSizer91;
+
+    fgSizer91 = new wxFlexGridSizer( 13, 7, 5, 0 );
+    fgSizer91->SetFlexibleDirection( wxBOTH );
+    fgSizer91->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    fgSizer91->Add( 140, 30, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 100, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 80, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 80, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 60, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 50, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 100, 0, 1, wxEXPAND, 5 );
+
+    m_staticText34 = new wxStaticText( m_panel16, wxID_ANY, _( "Navigation" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText34->Wrap( -1 );
+    m_staticText34->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer91->Add( m_staticText34, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText31 = new wxStaticText( m_panel16, wxID_ANY, _( "Degrees" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText31->Wrap( -1 );
+    fgSizer91->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL, 5 );
 #ifdef __WXOSX__
-    m_sDeg = new wxTextCtrl( m_panel16, wxID_ANY, _T("\xA1"), wxDefaultPosition, wxSize( 40,-1 ), 0 ); 
-	// don't know if \xA1 is correct, cannot compile for apple
+    m_sDeg = new wxTextCtrl( m_panel16, wxID_ANY, _T( "\xA1" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    // don't know if \xA1 is correct, cannot compile for apple
 #else
-	m_sDeg = new wxTextCtrl( m_panel16, wxID_ANY, _T("\xB0"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    m_sDeg = new wxTextCtrl( m_panel16, wxID_ANY, _T( "\xB0" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
 #endif
-	fgSizer91->Add( m_sDeg, 0, 0, 5 );
-	
-	m_staticText35 = new wxStaticText( m_panel16, wxID_ANY, _("Minutes"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText35->Wrap( -1 );
-	fgSizer91->Add( m_staticText35, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sMin = new wxTextCtrl( m_panel16, wxID_ANY, _("'"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sMin, 0, 0, 5 );
-	
-	m_staticText36 = new wxStaticText( m_panel16, wxID_ANY, _("Seconds"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText36->Wrap( -1 );
-	fgSizer91->Add( m_staticText36, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sSec = new wxTextCtrl( m_panel16, wxID_ANY, _("\""), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sSec, 0, 0, 5 );
-	
-	
-	fgSizer91->Add( 100, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText38 = new wxStaticText( m_panel16, wxID_ANY, _("Distance"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText38->Wrap( -1 );
-	fgSizer91->Add( m_staticText38, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sDist = new wxTextCtrl( m_panel16, wxID_ANY, _("NM"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sDist, 0, 0, 5 );
-	
-	m_staticText39 = new wxStaticText( m_panel16, wxID_ANY, _("Speed"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText39->Wrap( -1 );
-	fgSizer91->Add( m_staticText39, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sSpeed = new wxTextCtrl( m_panel16, wxID_ANY, _("kts"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sSpeed, 0, 0, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText40 = new wxStaticText( m_panel16, wxID_ANY, _("Show Depth in"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText40->Wrap( -1 );
-	fgSizer91->Add( m_staticText40, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxString m_choiceDepthChoices[] = { _("Meter"), _("Feet"), _("Fathom") };
-	int m_choiceDepthNChoices = sizeof( m_choiceDepthChoices ) / sizeof( wxString );
-	m_choiceDepth = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceDepthNChoices, m_choiceDepthChoices, 0 );
-	m_choiceDepth->SetSelection( 0 );
-	fgSizer91->Add( m_choiceDepth, 0, 0, 5 );
-	
-	m_staticText41 = new wxStaticText( m_panel16, wxID_ANY, _("Meter"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText41->Wrap( -1 );
-	fgSizer91->Add( m_staticText41, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_smeter = new wxTextCtrl( m_panel16, wxID_ANY, _("m"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_smeter, 0, 0, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
-	
-	m_staticText63 = new wxStaticText( m_panel16, wxID_ANY, _("Show Wave/Swell in"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText63->Wrap( -1 );
-	fgSizer91->Add( m_staticText63, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceWaveSwellChoices[] = { _("Meter"), _("Feet"), _("Fathom") };
-	int m_choiceWaveSwellNChoices = sizeof( m_choiceWaveSwellChoices ) / sizeof( wxString );
-	m_choiceWaveSwell = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceWaveSwellNChoices, m_choiceWaveSwellChoices, 0 );
-	m_choiceWaveSwell->SetSelection( 0 );
-	fgSizer91->Add( m_choiceWaveSwell, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText48 = new wxStaticText( m_panel16, wxID_ANY, _("Feet"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText48->Wrap( -1 );
-	fgSizer91->Add( m_staticText48, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sFeet = new wxTextCtrl( m_panel16, wxID_ANY, _("ft"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sFeet, 0, 0, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
-	
-	m_staticText632 = new wxStaticText( m_panel16, wxID_ANY, _("Heading"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText632->Wrap( -1 );
-	fgSizer91->Add( m_staticText632, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	wxString m_choiceHeadingChoices[] = { _("True"), _("Magnetic") };
-	int m_choiceHeadingNChoices = sizeof( m_choiceHeadingChoices ) / sizeof( wxString );
-	m_choiceHeading = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHeadingNChoices, m_choiceHeadingChoices, 0 );
-	m_choiceHeading->SetSelection( 0 );
-	fgSizer91->Add( m_choiceHeading, 1, wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_staticText49 = new wxStaticText( m_panel16, wxID_ANY, _("Fathom"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText49->Wrap( -1 );
-	fgSizer91->Add( m_staticText49, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
-	m_sFathom = new wxTextCtrl( m_panel16, wxID_ANY, _("fm"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sFathom, 0, 0, 5 );
-	fgSizer91->Add( 0, 1, 1, wxEXPAND, 0 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
-	
-	m_staticText42 = new wxStaticText( m_panel16, wxID_ANY, _("Weather"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText42->Wrap( -1 );
-	m_staticText42->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer91->Add( m_staticText42, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText43 = new wxStaticText( m_panel16, wxID_ANY, _("Barometer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText43->Wrap( -1 );
-	fgSizer91->Add( m_staticText43, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sBaro = new wxTextCtrl( m_panel16, wxID_ANY, _("mb"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sBaro, 0, 0, 5 );
-	
-	m_staticText44 = new wxStaticText( m_panel16, wxID_ANY, _("Windspeed"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText44->Wrap( -1 );
-	fgSizer91->Add( m_staticText44, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_sKnots = new wxTextCtrl( m_panel16, wxID_ANY, _("kts"), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	fgSizer91->Add( m_sKnots, 0, 0, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_sMeterSec = new wxTextCtrl( m_panel16, wxID_ANY, _("m/s"), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	fgSizer91->Add( m_sMeterSec, 0, 0, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_sKmh = new wxTextCtrl( m_panel16, wxID_ANY, _("km/h"), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
-	fgSizer91->Add( m_sKmh, 0, 0, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText791 = new wxStaticText( m_panel16, wxID_ANY, _("Temperature"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText791->Wrap( -1 );
-	fgSizer91->Add( m_staticText791, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_textCtrlTemperature = new wxTextCtrl( m_panel16, wxID_ANY, _("F"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_textCtrlTemperature, 0, wxALL, 0 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText46 = new wxStaticText( m_panel16, wxID_ANY, _("Fuel/Water"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText46->Wrap( -1 );
-	m_staticText46->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer91->Add( m_staticText46, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText47 = new wxStaticText( m_panel16, wxID_ANY, _("Capacity"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText47->Wrap( -1 );
-	fgSizer91->Add( m_staticText47, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sLiter = new wxTextCtrl( m_panel16, wxID_ANY, _("gal"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sLiter, 0, 0, 5 );
-	
-	m_staticText50 = new wxStaticText( m_panel16, wxID_ANY, _("Motor Hours"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText50->Wrap( -1 );
-	fgSizer91->Add( m_staticText50, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_sMotorh = new wxTextCtrl( m_panel16, wxID_ANY, _("h"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_sMotorh, 0, 0, 5 );
-
-	m_staticText106 = new wxStaticText( m_panel16, wxID_ANY, _("Ampere"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText106->Wrap( -1 );
-	fgSizer91->Add( m_staticText106, 0, wxALL, 5 );
-	
-	m_textCtrlAmpere = new wxTextCtrl( m_panel16, wxID_ANY, _T("A"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
-	fgSizer91->Add( m_textCtrlAmpere, 0, wxALL, 0 );
-	fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( m_sDeg, 0, 0, 5 );
 
-    m_staticText135 = new wxStaticText( m_panel16, wxID_ANY, _("Engine"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText35 = new wxStaticText( m_panel16, wxID_ANY, _( "Minutes" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText35->Wrap( -1 );
+    fgSizer91->Add( m_staticText35, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sMin = new wxTextCtrl( m_panel16, wxID_ANY, _( "'" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sMin, 0, 0, 5 );
+
+    m_staticText36 = new wxStaticText( m_panel16, wxID_ANY, _( "Seconds" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText36->Wrap( -1 );
+    fgSizer91->Add( m_staticText36, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sSec = new wxTextCtrl( m_panel16, wxID_ANY, _( "\"" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sSec, 0, 0, 5 );
+
+
+    fgSizer91->Add( 100, 0, 1, wxEXPAND, 5 );
+
+    m_staticText38 = new wxStaticText( m_panel16, wxID_ANY, _( "Distance" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText38->Wrap( -1 );
+    fgSizer91->Add( m_staticText38, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sDist = new wxTextCtrl( m_panel16, wxID_ANY, _( "NM" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sDist, 0, 0, 5 );
+
+    m_staticText39 = new wxStaticText( m_panel16, wxID_ANY, _( "Speed" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText39->Wrap( -1 );
+    fgSizer91->Add( m_staticText39, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sSpeed = new wxTextCtrl( m_panel16, wxID_ANY, _( "kts" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sSpeed, 0, 0, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText40 = new wxStaticText( m_panel16, wxID_ANY, _( "Show Depth in" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText40->Wrap( -1 );
+    fgSizer91->Add( m_staticText40, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxString m_choiceDepthChoices[] = { _( "Meter" ), _( "Feet" ), _( "Fathom" ) };
+    int m_choiceDepthNChoices = sizeof( m_choiceDepthChoices ) / sizeof( wxString );
+    m_choiceDepth = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceDepthNChoices, m_choiceDepthChoices, 0 );
+    m_choiceDepth->SetSelection( 0 );
+    fgSizer91->Add( m_choiceDepth, 0, 0, 5 );
+
+    m_staticText41 = new wxStaticText( m_panel16, wxID_ANY, _( "Meter" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText41->Wrap( -1 );
+    fgSizer91->Add( m_staticText41, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_smeter = new wxTextCtrl( m_panel16, wxID_ANY, _( "m" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_smeter, 0, 0, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
+
+    m_staticText63 = new wxStaticText( m_panel16, wxID_ANY, _( "Show Wave/Swell in" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText63->Wrap( -1 );
+    fgSizer91->Add( m_staticText63, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceWaveSwellChoices[] = { _( "Meter" ), _( "Feet" ), _( "Fathom" ) };
+    int m_choiceWaveSwellNChoices = sizeof( m_choiceWaveSwellChoices ) / sizeof( wxString );
+    m_choiceWaveSwell = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceWaveSwellNChoices, m_choiceWaveSwellChoices, 0 );
+    m_choiceWaveSwell->SetSelection( 0 );
+    fgSizer91->Add( m_choiceWaveSwell, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText48 = new wxStaticText( m_panel16, wxID_ANY, _( "Feet" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText48->Wrap( -1 );
+    fgSizer91->Add( m_staticText48, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sFeet = new wxTextCtrl( m_panel16, wxID_ANY, _( "ft" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sFeet, 0, 0, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
+
+    m_staticText632 = new wxStaticText( m_panel16, wxID_ANY, _( "Heading" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText632->Wrap( -1 );
+    fgSizer91->Add( m_staticText632, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxString m_choiceHeadingChoices[] = { _( "True" ), _( "Magnetic" ) };
+    int m_choiceHeadingNChoices = sizeof( m_choiceHeadingChoices ) / sizeof( wxString );
+    m_choiceHeading = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHeadingNChoices, m_choiceHeadingChoices, 0 );
+    m_choiceHeading->SetSelection( 0 );
+    fgSizer91->Add( m_choiceHeading, 1, wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_staticText49 = new wxStaticText( m_panel16, wxID_ANY, _( "Fathom" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText49->Wrap( -1 );
+    fgSizer91->Add( m_staticText49, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
+
+    m_sFathom = new wxTextCtrl( m_panel16, wxID_ANY, _( "fm" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sFathom, 0, 0, 5 );
+    fgSizer91->Add( 0, 1, 1, wxEXPAND, 0 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 0 );
+
+    m_staticText42 = new wxStaticText( m_panel16, wxID_ANY, _( "Weather" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText42->Wrap( -1 );
+    m_staticText42->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer91->Add( m_staticText42, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText43 = new wxStaticText( m_panel16, wxID_ANY, _( "Barometer" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText43->Wrap( -1 );
+    fgSizer91->Add( m_staticText43, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sBaro = new wxTextCtrl( m_panel16, wxID_ANY, _( "mb" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sBaro, 0, 0, 5 );
+
+    m_staticText44 = new wxStaticText( m_panel16, wxID_ANY, _( "Windspeed" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText44->Wrap( -1 );
+    fgSizer91->Add( m_staticText44, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_sKnots = new wxTextCtrl( m_panel16, wxID_ANY, _( "kts" ), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+    fgSizer91->Add( m_sKnots, 0, 0, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_sMeterSec = new wxTextCtrl( m_panel16, wxID_ANY, _( "m/s" ), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+    fgSizer91->Add( m_sMeterSec, 0, 0, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_sKmh = new wxTextCtrl( m_panel16, wxID_ANY, _( "km/h" ), wxDefaultPosition, wxSize( 40,-1 ), wxTE_PROCESS_ENTER );
+    fgSizer91->Add( m_sKmh, 0, 0, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText791 = new wxStaticText( m_panel16, wxID_ANY, _( "Temperature" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText791->Wrap( -1 );
+    fgSizer91->Add( m_staticText791, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_textCtrlTemperature = new wxTextCtrl( m_panel16, wxID_ANY, _( "F" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_textCtrlTemperature, 0, wxALL, 0 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText46 = new wxStaticText( m_panel16, wxID_ANY, _( "Fuel/Water" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText46->Wrap( -1 );
+    m_staticText46->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer91->Add( m_staticText46, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText47 = new wxStaticText( m_panel16, wxID_ANY, _( "Capacity" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText47->Wrap( -1 );
+    fgSizer91->Add( m_staticText47, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sLiter = new wxTextCtrl( m_panel16, wxID_ANY, _( "gal" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sLiter, 0, 0, 5 );
+
+    m_staticText50 = new wxStaticText( m_panel16, wxID_ANY, _( "Motor Hours" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText50->Wrap( -1 );
+    fgSizer91->Add( m_staticText50, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_sMotorh = new wxTextCtrl( m_panel16, wxID_ANY, _( "h" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_sMotorh, 0, 0, 5 );
+
+    m_staticText106 = new wxStaticText( m_panel16, wxID_ANY, _( "Ampere" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText106->Wrap( -1 );
+    fgSizer91->Add( m_staticText106, 0, wxALL, 5 );
+
+    m_textCtrlAmpere = new wxTextCtrl( m_panel16, wxID_ANY, _T( "A" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    fgSizer91->Add( m_textCtrlAmpere, 0, wxALL, 0 );
+    fgSizer91->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText135 = new wxStaticText( m_panel16, wxID_ANY, _( "Engine" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText135->Wrap( -1 );
     fgSizer91->Add( m_staticText135, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 0 );
 
-    m_textCtrlEngine = new wxTextCtrl( m_panel16, wxID_ANY, _("E"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    m_textCtrlEngine = new wxTextCtrl( m_panel16, wxID_ANY, _( "E" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
     fgSizer91->Add( m_textCtrlEngine, 0, 0, 5 );
 
-    m_staticText137 = new wxStaticText( m_panel16, wxID_ANY, _("PropShaft"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText137 = new wxStaticText( m_panel16, wxID_ANY, _( "PropShaft" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText137->Wrap( -1 );
     fgSizer91->Add( m_staticText137, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    m_textCtrlPropShaft = new wxTextCtrl( m_panel16, wxID_ANY, _("S"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    m_textCtrlPropShaft = new wxTextCtrl( m_panel16, wxID_ANY, _( "S" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
     fgSizer91->Add( m_textCtrlPropShaft, 0, 0, 5 );
 
-    m_staticText136 = new wxStaticText( m_panel16, wxID_ANY, _("Revolutions"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText136 = new wxStaticText( m_panel16, wxID_ANY, _( "Revolutions" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText136->Wrap( -1 );
     fgSizer91->Add( m_staticText136, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_textCtrRPM = new wxTextCtrl( m_panel16, wxID_ANY, _("RPM"), wxDefaultPosition, wxSize( 50,-1 ), 0 );
+    m_textCtrRPM = new wxTextCtrl( m_panel16, wxID_ANY, _( "RPM" ), wxDefaultPosition, wxSize( 50,-1 ), 0 );
     fgSizer91->Add( m_textCtrRPM, 0, 0, 5 );
-	m_staticText70 = new wxStaticText( m_panel16, wxID_ANY, _("Maintenance"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText70->Wrap( -1 );
-	m_staticText70->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer91->Add( m_staticText70, 0, wxALL, 5 );
-	
-	m_staticText712 = new wxStaticText( m_panel16, wxID_ANY, _("Day(s)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText712->Wrap( -1 );
-	fgSizer91->Add( m_staticText712, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_Days = new wxTextCtrl( m_panel16, wxID_ANY, _("Day(s)"), wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	fgSizer91->Add( m_Days, 0, wxALL, 0 );
-	
-	m_staticText72 = new wxStaticText( m_panel16, wxID_ANY, _("Week(s)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText72->Wrap( -1 );
-	fgSizer91->Add( m_staticText72, 0, wxALL, 5 );
-	
-	m_Weeks = new wxTextCtrl( m_panel16, wxID_ANY, _("Weeks(s)"), wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	fgSizer91->Add( m_Weeks, 0, wxALL, 0 );
-	
-	m_staticText73 = new wxStaticText( m_panel16, wxID_ANY, _("Month "), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText73->Wrap( -1 );
-	fgSizer91->Add( m_staticText73, 0, wxALL, 5 );
-	
-	m_textMonth = new wxTextCtrl( m_panel16, wxID_ANY, _("Month"), wxDefaultPosition, wxSize( 60,-1 ), 0 );
-	fgSizer91->Add( m_textMonth, 0, wxALL, 0 );
-	
-	fgSizer30->Add( fgSizer91, 1, wxEXPAND, 5 );
-	
-	m_staticline251 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer30->Add( m_staticline251, 0, wxEXPAND | wxALL, 5 );
-	
-	m_staticText75 = new wxStaticText( m_panel16, wxID_ANY, _("If GPS off use for manual entry"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-	m_staticText75->Wrap( -1 );
-	fgSizer30->Add( m_staticText75, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline26 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	fgSizer30->Add( m_staticline26, 0, wxEXPAND | wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer32;
-	fgSizer32 = new wxFlexGridSizer( 2, 4, 0, 0 );
-	fgSizer32->SetFlexibleDirection( wxBOTH );
-	fgSizer32->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText51 = new wxStaticText( m_panel16, wxID_ANY, _("Windspeed "), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticText51->Wrap( -1 );
-	fgSizer32->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxString m_choiceWindChoices[] = { _("kts"), _("m/s"), _("km/h") };
-	int m_choiceWindNChoices = sizeof( m_choiceWindChoices ) / sizeof( wxString );
+    m_staticText70 = new wxStaticText( m_panel16, wxID_ANY, _( "Maintenance" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText70->Wrap( -1 );
+    m_staticText70->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer91->Add( m_staticText70, 0, wxALL, 5 );
+
+    m_staticText712 = new wxStaticText( m_panel16, wxID_ANY, _( "Day(s)" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText712->Wrap( -1 );
+    fgSizer91->Add( m_staticText712, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_Days = new wxTextCtrl( m_panel16, wxID_ANY, _( "Day(s)" ), wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    fgSizer91->Add( m_Days, 0, wxALL, 0 );
+
+    m_staticText72 = new wxStaticText( m_panel16, wxID_ANY, _( "Week(s)" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText72->Wrap( -1 );
+    fgSizer91->Add( m_staticText72, 0, wxALL, 5 );
+
+    m_Weeks = new wxTextCtrl( m_panel16, wxID_ANY, _( "Week(s)" ), wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    fgSizer91->Add( m_Weeks, 0, wxALL, 0 );
+
+    m_staticText73 = new wxStaticText( m_panel16, wxID_ANY, _( "Month " ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText73->Wrap( -1 );
+    fgSizer91->Add( m_staticText73, 0, wxALL, 5 );
+
+    m_textMonth = new wxTextCtrl( m_panel16, wxID_ANY, _( "Month" ), wxDefaultPosition, wxSize( 60,-1 ), 0 );
+    fgSizer91->Add( m_textMonth, 0, wxALL, 0 );
+
+    fgSizer30->Add( fgSizer91, 1, wxEXPAND, 5 );
+
+    m_staticline251 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer30->Add( m_staticline251, 0, wxEXPAND | wxALL, 5 );
+
+    m_staticText75 = new wxStaticText( m_panel16, wxID_ANY, _( "If GPS off use for manual entry" ), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticText75->Wrap( -1 );
+    fgSizer30->Add( m_staticText75, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline26 = new wxStaticLine( m_panel16, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    fgSizer30->Add( m_staticline26, 0, wxEXPAND | wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer32;
+    fgSizer32 = new wxFlexGridSizer( 2, 4, 0, 0 );
+    fgSizer32->SetFlexibleDirection( wxBOTH );
+    fgSizer32->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText51 = new wxStaticText( m_panel16, wxID_ANY, _( "Windspeed " ), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticText51->Wrap( -1 );
+    fgSizer32->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxString m_choiceWindChoices[] = { _( "kts" ), _( "m/s" ), _( "km/h" ) };
+    int m_choiceWindNChoices = sizeof( m_choiceWindChoices ) / sizeof( wxString );
 #ifdef __WXOSX__
     m_choiceWind = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxSize( 80,-1 ), m_choiceWindNChoices, m_choiceWindChoices, 0 );
 #else
-	m_choiceWind = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), m_choiceWindNChoices, m_choiceWindChoices, 0 );
+    m_choiceWind = new wxChoice( m_panel16, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), m_choiceWindNChoices, m_choiceWindChoices, 0 );
 #endif
-	m_choiceWind->SetSelection( 0 );
-	fgSizer32->Add( m_choiceWind, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText45 = new wxStaticText( m_panel16, wxID_ANY, _(" Direction "), wxPoint( -1,-1 ), wxSize( -1,-1 ), wxALIGN_RIGHT );
-	m_staticText45->Wrap( -1 );
-	fgSizer32->Add( m_staticText45, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxString m_choiceDirChoices[] = { _("True"), _("Relative") };
-	int m_choiceDirNChoices = sizeof( m_choiceDirChoices ) / sizeof( wxString );
+    m_choiceWind->SetSelection( 0 );
+    fgSizer32->Add( m_choiceWind, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText45 = new wxStaticText( m_panel16, wxID_ANY, _( " Direction " ), wxPoint( -1,-1 ), wxSize( -1,-1 ), wxALIGN_RIGHT );
+    m_staticText45->Wrap( -1 );
+    fgSizer32->Add( m_staticText45, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxString m_choiceDirChoices[] = { _( "True" ), _( "Relative" ) };
+    int m_choiceDirNChoices = sizeof( m_choiceDirChoices ) / sizeof( wxString );
 #ifdef __WXOSX__
     m_choiceDir = new wxChoice( m_panel16, wxID_ANY, wxPoint( -1,-1 ), wxSize( 80,-1 ), m_choiceDirNChoices, m_choiceDirChoices, 0 );
 #else
-	m_choiceDir = new wxChoice( m_panel16, wxID_ANY, wxPoint( -1,-1 ), wxSize( 65,-1 ), m_choiceDirNChoices, m_choiceDirChoices, 0 );
+    m_choiceDir = new wxChoice( m_panel16, wxID_ANY, wxPoint( -1,-1 ), wxSize( 65,-1 ), m_choiceDirNChoices, m_choiceDirChoices, 0 );
 #endif
-	m_choiceDir->SetSelection( 1 );
-	fgSizer32->Add( m_choiceDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	fgSizer30->Add( fgSizer32, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panel16->SetSizer( fgSizer30 );
-	m_panel16->Layout();
-	fgSizer30->Fit( m_panel16 );
-	m_notebook4->AddPage( m_panel16, _("Abbreviations"), false );
-	m_panel17 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer322;
+    m_choiceDir->SetSelection( 1 );
+    fgSizer32->Add( m_choiceDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    fgSizer30->Add( fgSizer32, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panel16->SetSizer( fgSizer30 );
+    m_panel16->Layout();
+    fgSizer30->Fit( m_panel16 );
+    m_notebook4->AddPage( m_panel16, _( "Abbreviations" ), false );
+    m_panel17 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxFlexGridSizer* fgSizer322;
 #ifdef __WXOSX__
     fgSizer322 = new wxFlexGridSizer( 5, 1, 0, 0 );
 #else
-	fgSizer322 = new wxFlexGridSizer( 2, 1, 0, 0 );
+    fgSizer322 = new wxFlexGridSizer( 2, 1, 0, 0 );
 #endif
-	fgSizer322->SetFlexibleDirection( wxBOTH );
-	fgSizer322->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    fgSizer322->SetFlexibleDirection( wxBOTH );
+    fgSizer322->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxFlexGridSizer* fgSizer321;
+
+    fgSizer321 = new wxFlexGridSizer( 5, 3, 0, 0 );
+    fgSizer321->SetFlexibleDirection( wxBOTH );
+    fgSizer321->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    fgSizer321->Add( 0, 40, 1, wxEXPAND, 5 );
+    fgSizer321->Add( 0, 0, 1, wxEXPAND, 5 );
+    fgSizer321->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText761 = new wxStaticText( m_panel17, wxID_ANY, _( "Path to ODT-Editor" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText761->Wrap( -1 );
+    fgSizer321->Add( m_staticText761, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	wxFlexGridSizer* fgSizer321;
+    m_textCtrlODTEditor = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,-1 ), 0 );
+    m_textCtrlODTEditor->SetToolTip( _( "to use MS-Word, append %s like this:\n\"C:\\yourPathToWinword\\WINWORD.EXE\" %s" ) );
+
+    fgSizer321->Add( m_textCtrlODTEditor, 0, wxALL|wxEXPAND, 5 );
+
+    m_bpButtonODT = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    fgSizer321->Add( m_bpButtonODT, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_staticText77 = new wxStaticText( m_panel17, wxID_ANY, _( "Path to Datamanager" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText77->Wrap( -1 );
+    fgSizer321->Add( m_staticText77, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-	fgSizer321 = new wxFlexGridSizer( 5, 3, 0, 0 );
-	fgSizer321->SetFlexibleDirection( wxBOTH );
-	fgSizer321->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	fgSizer321->Add( 0, 40, 1, wxEXPAND, 5 );
-	fgSizer321->Add( 0, 0, 1, wxEXPAND, 5 );
-	fgSizer321->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText761 = new wxStaticText( m_panel17, wxID_ANY, _("Path to ODT-Editor"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText761->Wrap( -1 );
-	fgSizer321->Add( m_staticText761, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlODTEditor = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,-1 ), 0 );
-	m_textCtrlODTEditor->SetToolTip( _("to use MS-Word, append %s like this:\n\"C:\\yourPathToWinword\\WINWORD.EXE\" %s") );
-
-	fgSizer321->Add( m_textCtrlODTEditor, 0, wxALL|wxEXPAND, 5 );
-	
-	m_bpButtonODT = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	fgSizer321->Add( m_bpButtonODT, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_staticText77 = new wxStaticText( m_panel17, wxID_ANY, _("Path to Datamanager"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText77->Wrap( -1 );
-	fgSizer321->Add( m_staticText77, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-    
 #ifdef __WXOSX__
     m_textCtrlDataManager = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,-1 ), 0 );
 #else
-	m_textCtrlDataManager = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_textCtrlDataManager = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 #endif
-	fgSizer321->Add( m_textCtrlDataManager, 0, wxALL|wxEXPAND, 5 );
-	
-	m_bpButtonDatamanager = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	fgSizer321->Add( m_bpButtonDatamanager, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_staticText78 = new wxStaticText( m_panel17, wxID_ANY, _("Path to MailClient"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText78->Wrap( -1 );
-	fgSizer321->Add( m_staticText78, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
+    fgSizer321->Add( m_textCtrlDataManager, 0, wxALL|wxEXPAND, 5 );
+
+    m_bpButtonDatamanager = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    fgSizer321->Add( m_bpButtonDatamanager, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_staticText78 = new wxStaticText( m_panel17, wxID_ANY, _( "Path to MailClient" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText78->Wrap( -1 );
+    fgSizer321->Add( m_staticText78, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
 #ifdef __WXOSX__
     m_textCtrlMailClient = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,-1 ), 0 );
 #else
-	m_textCtrlMailClient = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_textCtrlMailClient = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 );
 #endif
-	fgSizer321->Add( m_textCtrlMailClient, 0, wxALL|wxEXPAND, 5 );
-	
-	m_bpButtonMail = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	fgSizer321->Add( m_bpButtonMail, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	m_staticText79 = new wxStaticText( m_panel17, wxID_ANY, _("Path to HTML-Editor\n(optional)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText79->Wrap( -1 );
-	fgSizer321->Add( m_staticText79, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlHTMLEditorPath = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,-1 ), 0 );
-	fgSizer321->Add( m_textCtrlHTMLEditorPath, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonHTMLEditor = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
-	fgSizer321->Add( m_bpButtonHTMLEditor, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
-	
-	fgSizer322->Add( fgSizer321, 1, wxEXPAND, 5 );
-	
-	m_buttonResetPath = new wxButton( m_panel17, wxID_ANY, _("Reset Paths"), wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer322->Add( m_buttonResetPath, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panel17->SetSizer( fgSizer322 );
-	m_panel17->Layout();
-	fgSizer322->Fit( m_panel17 );
-	m_notebook4->AddPage( m_panel17, _("Paths"), false );
+    fgSizer321->Add( m_textCtrlMailClient, 0, wxALL|wxEXPAND, 5 );
+
+    m_bpButtonMail = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    fgSizer321->Add( m_bpButtonMail, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    m_staticText79 = new wxStaticText( m_panel17, wxID_ANY, _( "Path to HTML-Editor\n(optional)" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText79->Wrap( -1 );
+    fgSizer321->Add( m_staticText79, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlHTMLEditorPath = new wxTextCtrl( m_panel17, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,-1 ), 0 );
+    fgSizer321->Add( m_textCtrlHTMLEditorPath, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonHTMLEditor = new wxBitmapButton( m_panel17, wxID_ANY, wxBitmap( folder ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
+    fgSizer321->Add( m_bpButtonHTMLEditor, 0, wxALL|wxALIGN_CENTER_VERTICAL, 0 );
+
+    fgSizer322->Add( fgSizer321, 1, wxEXPAND, 5 );
+
+    m_buttonResetPath = new wxButton( m_panel17, wxID_ANY, _( "Reset Paths" ), wxDefaultPosition, wxDefaultSize, 0 );
+    fgSizer322->Add( m_buttonResetPath, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panel17->SetSizer( fgSizer322 );
+    m_panel17->Layout();
+    fgSizer322->Fit( m_panel17 );
+    m_notebook4->AddPage( m_panel17, _( "Paths" ), false );
 
     m_panel24 = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     wxBoxSizer* bSizer42;
     bSizer42 = new wxBoxSizer( wxVERTICAL );
 
     m_notebook7 = new wxNotebook( m_panel24, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_notebook7->SetBackgroundColour( wxColour(255,255,255) );
+    m_notebook7->SetBackgroundColour( wxColour( 255,255,255 ) );
 
     m_panel27 = new wxPanel( m_notebook7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     wxBoxSizer* bSizer431;
@@ -1012,8 +988,8 @@
 
 
     fgSizer431->Add( 0, 0, 1, wxEXPAND, 5 );
-    
-    m_staticText1381 = new wxStaticText( m_panel27, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_staticText1381 = new wxStaticText( m_panel27, wxID_ANY, _( "Show" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText1381->Wrap( -1 );
     fgSizer431->Add( m_staticText1381, 0, wxALL, 5 );
 
@@ -1022,33 +998,33 @@
     fgSizer47->SetFlexibleDirection( wxBOTH );
     fgSizer47->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_checkBoxKMLRoute = new wxCheckBox( m_panel27, wxID_ANY, _("Route"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxKMLRoute->SetValue(true);
+    m_checkBoxKMLRoute = new wxCheckBox( m_panel27, wxID_ANY, _( "Route" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxKMLRoute->SetValue( true );
     fgSizer47->Add( m_checkBoxKMLRoute, 0, wxALL, 5 );
 
-    m_checkBoxKMLTrack = new wxCheckBox( m_panel27, wxID_ANY, _("Track"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxKMLTrack->SetValue(true);
+    m_checkBoxKMLTrack = new wxCheckBox( m_panel27, wxID_ANY, _( "Track" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxKMLTrack->SetValue( true );
     fgSizer47->Add( m_checkBoxKMLTrack, 0, wxALL, 5 );
 
     fgSizer431->Add( fgSizer47, 1, wxEXPAND, 5 );
 
     fgSizer431->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticText1281 = new wxStaticText( m_panel27, wxID_ANY, _("Set Linewidth to"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1281 = new wxStaticText( m_panel27, wxID_ANY, _( "Set Linewidth to" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText1281->Wrap( -1 );
     fgSizer431->Add( m_staticText1281, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    m_textCtrlKMLLineWidt = new wxTextCtrl( m_panel27, wxID_ANY, _("4"), wxDefaultPosition, wxSize( 40,-1 ), 0 );
+    m_textCtrlKMLLineWidt = new wxTextCtrl( m_panel27, wxID_ANY, _( "4" ), wxDefaultPosition, wxSize( 40,-1 ), 0 );
     fgSizer431->Add( m_textCtrlKMLLineWidt, 0, wxALL, 5 );
 
 
     fgSizer431->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticText131 = new wxStaticText( m_panel27, wxID_ANY, _("Set Transparency to"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText131 = new wxStaticText( m_panel27, wxID_ANY, _( "Set Transparency to" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText131->Wrap( -1 );
     fgSizer431->Add( m_staticText131, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxString m_choiceKMLLineTranparencyChoices[] = { _("transparent"), _("solid") };
+    wxString m_choiceKMLLineTranparencyChoices[] = { _( "transparent" ), _( "solid" ) };
     int m_choiceKMLLineTranparencyNChoices = sizeof( m_choiceKMLLineTranparencyChoices ) / sizeof( wxString );
     m_choiceKMLLineTranparency = new wxChoice( m_panel27, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceKMLLineTranparencyNChoices, m_choiceKMLLineTranparencyChoices, 0 );
     m_choiceKMLLineTranparency->SetSelection( 0 );
@@ -1057,11 +1033,11 @@
 
     fgSizer431->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticText129 = new wxStaticText( m_panel27, wxID_ANY, _("Set Route-Linecolor to"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText129 = new wxStaticText( m_panel27, wxID_ANY, _( "Set Route-Linecolor to" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText129->Wrap( -1 );
     fgSizer431->Add( m_staticText129, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxString m_choiceKMLRouteLineColoChoices[] = { _("white"), _("black"), _("red"), _("yellow") };
+    wxString m_choiceKMLRouteLineColoChoices[] = { _( "white" ), _( "black" ), _( "red" ), _( "yellow" ) };
     int m_choiceKMLRouteLineColoNChoices = sizeof( m_choiceKMLRouteLineColoChoices ) / sizeof( wxString );
     m_choiceKMLRouteLineColo = new wxChoice( m_panel27, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceKMLRouteLineColoNChoices, m_choiceKMLRouteLineColoChoices, 0 );
     m_choiceKMLRouteLineColo->SetSelection( 0 );
@@ -1070,11 +1046,11 @@
 
     fgSizer431->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_staticText1291 = new wxStaticText( m_panel27, wxID_ANY, _("Set Track-Linecolor to"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1291 = new wxStaticText( m_panel27, wxID_ANY, _( "Set Track-Linecolor to" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_staticText1291->Wrap( -1 );
     fgSizer431->Add( m_staticText1291, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxString m_choiceKMLTrackLineColorChoices[] = { _("white"), _("black"), _("red"), _("yellow") };
+    wxString m_choiceKMLTrackLineColorChoices[] = { _( "white" ), _( "black" ), _( "red" ), _( "yellow" ) };
     int m_choiceKMLTrackLineColorNChoices = sizeof( m_choiceKMLTrackLineColorChoices ) / sizeof( wxString );
     m_choiceKMLTrackLineColor = new wxChoice( m_panel27, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceKMLTrackLineColorNChoices, m_choiceKMLTrackLineColorChoices, 0 );
     m_choiceKMLTrackLineColor->SetSelection( 3 );
@@ -1085,7 +1061,7 @@
     m_panel27->SetSizer( bSizer431 );
     m_panel27->Layout();
     bSizer431->Fit( m_panel27 );
-    m_notebook7->AddPage( m_panel27, _("KML"), true );
+    m_notebook7->AddPage( m_panel27, _( "KML" ), true );
     m_panel28 = new wxPanel( m_notebook7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     wxFlexGridSizer* fgSizer48;
     fgSizer48 = new wxFlexGridSizer( 0, 2, 0, 0 );
@@ -1095,7 +1071,7 @@
 
     fgSizer48->Add( 100, 50, 1, wxEXPAND, 5 );
 
-    m_staticTextUseRPM = new wxStaticText( m_panel28, wxID_ANY, _("Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUseRPM = new wxStaticText( m_panel28, wxID_ANY, _( "Check one of the below checkboxes, if you want use ERRPM-Sentence (see help)" ), wxDefaultPosition, wxDefaultSize, 0 );
     fgSizer48->Add( m_staticTextUseRPM, 0, wxALL|wxALIGN_BOTTOM, 5 );
 
 
@@ -1113,18 +1089,18 @@
     m_staticTextRPMSentence->Wrap( -1 );
     m_staticTextRPMSentence->Enable( false );
     fgSizer511->Add( m_staticTextRPMSentence, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
- 	
-    m_toggleBtnRPMCheck = new wxToggleButton( m_panel28, wxID_ANY, _("Check"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_toggleBtnRPMCheck = new wxToggleButton( m_panel28, wxID_ANY, _( "Check" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_toggleBtnRPMCheck->Enable( false );
-    m_toggleBtnRPMCheck->SetToolTip( _("Start your engine(s) and hit the button.\nYou should see the ERRPM-Sentence\nleft to the button") );
+    m_toggleBtnRPMCheck->SetToolTip( _( "Start your engine(s) and hit the button.\nYou should see the ERRPM-Sentence\nleft to the button" ) );
 
     fgSizer511->Add( m_toggleBtnRPMCheck, 0, wxALL, 5 );
 
     fgSizer511->Add( 0, 0, 1, wxEXPAND, 5 );
- 	
-    m_checkBoxEng1RPM = new wxCheckBox( m_panel28, wxID_ANY, _("Engine-No. corresponds with column Engine #1"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_checkBoxEng1RPM = new wxCheckBox( m_panel28, wxID_ANY, _( "Engine-No. corresponds with column Engine #1" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_checkBoxEng1RPM->Enable( true );
-    m_checkBoxEng1RPM->SetToolTip( _("Check this box if the NMEA stream contains RPM messages for this engine\n") );
+    m_checkBoxEng1RPM->SetToolTip( _( "Check this box if the NMEA stream contains RPM messages for this engine\n" ) );
 
     fgSizer511->Add( m_checkBoxEng1RPM, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
@@ -1135,9 +1111,9 @@
 
     fgSizer511->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_checkBoxEng2RPM = new wxCheckBox( m_panel28, wxID_ANY, _("Engine-No. corresponds with column Engine #2"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxEng2RPM = new wxCheckBox( m_panel28, wxID_ANY, _( "Engine-No. corresponds with column Engine #2" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_checkBoxEng2RPM->Enable( true );
-    m_checkBoxEng2RPM->SetToolTip( _("Check this box if the NMEA stream contains RPM messages for this engine\n") );
+    m_checkBoxEng2RPM->SetToolTip( _( "Check this box if the NMEA stream contains RPM messages for this engine\n" ) );
 
     fgSizer511->Add( m_checkBoxEng2RPM, 0, wxALL, 5 );
 
@@ -1149,22 +1125,22 @@
 
     fgSizer511->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_checkBoxGenRPM = new wxCheckBox( m_panel28, wxID_ANY, _("Engine-No. corresponds with column Generator"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxGenRPM = new wxCheckBox( m_panel28, wxID_ANY, _( "Engine-No. corresponds with column Generator" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_checkBoxGenRPM->Enable( true );
-    m_checkBoxGenRPM->SetToolTip( _("Check this box if the NMEA stream contains RPM messages for this generator\n") );
-    
+    m_checkBoxGenRPM->SetToolTip( _( "Check this box if the NMEA stream contains RPM messages for this generator\n" ) );
+
     fgSizer511->Add( m_checkBoxGenRPM, 0, wxALL, 5 );
-    
+
     m_textCtrlGenerator = new wxTextCtrl( m_panel28, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 40,-1 ), 0 );
     m_textCtrlGenerator->Enable( false );
-    
+
     fgSizer511->Add( m_textCtrlGenerator, 0, wxALL, 5 );
-    
-    
+
+
     fgSizer511->Add( 0, 0, 1, wxEXPAND, 5 );
-    
 
-    m_checkBoxNMEAUseRPM = new wxCheckBox( m_panel28, wxID_ANY, _("Use ERRPM-Sentence to calculate the engine-hours"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_checkBoxNMEAUseRPM = new wxCheckBox( m_panel28, wxID_ANY, _( "Use ERRPM-Sentence to calculate the engine-hours" ), wxDefaultPosition, wxDefaultSize, 0 );
     m_checkBoxNMEAUseRPM->Enable( false );
 
     fgSizer511->Add( m_checkBoxNMEAUseRPM, 0, wxALL, 5 );
@@ -1173,15 +1149,15 @@
 
     fgSizer48->Add( 0, 0, 1, wxEXPAND, 5 );
 
-    m_checkBoxNMEAUseWIMDA = new wxCheckBox( m_panel28, wxID_ANY, _("Use WIMDA-Sentence from the weatherstation"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxNMEAUseWIMDA->SetToolTip( _("For Barometer, Air Temperature and rel. Humidity") );
+    m_checkBoxNMEAUseWIMDA = new wxCheckBox( m_panel28, wxID_ANY, _( "Use WIMDA-Sentence from the weatherstation" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxNMEAUseWIMDA->SetToolTip( _( "For Barometer, Air Temperature and rel. Humidity" ) );
 
     fgSizer48->Add( m_checkBoxNMEAUseWIMDA, 0, wxALL, 5 );
 
     m_panel28->SetSizer( fgSizer48 );
     m_panel28->Layout();
     fgSizer48->Fit( m_panel28 );
-    m_notebook7->AddPage( m_panel28, _("NMEA"), true );
+    m_notebook7->AddPage( m_panel28, _( "NMEA" ), true );
 
     m_panelSails = new wxPanel( m_notebook7, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
     wxBoxSizer* bSizer46;
@@ -1194,12 +1170,12 @@
 
     bSizer461->Add( 0, 20, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonToSailsSpace = new wxButton( m_panelSailNames, wxID_ANY, _("Checkbox Space  >>"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonToSailsSpace->SetToolTip( _("Usefull for Tablet-PC's") );
+    m_buttonToSailsSpace = new wxButton( m_panelSailNames, wxID_ANY, _( "Checkbox Space  >>" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonToSailsSpace->SetToolTip( _( "Usefull for Tablet-PC's" ) );
 
     bSizer461->Add( m_buttonToSailsSpace, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_staticText1351 = new wxStaticText( m_panelSailNames, wxID_ANY, _("Abbreviations are shown in the Sails-Checkboxes\nThe Name is used for the column \"Sails\" when added a new entry"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    m_staticText1351 = new wxStaticText( m_panelSailNames, wxID_ANY, _( "Abbreviations are shown in the Sails-Checkboxes\nThe Name is used for the column \"Sails\" when added a new entry" ), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
     m_staticText1351->Wrap( -1 );
     bSizer461->Add( m_staticText1351, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 
@@ -1218,8 +1194,8 @@
     m_gridSailNames->EnableDragColMove( false );
     m_gridSailNames->EnableDragColSize( true );
     m_gridSailNames->SetColLabelSize( 30 );
-    m_gridSailNames->SetColLabelValue( 0, _("Abbreviations") );
-    m_gridSailNames->SetColLabelValue( 1, _("Name") );
+    m_gridSailNames->SetColLabelValue( 0, _( "Abbreviations" ) );
+    m_gridSailNames->SetColLabelValue( 1, _( "Name" ) );
     m_gridSailNames->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
 
     // Rows
@@ -1246,8 +1222,8 @@
 
     bSizer47->Add( 0, 20, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    m_buttonBackToSails = new wxButton( m_panelSailsCheckbox, wxID_ANY, _("<<  Back"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonBackToSails->SetToolTip( _("Back to Sailnames") );
+    m_buttonBackToSails = new wxButton( m_panelSailsCheckbox, wxID_ANY, _( "<<  Back" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonBackToSails->SetToolTip( _( "Back to Sailnames" ) );
 
     bSizer47->Add( 0, 20, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
     bSizer47->Add( m_buttonBackToSails, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
@@ -1263,19 +1239,19 @@
     fgSizer49->SetFlexibleDirection( wxBOTH );
     fgSizer49->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
-    m_buttonSpaceRPlus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _("Row +"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSpaceRPlus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _( "Row +" ), wxDefaultPosition, wxDefaultSize, 0 );
     fgSizer49->Add( m_buttonSpaceRPlus, 0, wxALL, 5 );
 
-    m_buttonSpaceRMinus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _("Row -"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSpaceRMinus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _( "Row -" ), wxDefaultPosition, wxDefaultSize, 0 );
     fgSizer49->Add( m_buttonSpaceRMinus, 0, wxALL, 5 );
 
-    m_buttonSpaceCPlus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _("Column +"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSpaceCPlus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _( "Column +" ), wxDefaultPosition, wxDefaultSize, 0 );
     fgSizer49->Add( m_buttonSpaceCPlus, 0, wxALL, 5 );
 
-    m_buttonSpaceCMinus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _("Column -"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSpaceCMinus = new wxButton( m_panelSailsCheckbox, wxID_ANY, _( "Column -" ), wxDefaultPosition, wxDefaultSize, 0 );
     fgSizer49->Add( m_buttonSpaceCMinus, 0, wxALL, 5 );
 
-    m_buttonSpaceReset = new wxButton( m_panelSailsCheckbox, wxID_ANY, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSpaceReset = new wxButton( m_panelSailsCheckbox, wxID_ANY, _( "Reset" ), wxDefaultPosition, wxDefaultSize, 0 );
     fgSizer49->Add( m_buttonSpaceReset, 0, wxALL, 5 );
 
     bSizer47->Add( 0, 20, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
@@ -1289,7 +1265,7 @@
     m_panelSails->SetSizer( bSizer46 );
     m_panelSails->Layout();
     bSizer46->Fit( m_panelSails );
-    m_notebook7->AddPage( m_panelSails, _("Sails"), false );
+    m_notebook7->AddPage( m_panelSails, _( "Sails" ), false );
 
 
     bSizer42->Add( m_notebook7, 1, wxEXPAND | wxALL, 5 );
@@ -1297,62 +1273,62 @@
     m_panel24->SetSizer( bSizer42 );
     m_panel24->Layout();
     bSizer42->Fit( m_panel24 );
-    m_notebook4->AddPage( m_panel24, _("Miscellaneous"), false );
+    m_notebook4->AddPage( m_panel24, _( "Miscellaneous" ), false );
+
+    bSizer29->Add( m_notebook4, 1, wxEXPAND | wxALL, 5 );
 
-	bSizer29->Add( m_notebook4, 1, wxEXPAND | wxALL, 5 );
-	
-	m_sdbSizer1 = new wxStdDialogButtonSizer();
-	m_sdbSizer1OK = new wxButton( m_scrolledWindow1, wxID_OK );
-	m_sdbSizer1->AddButton( m_sdbSizer1OK );
-	m_sdbSizer1Cancel = new wxButton( m_scrolledWindow1, wxID_CANCEL );
-	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
-	m_sdbSizer1->Realize();
-
-	bSizer29->Add( m_sdbSizer1, 0, wxALIGN_CENTER, 5 );
-	m_scrolledWindow1->SetSizer( bSizer29 );
-	m_scrolledWindow1->Layout();
-	bSizer29->Fit( m_scrolledWindow1 );
-	bSizer21->Add( m_scrolledWindow1, 1, wxEXPAND | wxALL, 5 );
-
-	this->SetSizer( bSizer21 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-
-	SetSize(wxSize(w, h));
-
-	// Connect Events
-	m_choicePositionFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::onChoicePositionFormat ), NULL, this );
-	m_checkBoxToolTips->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoxToolTips ), NULL, this );
-	m_checkBoxNoGPS->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoNoGPS ), NULL, this );
-	m_radioBtnUTC->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnUTC ), NULL, this );
-	m_radioBtnLocal->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnLocal ), NULL, this );
-	m_radioBtnGPSAuto->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnGPSAuto ), NULL, this );
-	m_bpButtonODT->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickODT ), NULL, this );
-	m_bpButtonDatamanager->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickDataManager ), NULL, this );
-	m_bpButtonMail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickMail ), NULL, this );
-	m_buttonInstallHTMLFiles->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickInstallHTMLFiles ), NULL, this );
-	m_bpButtonHTMLEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonHTMLEditor ), NULL, this );
-	m_sKnots->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKnots ), NULL, this );
-	m_sMeterSec->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sMeterSec ), NULL, this );
-	m_sKmh->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKmh ), NULL, this );
-	m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonOKClick ), NULL, this );
-	m_buttonUninstall->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonClickUninstall ), NULL, this );
-	m_buttonResetPath->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonResetPaths ), NULL, this );
-	m_sLiter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::onTextm_sLiter ), NULL, this );
-	m_textCtrlWatermaker->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterm_textCtrlWatermaker ), NULL, this );
-	m_textCtrlBank1->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterBank1 ), NULL, this );
-	m_textCtrlBank2->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterBank2 ), NULL, this );
-	m_textCtrlTankFuel->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterFuelTank ), NULL, this );
-	m_textCtrlTankWater->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterWaterTank ), NULL, this );
-	m_choiceTimeFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceTimeFormat ), NULL, this );
-	m_checkBoxNoSeconds->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckboxNoSeconds ), NULL, this );
-	m_choiceDate1->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate1 ), NULL, this );
-	m_choiceDate2->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate2 ), NULL, this );
-	m_choiceDate3->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate3 ), NULL, this );
-	m_choiceDateFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDateFormat ), NULL, this );
-	m_textCtrlDateSeparator->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextDateSeparator ), NULL, this );
-	m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnCancel ), NULL, this );
+    m_sdbSizer1 = new wxStdDialogButtonSizer();
+    m_sdbSizer1OK = new wxButton( m_scrolledWindow1, wxID_OK );
+    m_sdbSizer1->AddButton( m_sdbSizer1OK );
+    m_sdbSizer1Cancel = new wxButton( m_scrolledWindow1, wxID_CANCEL );
+    m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
+    m_sdbSizer1->Realize();
+
+    bSizer29->Add( m_sdbSizer1, 0, wxALIGN_CENTER, 5 );
+    m_scrolledWindow1->SetSizer( bSizer29 );
+    m_scrolledWindow1->Layout();
+    bSizer29->Fit( m_scrolledWindow1 );
+    bSizer21->Add( m_scrolledWindow1, 1, wxEXPAND | wxALL, 5 );
+
+    this->SetSizer( bSizer21 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    SetSize( wxSize( w, h ) );
+
+    // Connect Events
+    m_choicePositionFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::onChoicePositionFormat ), NULL, this );
+    m_checkBoxToolTips->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoxToolTips ), NULL, this );
+    m_checkBoxNoGPS->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoNoGPS ), NULL, this );
+    m_radioBtnUTC->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnUTC ), NULL, this );
+    m_radioBtnLocal->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnLocal ), NULL, this );
+    m_radioBtnGPSAuto->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnGPSAuto ), NULL, this );
+    m_bpButtonODT->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickODT ), NULL, this );
+    m_bpButtonDatamanager->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickDataManager ), NULL, this );
+    m_bpButtonMail->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickMail ), NULL, this );
+    m_buttonInstallHTMLFiles->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickInstallHTMLFiles ), NULL, this );
+    m_bpButtonHTMLEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonHTMLEditor ), NULL, this );
+    m_sKnots->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKnots ), NULL, this );
+    m_sMeterSec->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sMeterSec ), NULL, this );
+    m_sKmh->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKmh ), NULL, this );
+    m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonOKClick ), NULL, this );
+    m_buttonUninstall->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonClickUninstall ), NULL, this );
+    m_buttonResetPath->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonResetPaths ), NULL, this );
+    m_sLiter->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::onTextm_sLiter ), NULL, this );
+    m_textCtrlWatermaker->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterm_textCtrlWatermaker ), NULL, this );
+    m_textCtrlBank1->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterBank1 ), NULL, this );
+    m_textCtrlBank2->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterBank2 ), NULL, this );
+    m_textCtrlTankFuel->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterFuelTank ), NULL, this );
+    m_textCtrlTankWater->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterWaterTank ), NULL, this );
+    m_choiceTimeFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceTimeFormat ), NULL, this );
+    m_checkBoxNoSeconds->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckboxNoSeconds ), NULL, this );
+    m_choiceDate1->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate1 ), NULL, this );
+    m_choiceDate2->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate2 ), NULL, this );
+    m_choiceDate3->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate3 ), NULL, this );
+    m_choiceDateFormat->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDateFormat ), NULL, this );
+    m_textCtrlDateSeparator->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextDateSeparator ), NULL, this );
+    m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnCancel ), NULL, this );
     m_choiceNoEngines->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceNoEngines ), NULL, this );
     m_toggleBtnRPMCheck->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnToggleButtonRPMCheck ), NULL, this );
     m_checkBoxEng1RPM->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxEng1RPM ), NULL, this );
@@ -1368,56 +1344,57 @@
     m_checkBoxEngine->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxEngineMessage ), NULL, this );
     m_checkBoxEngineRunning->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxEngineRunning ), NULL, this );
     m_checkBoxGenerator->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxGeneratorMessage ), NULL, this );
-	m_textCtrlEngine1->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng1IdEntry ), NULL, this );
-	m_textCtrlEngine2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng2IdEntry ), NULL, this );
-	m_textCtrlGenerator->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextGenIdEntry ), NULL, this );
+    m_checkBoxOverview->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxOverview ), NULL, this );
+    m_textCtrlEngine1->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng1IdEntry ), NULL, this );
+    m_textCtrlEngine2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng2IdEntry ), NULL, this );
+    m_textCtrlGenerator->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextGenIdEntry ), NULL, this );
 
 
 
     this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( LogbookOptions::OnClose ) );
 
-	init();
+    init();
 }
 
 LogbookOptions::~LogbookOptions()
 {
-	if(opt->checkStateOfEvents())
-		log_pi->state = log_pi->ONWITHEVENTS;
-	else
-		log_pi->state = log_pi->ONNOEVENTS;
-
-	// Disconnect Events
-	m_choicePositionFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::onChoicePositionFormat ), NULL, this );
-	m_checkBoxToolTips->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoxToolTips ), NULL, this );
-	m_checkBoxNoGPS->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoNoGPS ), NULL, this );
-	m_radioBtnUTC->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnUTC ), NULL, this );
-	m_radioBtnLocal->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnLocal ), NULL, this );
-	m_radioBtnGPSAuto->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnGPSAuto ), NULL, this );
-	m_bpButtonODT->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickODT ), NULL, this );
-	m_bpButtonDatamanager->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickDataManager ), NULL, this );
-	m_bpButtonMail->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickMail ), NULL, this );
-	m_buttonInstallHTMLFiles->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickInstallHTMLFiles ), NULL, this );
-	m_bpButtonHTMLEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonHTMLEditor ), NULL, this );
-	m_sKnots->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKnots ), NULL, this );
-	m_sMeterSec->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sMeterSec ), NULL, this );
-	m_sKmh->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKmh ), NULL, this );
-	m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonOKClick ), NULL, this );
-	m_buttonUninstall->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonClickUninstall ), NULL, this );
-	m_buttonResetPath->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonResetPaths ), NULL, this );
-	m_sLiter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::onTextm_sLiter ), NULL, this );
-	m_textCtrlWatermaker->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterm_textCtrlWatermaker ), NULL, this );
-	m_textCtrlBank1->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterBank1 ), NULL, this );
-	m_textCtrlBank2->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterBank2 ), NULL, this );
-	m_textCtrlTankFuel->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterFuelTank ), NULL, this );
-	m_textCtrlTankWater->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterWaterTank ), NULL, this );
-	m_choiceTimeFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceTimeFormat ), NULL, this );
-	m_checkBoxNoSeconds->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckboxNoSeconds ), NULL, this );
-	m_choiceDate1->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate1 ), NULL, this );
-	m_choiceDate2->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate2 ), NULL, this );
-	m_choiceDate3->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate3 ), NULL, this );
-	m_choiceDateFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDateFormat ), NULL, this );
-	m_textCtrlDateSeparator->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextDateSeparator ), NULL, this );
-	m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnCancel ), NULL, this );
+    if ( opt->checkStateOfEvents() )
+        log_pi->state = log_pi->ONWITHEVENTS;
+    else
+        log_pi->state = log_pi->ONNOEVENTS;
+
+    // Disconnect Events
+    m_choicePositionFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::onChoicePositionFormat ), NULL, this );
+    m_checkBoxToolTips->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoxToolTips ), NULL, this );
+    m_checkBoxNoGPS->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::onCheckBoNoGPS ), NULL, this );
+    m_radioBtnUTC->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnUTC ), NULL, this );
+    m_radioBtnLocal->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnLocal ), NULL, this );
+    m_radioBtnGPSAuto->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( LogbookOptions::onRadioBtnGPSAuto ), NULL, this );
+    m_bpButtonODT->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickODT ), NULL, this );
+    m_bpButtonDatamanager->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickDataManager ), NULL, this );
+    m_bpButtonMail->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickMail ), NULL, this );
+    m_buttonInstallHTMLFiles->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonClickInstallHTMLFiles ), NULL, this );
+    m_bpButtonHTMLEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::onButtonHTMLEditor ), NULL, this );
+    m_sKnots->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKnots ), NULL, this );
+    m_sMeterSec->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sMeterSec ), NULL, this );
+    m_sKmh->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterm_sKmh ), NULL, this );
+    m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonOKClick ), NULL, this );
+    m_buttonUninstall->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonClickUninstall ), NULL, this );
+    m_buttonResetPath->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnButtonResetPaths ), NULL, this );
+    m_sLiter->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::onTextm_sLiter ), NULL, this );
+    m_textCtrlWatermaker->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterm_textCtrlWatermaker ), NULL, this );
+    m_textCtrlBank1->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterBank1 ), NULL, this );
+    m_textCtrlBank2->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::onTextEnterBank2 ), NULL, this );
+    m_textCtrlTankFuel->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterFuelTank ), NULL, this );
+    m_textCtrlTankWater->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( LogbookOptions::OnTextEnterWaterTank ), NULL, this );
+    m_choiceTimeFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceTimeFormat ), NULL, this );
+    m_checkBoxNoSeconds->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckboxNoSeconds ), NULL, this );
+    m_choiceDate1->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate1 ), NULL, this );
+    m_choiceDate2->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate2 ), NULL, this );
+    m_choiceDate3->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDate3 ), NULL, this );
+    m_choiceDateFormat->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceDateFormat ), NULL, this );
+    m_textCtrlDateSeparator->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextDateSeparator ), NULL, this );
+    m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnCancel ), NULL, this );
     m_choiceNoEngines->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( LogbookOptions::OnChoiceNoEngines ), NULL, this );
     m_toggleBtnRPMCheck->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( LogbookOptions::OnToggleButtonRPMCheck ), NULL, this );
     m_checkBoxEng1RPM->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxEng1RPM ), NULL, this );
@@ -1433,104 +1410,98 @@
     m_checkBoxEngine->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxEngineMessage ), NULL, this );
     m_checkBoxEngineRunning->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxEngineRunning ), NULL, this );
     m_checkBoxGenerator->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxGeneratorMessage ), NULL, this );
-	m_textCtrlEngine1->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng1IdEntry ), NULL, this );
-	m_textCtrlEngine2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng2IdEntry ), NULL, this );
-	m_textCtrlGenerator->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextGenIdEntry ), NULL, this );
+    m_checkBoxOverview->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( LogbookOptions::OnCheckBoxOverview ), NULL, this );
+    m_textCtrlEngine1->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng1IdEntry ), NULL, this );
+    m_textCtrlEngine2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextEng2IdEntry ), NULL, this );
+    m_textCtrlGenerator->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( LogbookOptions::OnTextGenIdEntry ), NULL, this );
 
 
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( LogbookOptions::OnClose ) );
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( LogbookOptions::OnClose ) );
 }
 
 void LogbookOptions::init()
 {
-	oldPattern = LogbookDialog::datePattern;
-	opt->setDateFormat();
-	oldDateFormat = opt->sdateformat;
-	iOldDateFormat = opt->dateformat;
-	ioldDate1 = opt->date1;;
-	ioldDate2 = opt->date2;
-	ioldDate3 = opt->date3;
-	ioldTimeFormat = opt->timeformat;
-	boldNoSeconds = opt->noseconds;
-
-	sample = wxDateTime::Now();
-	opt->setOptionsTimeFormat();
-	if(opt->hourFormat)
-		this->m_choiceTimeFormat->Enable(false);
+    oldPattern = LogbookDialog::datePattern;
+    opt->setDateFormat();
+    oldDateFormat = opt->sdateformat;
+    iOldDateFormat = opt->dateformat;
+    ioldDate1 = opt->date1;;
+    ioldDate2 = opt->date2;
+    ioldDate3 = opt->date3;
+    ioldTimeFormat = opt->timeformat;
+    boldNoSeconds = opt->noseconds;
+
+    sample = wxDateTime::Now();
+    opt->setOptionsTimeFormat();
+    if ( opt->hourFormat )
+        this->m_choiceTimeFormat->Enable( false );
 
 
-	opt->dateseparatorlocale = LogbookDialog::dateSeparator;
-	setValues();
+    opt->dateseparatorlocale = LogbookDialog::dateSeparator;
+    setValues();
 
 #ifdef __WXMSW__
-	;//m_buttonInstallLanguages->Enable(false);
+    ;//m_buttonInstallLanguages->Enable(false);
 #else
-	m_buttonUninstall->Enable(false);
+    m_buttonUninstall->Enable( false );
 #endif
 
-	opt->setTimeFormat(m_checkBoxNoSeconds->GetValue());
+    opt->setTimeFormat( m_checkBoxNoSeconds->GetValue() );
 
-	setDateEnabled(opt->dateformat);
+    setDateEnabled( opt->dateformat );
 
-	modified = false;
-	m_staticTextTime->SetLabel(sample.Format(opt->stimeformat));
-	if(NULL != log_pi->m_plogbook_window)
-		log_pi->m_plogbook_window->myParseDate(log_pi->m_plogbook_window->m_textCtrlWatchStartDate->GetValue(),textCtrlDate);
-
-	if(opt->timeformat == -1)
-	{
-		wxString am,pm;
-		wxDateTime::GetAmPmStrings(&am,&pm);
-		if(am.IsEmpty())
-			opt->timeformat = 0;
-		else
-			opt->timeformat = 1;
-	}
-
-	if(log_pi->m_plogbook_window == NULL)
-	{
-	wxStandardPathsBase& std_path = wxStandardPathsBase::Get();
-#ifdef __WXMSW__
-	wxString stdPath  = std_path.GetConfigDir();
-#endif
-#ifdef __WXGTK__
-	wxString stdPath  = std_path.GetUserDataDir();
-#endif
-#ifdef __WXOSX__
-	wxString stdPath  = std_path.GetUserConfigDir();   // should be ~/Library/Preferences	
-#endif
-		wxString sep = wxFileName::GetPathSeparator();
-		wxString data_locn = stdPath+sep+_T("plugins")+sep+_T("logbook")+sep+_T("data")+sep+_T("logbook.txt");
-		if(wxFile::Exists(data_locn))
-		{
-			wxFileInputStream input( data_locn );
-			wxTextInputStream* stream = new wxTextInputStream (input);
-	
-			if(!stream->ReadLine().Contains(_T("#1.2#")))
-			{
-				log_pi->startLogbook();
-				log_pi->m_plogbook_window->myParseDate(log_pi->m_plogbook_window->m_textCtrlWatchStartDate->GetValue(),textCtrlDate);
-			}
-		}
-			
-	}
+    modified = false;
+    m_staticTextTime->SetLabel( sample.Format( opt->stimeformat ) );
+    if ( NULL != log_pi->m_plogbook_window )
+        log_pi->m_plogbook_window->myParseDate( log_pi->m_plogbook_window->m_textCtrlWatchStartDate->GetValue(),textCtrlDate );
+
+    if ( opt->timeformat == -1 )
+    {
+        wxString am,pm;
+        wxDateTime::GetAmPmStrings( &am,&pm );
+        if ( am.IsEmpty() )
+            opt->timeformat = 0;
+        else
+            opt->timeformat = 1;
+    }
+
+    if ( log_pi->m_plogbook_window == NULL )
+    {
+        wxString stdPath;
+        stdPath = logbookkonni_pi::StandardPath();
+
+        wxString sep = wxFileName::GetPathSeparator();
+        wxString data_locn = stdPath + _T( "data" ) + sep + _T( "logbook.txt" );
+        if ( wxFile::Exists( data_locn ) )
+        {
+            wxFileInputStream input( data_locn );
+            wxTextInputStream* stream = new wxTextInputStream ( input );
+
+            if ( !stream->ReadLine().Contains( _T( "#1.2#" ) ) )
+            {
+                log_pi->startLogbook();
+                log_pi->m_plogbook_window->myParseDate( log_pi->m_plogbook_window->m_textCtrlWatchStartDate->GetValue(),textCtrlDate );
+            }
+        }
+
+    }
     setUseRPM();
 }
 
 void LogbookOptions::resetToOldDateTimeFormat()
 {
-	LogbookDialog::datePattern = oldPattern;
+    LogbookDialog::datePattern = oldPattern;
 
-	opt->sdateformat = oldDateFormat;
-	opt->dateformat = iOldDateFormat;
-	opt->date1 = ioldDate1;
-	opt->date2 = ioldDate2;
-	opt->date3 = ioldDate3;
-	opt->timeformat = ioldTimeFormat;
-	opt->noseconds = boldNoSeconds;	
+    opt->sdateformat = oldDateFormat;
+    opt->dateformat = iOldDateFormat;
+    opt->date1 = ioldDate1;
+    opt->date2 = ioldDate2;
+    opt->date3 = ioldDate3;
+    opt->timeformat = ioldTimeFormat;
+    opt->noseconds = boldNoSeconds;
 
-	opt->setDateFormat();
-	opt->setTimeFormat(opt->timeformat);
+    opt->setDateFormat();
+    opt->setTimeFormat( opt->timeformat );
 }
 
 void LogbookOptions::OnCheckBoxEngineRunning( wxCommandEvent& event )
@@ -1543,26 +1514,31 @@
 
 }
 
+void LogbookOptions::OnCheckBoxOverview( wxCommandEvent& event )
+{
+
+}
+
 void LogbookOptions::OnCheckBoxGeneratorMessage( wxCommandEvent& event )
 {
     opt->generator = m_checkBoxGenerator->GetValue();
-    if(log_pi->m_plogbook_window)
+    if ( log_pi->m_plogbook_window )
     {
-        if(!opt->generator)
+        if ( !opt->generator )
         {
-            if(opt->generatorRunning)
+            if ( opt->generatorRunning )
             {
-                log_pi->m_plogbook_window->stopGenerator(false, false, true);
-                wxMessageBox(_("Your Generator is still running .\n\nGenerator stopped now."),_("Information"));
+                log_pi->m_plogbook_window->stopGenerator( false, false, true );
+                wxMessageBox( _( "Your Generator is still running .\n\nGenerator stopped now." ),_( "Information" ) );
             }
             else
             {
-                log_pi->m_plogbook_window->stopGenerator(false, false, false);
+                log_pi->m_plogbook_window->stopGenerator( false, false, false );
             }
         }
         else
         {
-            log_pi->m_plogbook_window->stopGenerator(true, true, false);
+            log_pi->m_plogbook_window->stopGenerator( true, true, false );
         }
         log_pi->m_plogbook_window->setShowGenerator();
     }
@@ -1585,25 +1561,25 @@
 {
     m_panelSailNames->Hide();
     wxCheckBox* checkboxSails[14];
-    fgSizerSailsCheckboxes->Clear(true);
+    fgSizerSailsCheckboxes->Clear( true );
     m_panelSails->Layout();
     m_panelSailsCheckbox->Show();
-    for(unsigned int i = 0; i < 14; i++)
+    for ( unsigned int i = 0; i < 14; i++ )
     {
-        checkboxSails[i] = new wxCheckBox( m_panelSailsCheckbox, wxID_ANY,opt->abrSails.Item(i) , wxDefaultPosition, wxDefaultSize, 0 );
+        checkboxSails[i] = new wxCheckBox( m_panelSailsCheckbox, wxID_ANY,opt->abrSails.Item( i ) , wxDefaultPosition, wxDefaultSize, 0 );
         checkboxSails[i]->SetValue( opt->bSailIsChecked[i] );
-        checkboxSails[i]->SetToolTip( opt->sailsName.Item(i) );
+        checkboxSails[i]->SetToolTip( opt->sailsName.Item( i ) );
 
         fgSizerSailsCheckboxes->Add( checkboxSails[i] , 0, 0, 5 );
     }
-    wxButton* m_buttonSailsReset = new wxButton( m_panelSailsCheckbox, wxID_ANY, _("none"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_buttonSailsReset->SetToolTip(_("Reset"));
+    wxButton* m_buttonSailsReset = new wxButton( m_panelSailsCheckbox, wxID_ANY, _( "none" ), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSailsReset->SetToolTip( _( "Reset" ) );
     m_buttonSailsReset->SetMinSize( wxSize( 40,15 ) );
 
     fgSizerSailsCheckboxes->Add( m_buttonSailsReset, 0, 0, 5 );
 
-    fgSizerSailsCheckboxes->SetVGap(opt->rowGap);
-    fgSizerSailsCheckboxes->SetHGap(opt->colGap);
+    fgSizerSailsCheckboxes->SetVGap( opt->rowGap );
+    fgSizerSailsCheckboxes->SetHGap( opt->colGap );
     m_panelSailsCheckbox->Fit();
     m_panelSails->Layout();
 }
@@ -1617,7 +1593,7 @@
 void LogbookOptions::OnButtonSpaceRPlus( wxCommandEvent& event )
 {
     opt->rowGap +=5;
-    fgSizerSailsCheckboxes->SetVGap(opt->rowGap);
+    fgSizerSailsCheckboxes->SetVGap( opt->rowGap );
     m_panelSailsCheckbox->Fit();
     m_panelSails->Layout();
 }
@@ -1625,8 +1601,8 @@
 void LogbookOptions::OnButtonSpaceRMinus( wxCommandEvent& event )
 {
     opt->rowGap -=5;
-    if(opt->rowGap <= 0) opt->rowGap = 0;
-    fgSizerSailsCheckboxes->SetVGap(opt->rowGap);
+    if ( opt->rowGap <= 0 ) opt->rowGap = 0;
+    fgSizerSailsCheckboxes->SetVGap( opt->rowGap );
     m_panelSailsCheckbox->Fit();
     m_panelSails->Layout();
 }
@@ -1634,7 +1610,7 @@
 void LogbookOptions::OnButtonSpaceCPlus( wxCommandEvent& event )
 {
     opt->colGap +=5;
-    fgSizerSailsCheckboxes->SetHGap(opt->colGap);
+    fgSizerSailsCheckboxes->SetHGap( opt->colGap );
     m_panelSailsCheckbox->Fit();
     m_panelSails->Layout();
 }
@@ -1642,8 +1618,8 @@
 void LogbookOptions::OnButtonSpaceCMinus( wxCommandEvent& event )
 {
     opt->colGap -=5;
-    if(opt->colGap <= 0) opt->colGap = 0;
-    fgSizerSailsCheckboxes->SetHGap(opt->colGap);
+    if ( opt->colGap <= 0 ) opt->colGap = 0;
+    fgSizerSailsCheckboxes->SetHGap( opt->colGap );
     m_panelSailsCheckbox->Fit();
     m_panelSails->Layout();
 }
@@ -1652,8 +1628,8 @@
 {
     opt->rowGap = 0;
     opt->colGap = 0;
-    fgSizerSailsCheckboxes->SetVGap(opt->rowGap);
-    fgSizerSailsCheckboxes->SetHGap(opt->rowGap);
+    fgSizerSailsCheckboxes->SetVGap( opt->rowGap );
+    fgSizerSailsCheckboxes->SetHGap( opt->rowGap );
     m_panelSailsCheckbox->Fit();
     m_panelSails->Layout();
 
@@ -1662,23 +1638,23 @@
 void LogbookOptions::OnCheckBoxEng1RPM( wxCommandEvent& event )
 {
     opt->bEng1RPMIsChecked = event.IsChecked();
-    if(log_pi->m_plogbook_window)
+    if ( log_pi->m_plogbook_window )
     {
-        if(opt->bEng1RPMIsChecked)
+        if ( opt->bEng1RPMIsChecked )
         {
-            if(log_pi->m_plogbook_window->logbook->engine1Manual && opt->engine1Running)
+            if ( log_pi->m_plogbook_window->logbook->engine1Manual && opt->engine1Running )
             {
-                log_pi->m_plogbook_window->stopEngine1(false, true);
-                wxMessageBox(_("Your Engine #1 is running in manual mode.\n\nEngine stopped now."),_("Information"));
+                log_pi->m_plogbook_window->stopEngine1( false, true );
+                wxMessageBox( _( "Your Engine #1 is running in manual mode.\n\nEngine stopped now." ),_( "Information" ) );
             }
             else
             {
-                log_pi->m_plogbook_window->stopEngine1(false, false);
+                log_pi->m_plogbook_window->stopEngine1( false, false );
             }
         }
         else
         {
-            log_pi->m_plogbook_window->stopEngine1(true, false);
+            log_pi->m_plogbook_window->stopEngine1( true, false );
         }
     }
     setUseRPM();
@@ -1687,23 +1663,23 @@
 void LogbookOptions::OnCheckBoxEng2RPM( wxCommandEvent& event )
 {
     opt->bEng2RPMIsChecked = event.IsChecked();
-    if(log_pi->m_plogbook_window)
+    if ( log_pi->m_plogbook_window )
     {
-        if(opt->bEng2RPMIsChecked)
+        if ( opt->bEng2RPMIsChecked )
         {
-            if(log_pi->m_plogbook_window->logbook->engine2Manual && opt->engine2Running)
+            if ( log_pi->m_plogbook_window->logbook->engine2Manual && opt->engine2Running )
             {
-                log_pi->m_plogbook_window->stopEngine2(false, true, true);
-                wxMessageBox(_("Your Engine #2 is running in manual mode.\n\nEngine stopped now."),_("Information"));
+                log_pi->m_plogbook_window->stopEngine2( false, true, true );
+                wxMessageBox( _( "Your Engine #2 is running in manual mode.\n\nEngine stopped now." ),_( "Information" ) );
             }
             else
             {
-                log_pi->m_plogbook_window->stopEngine2(false, true, false);
+                log_pi->m_plogbook_window->stopEngine2( false, true, false );
             }
         }
         else
         {
-            log_pi->m_plogbook_window->stopEngine2(true, true, false);
+            log_pi->m_plogbook_window->stopEngine2( true, true, false );
         }
     }
     setUseRPM();
@@ -1712,23 +1688,23 @@
 void LogbookOptions::OnCheckBoxGenRPM( wxCommandEvent& event )
 {
     opt->bGenRPMIsChecked = event.IsChecked();
-    if(log_pi->m_plogbook_window)
+    if ( log_pi->m_plogbook_window )
     {
-        if(opt->bGenRPMIsChecked)
+        if ( opt->bGenRPMIsChecked )
         {
-            if(log_pi->m_plogbook_window->logbook->generatorManual && opt->generatorRunning)
+            if ( log_pi->m_plogbook_window->logbook->generatorManual && opt->generatorRunning )
             {
-                log_pi->m_plogbook_window->stopGenerator(false, true, true);
-                wxMessageBox(_("Your Generator is running in manual mode.\n\nGenerator stopped now."),_("Information"));
+                log_pi->m_plogbook_window->stopGenerator( false, true, true );
+                wxMessageBox( _( "Your Generator is running in manual mode.\n\nGenerator stopped now." ),_( "Information" ) );
             }
             else
             {
-                log_pi->m_plogbook_window->stopGenerator(false, true, false);
+                log_pi->m_plogbook_window->stopGenerator( false, true, false );
             }
         }
         else
         {
-            log_pi->m_plogbook_window->stopGenerator(true, true, false);
+            log_pi->m_plogbook_window->stopGenerator( true, true, false );
         }
     }
     setUseRPM();
@@ -1738,74 +1714,74 @@
 {
     bool bIsChecked;
 
-    bIsChecked = (opt->bEng1RPMIsChecked || opt->bEng2RPMIsChecked || opt->bGenRPMIsChecked);
+    bIsChecked = ( opt->bEng1RPMIsChecked || opt->bEng2RPMIsChecked || opt->bGenRPMIsChecked );
 
-    if(bIsChecked)
+    if ( bIsChecked )
     {
         opt->bRPMIsChecked = true;
-        m_checkBoxNMEAUseRPM->Enable(true);
-        m_toggleBtnRPMCheck->Enable(true);
+        m_checkBoxNMEAUseRPM->Enable( true );
+        m_toggleBtnRPMCheck->Enable( true );
     }
     else
     {
         opt->bRPMIsChecked = false;
-        m_checkBoxNMEAUseRPM->Enable(false);
-        m_toggleBtnRPMCheck->Enable(false);
+        m_checkBoxNMEAUseRPM->Enable( false );
+        m_toggleBtnRPMCheck->Enable( false );
     }
 
-    if(opt->engines == 0)
+    if ( opt->engines == 0 )
     {
-        m_checkBoxEng2RPM->SetValue(false);
-        m_checkBoxEng2RPM->Enable(false);
-        m_textCtrlEngine2->Enable(false);
+        m_checkBoxEng2RPM->SetValue( false );
+        m_checkBoxEng2RPM->Enable( false );
+        m_textCtrlEngine2->Enable( false );
 
-        if(opt->bEng1RPMIsChecked)
+        if ( opt->bEng1RPMIsChecked )
         {
-            m_textCtrlEngine1->Enable(true);
+            m_textCtrlEngine1->Enable( true );
         }
         else
         {
-            m_textCtrlEngine1->Enable(false);
+            m_textCtrlEngine1->Enable( false );
         }
     }
     else
     {
-        m_checkBoxEng2RPM->Enable(true);
-        if(opt->bEng1RPMIsChecked)
+        m_checkBoxEng2RPM->Enable( true );
+        if ( opt->bEng1RPMIsChecked )
         {
-       	    m_textCtrlEngine1->Enable(true);
+            m_textCtrlEngine1->Enable( true );
         }
         else
         {
-       	    m_textCtrlEngine1->Enable(false);
+            m_textCtrlEngine1->Enable( false );
         }
 
-        if(opt->bEng2RPMIsChecked)
+        if ( opt->bEng2RPMIsChecked )
         {
-       	    m_textCtrlEngine2->Enable(true);
+            m_textCtrlEngine2->Enable( true );
         }
         else
         {
-       	    m_textCtrlEngine2->Enable(false);
+            m_textCtrlEngine2->Enable( false );
         }
     }
 
-    if(!opt->generator)
+    if ( !opt->generator )
     {
-        m_checkBoxGenRPM->SetValue(false);
-        m_checkBoxGenRPM->Enable(false);
-        m_textCtrlGenerator->Enable(false);
+        m_checkBoxGenRPM->SetValue( false );
+        m_checkBoxGenRPM->Enable( false );
+        m_textCtrlGenerator->Enable( false );
     }
     else
     {
-        m_checkBoxGenRPM->Enable(true);
-        if(opt->bGenRPMIsChecked)
+        m_checkBoxGenRPM->Enable( true );
+        if ( opt->bGenRPMIsChecked )
         {
-            m_textCtrlGenerator->Enable(true);
+            m_textCtrlGenerator->Enable( true );
         }
         else
         {
-            m_textCtrlGenerator->Enable(false);
+            m_textCtrlGenerator->Enable( false );
         }
     }
 }
@@ -1814,194 +1790,194 @@
 {
     log_pi->startLogbook();
     opt->bRPMCheck = event.IsChecked();
-    m_staticTextRPMSentence->Enable(event.IsChecked());
+    m_staticTextRPMSentence->Enable( event.IsChecked() );
 }
 
-void LogbookOptions::setRPMSentence(wxString sentence)
+void LogbookOptions::setRPMSentence( wxString sentence )
 {
     static wxString e1 = wxEmptyString, e2 = wxEmptyString;
-    m_staticTextRPMSentence->SetLabel(sentence);
+    m_staticTextRPMSentence->SetLabel( sentence );
 
-    wxStringTokenizer tkz(sentence,_T(","));
+    wxStringTokenizer tkz( sentence,_T( "," ) );
     tkz.GetNextToken();
     wxString source = tkz.GetNextToken();
     wxString t = tkz.GetNextToken();
 
-/*    if(e1.IsEmpty())
-        e1 = t;
-    if(e2.IsEmpty() && t != e1)
-        e2 = t;
+    /*    if(e1.IsEmpty())
+            e1 = t;
+        if(e2.IsEmpty() && t != e1)
+            e2 = t;
 
-    m_textCtrlEngine1->SetValue(e1);
-    m_textCtrlEngine2->SetValue(e2); */
+        m_textCtrlEngine1->SetValue(e1);
+        m_textCtrlEngine2->SetValue(e2); */
 //    if(source == _T("E"))
 //        m_checkBoxNMEAUseRPM->SetValue(true);
 }
 
 void LogbookOptions::OnCancel( wxCommandEvent& event )
 {
-	Close();
-	event.Skip();
+    Close();
+    event.Skip();
 }
 
 void LogbookOptions::OnClose( wxCloseEvent& event )
 {
-	resetToOldDateTimeFormat();
+    resetToOldDateTimeFormat();
     opt->bRPMCheck = false;
-	event.Skip();
+    event.Skip();
 }
 
 void LogbookOptions::OnChoiceDateFormat( wxCommandEvent& event )
 {
-	setDateEnabled(event.GetSelection() );
-	opt->dateformat = event.GetSelection();
-	opt->setDateFormat();
-	m_staticTextDate->SetLabel(sample.Format(opt->sdateformat));
-	modified = true;
-}
-
-void LogbookOptions::setDateEnabled(int i)
-{
-	if(!i)
-	{
-		m_choiceDate1->Enable(false);
-		m_choiceDate2->Enable(false);
-		m_choiceDate3->Enable(false);
-		m_textCtrlDateSeparator->Enable(false);
-	}
-	else
-	{
-		m_choiceDate1->Enable(true);
-		m_choiceDate2->Enable(true);
-		m_choiceDate3->Enable(true);
-		m_textCtrlDateSeparator->Enable(true);
-	}
+    setDateEnabled( event.GetSelection() );
+    opt->dateformat = event.GetSelection();
+    opt->setDateFormat();
+    m_staticTextDate->SetLabel( sample.Format( opt->sdateformat ) );
+    modified = true;
+}
+
+void LogbookOptions::setDateEnabled( int i )
+{
+    if ( !i )
+    {
+        m_choiceDate1->Enable( false );
+        m_choiceDate2->Enable( false );
+        m_choiceDate3->Enable( false );
+        m_textCtrlDateSeparator->Enable( false );
+    }
+    else
+    {
+        m_choiceDate1->Enable( true );
+        m_choiceDate2->Enable( true );
+        m_choiceDate3->Enable( true );
+        m_textCtrlDateSeparator->Enable( true );
+    }
 
 }
 
 void LogbookOptions::OnChoiceDate1( wxCommandEvent& event )
 {
-	int sel = event.GetSelection();
+    int sel = event.GetSelection();
 
-	 opt->date1 = sel;
-	 opt->setDateFormat();
-	 m_staticTextDate->SetLabel(sample.Format(opt->sdateformat));
-     //m_staticTextTime->SetLabel(sample.Format(opt->sdateformat));
-	 modified = true;
+    opt->date1 = sel;
+    opt->setDateFormat();
+    m_staticTextDate->SetLabel( sample.Format( opt->sdateformat ) );
+    //m_staticTextTime->SetLabel(sample.Format(opt->sdateformat));
+    modified = true;
 }
 
 void LogbookOptions::OnChoiceDate2( wxCommandEvent& event )
 {
-	int sel = event.GetSelection();
+    int sel = event.GetSelection();
 
-	 opt->date2 = sel;
-	 opt->setDateFormat();
-	 m_staticTextDate->SetLabel(sample.Format(opt->sdateformat));
+    opt->date2 = sel;
+    opt->setDateFormat();
+    m_staticTextDate->SetLabel( sample.Format( opt->sdateformat ) );
     // m_staticTextTime->SetLabel(sample.Format(opt->sdateformat));
-	 modified = true;
+    modified = true;
 }
 
 void LogbookOptions::OnChoiceDate3( wxCommandEvent& event )
 {
-	int sel = event.GetSelection();
+    int sel = event.GetSelection();
 
-	 opt->date3 = sel;
-	 opt->setDateFormat();
-	 m_staticTextDate->SetLabel(sample.Format(opt->sdateformat));
+    opt->date3 = sel;
+    opt->setDateFormat();
+    m_staticTextDate->SetLabel( sample.Format( opt->sdateformat ) );
     // m_staticTextTime->SetLabel(sample.Format(opt->sdateformat));
-	 modified = true;
+    modified = true;
 }
 
 void LogbookOptions::OnTextDateSeparator( wxCommandEvent& event )
 {
-	 opt->dateseparatorindiv = event.GetString();
-	 opt->setDateFormat();
-	 m_staticTextDate->SetLabel(sample.Format(opt->sdateformat));
+    opt->dateseparatorindiv = event.GetString();
+    opt->setDateFormat();
+    m_staticTextDate->SetLabel( sample.Format( opt->sdateformat ) );
     // m_staticTextTime->SetLabel(sample.Format(opt->sdateformat));
-	 modified = true;
+    modified = true;
 }
 
 void LogbookOptions::OnChoiceTimeFormat( wxCommandEvent& event )
 {
-	if(opt->hourFormat && m_choiceTimeFormat->GetSelection() == 1)
-	{
-		wxMessageBox(_("Your Country has 24 Hour Format.\nIn this case the OS doen't serve AM/PM-Strings.\n"));
-		m_choiceTimeFormat->SetSelection(0);
-		return;
-	}
-	opt->timeformat = m_choiceTimeFormat->GetSelection();
-
-	opt->setTimeFormat(m_checkBoxNoSeconds->GetValue());
-	m_staticTextTime->SetLabel(sample.Format(opt->stimeformat));
-	modified = true;
+    if ( opt->hourFormat && m_choiceTimeFormat->GetSelection() == 1 )
+    {
+        wxMessageBox( _( "Your Country has 24 Hour Format.\nIn this case the OS doen't serve AM/PM-Strings.\n" ) );
+        m_choiceTimeFormat->SetSelection( 0 );
+        return;
+    }
+    opt->timeformat = m_choiceTimeFormat->GetSelection();
+
+    opt->setTimeFormat( m_checkBoxNoSeconds->GetValue() );
+    m_staticTextTime->SetLabel( sample.Format( opt->stimeformat ) );
+    modified = true;
 }
 
 void LogbookOptions::OnCheckboxNoSeconds( wxCommandEvent& event )
 {
-	opt->setTimeFormat(event.IsChecked());
-	m_staticTextTime->SetLabel(sample.Format(opt->stimeformat));
-	modified = true;
+    opt->setTimeFormat( event.IsChecked() );
+    m_staticTextTime->SetLabel( sample.Format( opt->stimeformat ) );
+    modified = true;
 }
 
-void LogbookOptions::OnButtonClickUninstall(wxCommandEvent& ev)
+void LogbookOptions::OnButtonClickUninstall( wxCommandEvent& ev )
 {
 #ifdef __WXMSW__
-	wxStandardPaths stdpath;
-	wxString s = stdpath.GetPluginsDir();
-	wxString command = s+_T("\\plugins\\uninst_logbookkonni_pi.exe");
+    wxStandardPathsBase& stdpath = wxStandardPathsBase::Get();
+    wxString s = stdpath.GetPluginsDir();
+    wxString command = s+_T( "\\plugins\\uninst_logbookkonni_pi.exe" );
 
-	wxExecute(_T("explorer.exe /select,")+command);	
+    wxExecute( _T( "explorer.exe /select," )+command );
 #endif
 }
 
 void LogbookOptions::OnButtonResetPaths( wxCommandEvent& event )
 {
-	opt->htmlEditor = opt->htmlEditorReset;
-	opt->odtEditor  = opt->odtEditorReset;
-	opt->mailClient = opt->mailClientReset;
-	opt->dataManager= opt->dataManagerReset;
+    opt->htmlEditor = opt->htmlEditorReset;
+    opt->odtEditor  = opt->odtEditorReset;
+    opt->mailClient = opt->mailClientReset;
+    opt->dataManager= opt->dataManagerReset;
 
-	setValues();
+    setValues();
 }
 
-void LogbookOptions::onCheckBoxToolTips(wxCommandEvent& ev)
+void LogbookOptions::onCheckBoxToolTips( wxCommandEvent& ev )
 {
-	if(ev.IsChecked())
-	{
-		this->GetToolTip()->Enable(true);
-		opt->showToolTips = true;
-	}
-	else
-	{
-		this->GetToolTip()->Enable(false);
-		opt->showToolTips = false;
-	}
+    if ( ev.IsChecked() )
+    {
+        this->GetToolTip()->Enable( true );
+        opt->showToolTips = true;
+    }
+    else
+    {
+        this->GetToolTip()->Enable( false );
+        opt->showToolTips = false;
+    }
 }
 
-void LogbookOptions::OnButtonOKClick(wxCommandEvent &ev)
+void LogbookOptions::OnButtonOKClick( wxCommandEvent &ev )
 {
-	int iNewDateFormat;
+    int iNewDateFormat;
 
-	int sel1 = m_choiceDate1->GetSelection();
-	int sel2 = m_choiceDate2->GetSelection();
+    int sel1 = m_choiceDate1->GetSelection();
+    int sel2 = m_choiceDate2->GetSelection();
     int sel3 = m_choiceDate3->GetSelection();
 
-	if(opt->dateformat == 1 && ((sel1 == sel2 || sel1 == sel3) ||
-		(sel2 == sel1 || sel2 == sel3) ||
-		(sel3 == sel1 || sel3 == sel2)))
-	{
-		wxString sep = m_textCtrlDateSeparator->GetValue();
-		wxMessageBox(wxString::Format(_("You cannot set this dateformat.\n\n%s%s%s%s%s\n\nPlease use a different Dateformat in all three Choiceboxes.")
-			,m_choiceDate1->GetString(sel1).c_str(),sep.c_str(),m_choiceDate2->GetString(sel2).c_str(),sep.c_str(),m_choiceDate3->GetString(sel3).c_str()));
-		return;
-	}
+    if ( opt->dateformat == 1 && ( ( sel1 == sel2 || sel1 == sel3 ) ||
+                                   ( sel2 == sel1 || sel2 == sel3 ) ||
+                                   ( sel3 == sel1 || sel3 == sel2 ) ) )
+    {
+        wxString sep = m_textCtrlDateSeparator->GetValue();
+        wxMessageBox( wxString::Format( _( "You cannot set this dateformat.\n\n%s%s%s%s%s\n\nPlease use a different Dateformat in all three Choiceboxes." )
+                                        ,m_choiceDate1->GetString( sel1 ).c_str(),sep.c_str(),m_choiceDate2->GetString( sel2 ).c_str(),sep.c_str(),m_choiceDate3->GetString( sel3 ).c_str() ) );
+        return;
+    }
 
-	getValues();
-	updateChoiceBoxes();
+    getValues();
+    updateChoiceBoxes();
 
-	LogbookDialog* dlg = log_pi->m_plogbook_window;
+    LogbookDialog* dlg = log_pi->m_plogbook_window;
 
-	if(dlg)
+    if ( dlg )
     {
         dlg->setSailsGap();
         dlg->setToNumberEngine();
@@ -2013,239 +1989,238 @@
     setUseRPM();
 
     wxString newPattern = LogbookDialog::datePattern;
-	wxString newDateFormat = opt->sdateformat;
-	LogbookDialog::datePattern = oldPattern;
-	opt->sdateformat = oldDateFormat;
-	iNewDateFormat = opt->dateformat;
-	opt->dateformat = iOldDateFormat;
-
-	if((m_sDeg->IsEmpty() || m_sDeg->GetValue().Len() != 1) || 
-		(m_sMin->IsEmpty() || m_sMin->GetValue().Len()!= 1) ||
-		(m_sSec->IsEmpty()) || m_sSec->GetValue().Len() != 1)
-	{
-#ifdef __WXOSX__
-        MessageBoxOSX(NULL,_("Please fill in one character in Degrees, Minutes and Seconds"),_T("Information"),wxID_OK);
+    wxString newDateFormat = opt->sdateformat;
+    LogbookDialog::datePattern = oldPattern;
+    opt->sdateformat = oldDateFormat;
+    iNewDateFormat = opt->dateformat;
+    opt->dateformat = iOldDateFormat;
+
+    if ( ( m_sDeg->IsEmpty() || m_sDeg->GetValue().Len() != 1 ) ||
+            ( m_sMin->IsEmpty() || m_sMin->GetValue().Len()!= 1 ) ||
+            ( m_sSec->IsEmpty() ) || m_sSec->GetValue().Len() != 1 )
+    {
+        wxMessageBox( _( "Please fill in one character in Degrees, Minutes and Seconds" ) );
         return;
-#else
-		wxMessageBox(_("Please fill in one character in Degrees, Minutes and Seconds"));
-		return;
-#endif
-	}
-	else
-		ev.Skip();
-	
-	if(NULL != dlg && modified)
-	{	
-		dlg->logbook->update();
-		dlg->maintenance->update();
-		dlg->maintenance->updateBuyParts();
-		dlg->crewList->saveData();
-		dlg->boat->saveData();
-
-		LogbookDialog::datePattern = newPattern;
-		opt->sdateformat = newDateFormat;
-		opt->dateformat = iNewDateFormat;
-		opt->setDateFormat();
-		opt->setTimeFormat(opt->noseconds);
-
-		dlg->logbook->clearAllGrids();
-		dlg->logbook->loadData();
-
-		LogbookDialog::datePattern = oldPattern;
-		wxDateTime dt;
-		dlg->myParseTime(dlg->m_textCtrlWatchStartTime->GetValue(),dt);
-		dlg->m_textCtrlWatchStartTime->SetValue(dt.Format(opt->stimeformat));
-		dlg->myParseDate(dlg->m_textCtrlWatchStartDate->GetValue(),dt);
-		dlg->m_textCtrlWatchStartDate->SetValue(dt.Format(opt->sdateformat));
-		LogbookDialog::datePattern = newPattern;
-
-		if(dlg->crewList->getDayOne(1) != -1)
-			dlg->crewList->dayNow(false);
-		else
-		{
-			bool dummy = false;
-
-			dlg->crewList->gridWake->SetCellValue(1,0,textCtrlDate.Format(opt->sdateformat));
-			dlg->crewList->updateWatchTime(dlg->crewList->day,0,&dummy);
-			dlg->crewList->gridWake->AutoSizeColumns();		
-		}
-
-		if(dlg->m_gridMaintanence->GetNumberRows() > 0)
-			dlg->m_gridMaintanence->DeleteRows(0,dlg->m_gridMaintanence->GetNumberRows());
-		if(dlg->m_gridMaintenanceBuyParts->GetNumberRows() > 0)
-			dlg->m_gridMaintenanceBuyParts->DeleteRows(0,dlg->m_gridMaintenanceBuyParts->GetNumberRows());
-		dlg->maintenance->loadData();
-
-		if(dlg->m_gridCrew->GetNumberRows() > 0)
-			dlg->m_gridCrew->DeleteRows(0,dlg->m_gridCrew->GetNumberRows());
-		dlg->crewList->loadData();
-
-		dlg->boat->loadData();
-
-		dlg->loadTimerEx();
-	}
-	else
-	{
-		opt->setDateFormat();
-		opt->setTimeFormat(opt->noseconds);
-	}
-}
-
-void LogbookOptions::onChoicePositionFormat(wxCommandEvent &ev)
-{
-	switch(ev.GetInt())
-	{
-	case 0: 	opt->traditional = false;
-		break;
-	case 1:		opt->traditional = true;
-		break;
-	}
+    }
+    else
+        ev.Skip();
+
+    if ( NULL != dlg && modified )
+    {
+        dlg->logbook->update();
+        dlg->maintenance->update();
+        dlg->maintenance->updateBuyParts();
+        dlg->crewList->saveData();
+        dlg->boat->saveData();
+
+        LogbookDialog::datePattern = newPattern;
+        opt->sdateformat = newDateFormat;
+        opt->dateformat = iNewDateFormat;
+        opt->setDateFormat();
+        opt->setTimeFormat( opt->noseconds );
+
+        dlg->logbook->clearAllGrids();
+        dlg->logbook->loadData();
+
+        LogbookDialog::datePattern = oldPattern;
+        wxDateTime dt;
+        dlg->myParseTime( dlg->m_textCtrlWatchStartTime->GetValue(),dt );
+        dlg->m_textCtrlWatchStartTime->SetValue( dt.Format( opt->stimeformat ) );
+        dlg->myParseDate( dlg->m_textCtrlWatchStartDate->GetValue(),dt );
+        dlg->m_textCtrlWatchStartDate->SetValue( dt.Format( opt->sdateformat ) );
+        LogbookDialog::datePattern = newPattern;
+
+        if ( dlg->crewList->getDayOne( 1 ) != -1 )
+            dlg->crewList->dayNow( false );
+        else
+        {
+            bool dummy = false;
+
+            dlg->crewList->gridWake->SetCellValue( 1,0,textCtrlDate.Format( opt->sdateformat ) );
+            dlg->crewList->updateWatchTime( dlg->crewList->day,0,&dummy );
+            dlg->crewList->gridWake->AutoSizeColumns();
+        }
+
+        if ( dlg->m_gridMaintanence->GetNumberRows() > 0 )
+            dlg->m_gridMaintanence->DeleteRows( 0,dlg->m_gridMaintanence->GetNumberRows() );
+        if ( dlg->m_gridMaintenanceBuyParts->GetNumberRows() > 0 )
+            dlg->m_gridMaintenanceBuyParts->DeleteRows( 0,dlg->m_gridMaintenanceBuyParts->GetNumberRows() );
+        dlg->maintenance->loadData();
+
+        if ( dlg->m_gridCrew->GetNumberRows() > 0 )
+            dlg->m_gridCrew->DeleteRows( 0,dlg->m_gridCrew->GetNumberRows() );
+        dlg->crewList->loadData();
+
+        dlg->boat->loadData();
+
+        dlg->loadTimerEx();
+    }
+    else
+    {
+        opt->setDateFormat();
+        opt->setTimeFormat( opt->noseconds );
+    }
+}
+
+void LogbookOptions::onChoicePositionFormat( wxCommandEvent &ev )
+{
+    switch ( ev.GetInt() )
+    {
+    case 0:
+        opt->traditional = false;
+        break;
+    case 1:
+        opt->traditional = true;
+        break;
+    }
 }
 
 void LogbookOptions::setValues()
 {
-	m_checkBoxPopUp->SetValue(opt->popup);
+    m_checkBoxPopUp->SetValue( opt->popup );
+
+    m_choiceDateFormat->Select( opt->dateformat );
+    m_textCtrlDateSeparator->SetValue( opt->dateseparatorindiv );
+    m_choiceDate1->SetSelection( opt->date1 );
+    m_choiceDate2->SetSelection( opt->date2 );
+    m_choiceDate3->SetSelection( opt->date3 );
+
+    m_choiceTimeFormat->Select( opt->timeformat );
+    m_checkBoxNoSeconds->SetValue( opt->noseconds );
+    m_choiceNoEngines->SetSelection( opt->engines );
+
+    m_textCtrlTankFuel->SetValue( opt->fuelTank+_T( " " )+opt->vol );
+    m_textCtrlTankWater->SetValue( opt->waterTank+_T( " " )+opt->vol );
+    m_textCtrlBank1->SetValue( opt->bank1+_T( " " )+opt->ampereh );
+    m_textCtrlBank2->SetValue( opt->bank2+_T( " " )+opt->ampereh );
+    m_textCtrlWatermaker->SetValue( opt->watermaker+_T( " " )+opt->vol+_T( "/" )+opt->motorh );
+    m_textCtrlGuradChanged->SetValue( opt->guardChangeText );
+    m_textCtrlWayPoint->SetValue( opt->waypointText );
+    m_textCtrlChancedCourse->SetValue( opt->courseChangeText );
+    m_textCtrlEverySMText->SetValue( opt->everySMText );
+
+    m_timerText->SetValue( opt->ttext );
+
+    m_sDeg->SetValue( opt->Deg );
+    m_sMin->SetValue( opt->Min );
+    m_sSec->SetValue( opt->Sec );
+
+    m_sDist->SetValue( opt->distance );
+    m_sSpeed->SetValue( opt->speed );
+
+    m_sBaro->SetValue( opt->baro );
+    m_textCtrlTemperature->SetValue( opt->temperature );
+    m_smeter->SetValue( opt->meter );
+    m_sFeet->SetValue( opt->feet );
+    m_sFathom->SetValue( opt->fathom );
+
+    m_sKnots->SetValue( opt->windkts );
+    m_sMeterSec->SetValue( opt->windmeter );
+    m_sKmh->SetValue( opt->windkmh );
+
+    m_sLiter->SetValue( opt->vol );
+    m_sMotorh->SetValue( opt->motorh );
+    m_textCtrlEngine->SetValue( opt->engine );
+    m_textCtrlPropShaft->SetValue( opt->shaft );
+    m_textCtrRPM->SetValue( opt->rpm );
+
+    m_textCtrlAmpere->SetValue( opt->ampere );
+
+    m_Days->SetValue( opt->days );
+    m_Weeks->SetValue( opt->weeks );
+    m_textMonth->SetValue( opt->month );
+
+    choicesWind[0] = opt->windkts;
+    choicesWind[1] = opt->windmeter;
+    choicesWind[2] = opt->windkmh;
+    updateWindChoice();
+
+    m_choiceDepth->SetSelection( opt->showDepth );
+    m_choiceWaveSwell->SetSelection( opt->showWaveSwell );
+    m_choiceWind->SetSelection( opt->showWindSpeed );
+    m_choiceDir->SetSelection( opt->showWindDir );
+    m_choiceHeading->SetSelection( opt->showHeading );
+    m_choiceWindTo->SetSelection( opt->showWindHeading );
+
+    m_textCtrlHTMLEditorPath->SetValue( opt->htmlEditor );
+    m_textCtrlODTEditor->SetValue( opt->odtEditor );
+    m_textCtrlDataManager->SetValue( opt->dataManager );
+    m_textCtrlMailClient->SetValue( opt->mailClient );
+
+    if ( opt->local == true )
+        m_radioBtnLocal->SetValue( true );
+    if ( opt->gpsAuto == true )
+        m_radioBtnGPSAuto->SetValue( true );
+    if ( opt->UTC == true )
+        m_radioBtnUTC->SetValue( true );
+
+    if ( opt->traditional )
+        m_choicePositionFormat->SetSelection( 1 );
+    else
+        m_choicePositionFormat->SetSelection( 0 );
+
+    m_checkBoxToolTips->SetValue( opt->showToolTips );
+
+    m_choiceTzIndicator->SetSelection( opt->tzIndicator );
+    m_choiceTzHours->SetSelection( opt->tzHour );
 
-	m_choiceDateFormat->Select(opt->dateformat);
-	m_textCtrlDateSeparator->SetValue(opt->dateseparatorindiv);
-	m_choiceDate1->SetSelection(opt->date1);
-	m_choiceDate2->SetSelection(opt->date2);
-	m_choiceDate3->SetSelection(opt->date3);
-
-	m_choiceTimeFormat->Select(opt->timeformat);
-	m_checkBoxNoSeconds->SetValue(opt->noseconds);
-    m_choiceNoEngines->SetSelection(opt->engines);
-
-	m_textCtrlTankFuel->SetValue(opt->fuelTank+_T(" ")+opt->vol);
-	m_textCtrlTankWater->SetValue(opt->waterTank+_T(" ")+opt->vol);
-	m_textCtrlBank1->SetValue(opt->bank1+_T(" ")+opt->ampereh);
-	m_textCtrlBank2->SetValue(opt->bank2+_T(" ")+opt->ampereh);
-	m_textCtrlWatermaker->SetValue(opt->watermaker+_T(" ")+opt->vol+_T("/")+opt->motorh);
-	m_textCtrlGuradChanged->SetValue(opt->guardChangeText);
-	m_textCtrlWayPoint->SetValue(opt->waypointText);
-	m_textCtrlChancedCourse->SetValue(opt->courseChangeText);
-	m_textCtrlEverySMText->SetValue(opt->everySMText);
-
-	m_timerText->SetValue(opt->ttext);
-
-	m_sDeg->SetValue(opt->Deg);
-	m_sMin->SetValue(opt->Min);
-	m_sSec->SetValue(opt->Sec);
-
-	m_sDist->SetValue(opt->distance);
-	m_sSpeed->SetValue(opt->speed);
-
-	m_sBaro->SetValue(opt->baro);
-	m_textCtrlTemperature->SetValue(opt->temperature);
-	m_smeter->SetValue(opt->meter);
-	m_sFeet->SetValue(opt->feet);
-	m_sFathom->SetValue(opt->fathom);
-
-	m_sKnots->SetValue(opt->windkts);
-	m_sMeterSec->SetValue(opt->windmeter);
-	m_sKmh->SetValue(opt->windkmh);
-
-	m_sLiter->SetValue(opt->vol);
-	m_sMotorh->SetValue(opt->motorh);
-    m_textCtrlEngine->SetValue(opt->engine);
-    m_textCtrlPropShaft->SetValue(opt->shaft);
-    m_textCtrRPM->SetValue(opt->rpm);
-
-	m_textCtrlAmpere->SetValue(opt->ampere);
-
-	m_Days->SetValue(opt->days);
-	m_Weeks->SetValue(opt->weeks);
-	m_textMonth->SetValue(opt->month);
-
-	choicesWind[0] = opt->windkts;
-	choicesWind[1] = opt->windmeter;
-	choicesWind[2] = opt->windkmh;
-	updateWindChoice();
-
-	m_choiceDepth->SetSelection(opt->showDepth);
-	m_choiceWaveSwell->SetSelection(opt->showWaveSwell);
-	m_choiceWind->SetSelection(opt->showWindSpeed);
-	m_choiceDir->SetSelection(opt->showWindDir);
-	m_choiceHeading->SetSelection(opt->showHeading);
-	m_choiceWindTo->SetSelection(opt->showWindHeading);
-
-	m_textCtrlHTMLEditorPath->SetValue(opt->htmlEditor);
-	m_textCtrlODTEditor->SetValue(opt->odtEditor);
-	m_textCtrlDataManager->SetValue(opt->dataManager);
-	m_textCtrlMailClient->SetValue(opt->mailClient);
-
-	if(opt->local == true)
-		m_radioBtnLocal->SetValue(true);
-	if(opt->gpsAuto == true)
-		m_radioBtnGPSAuto->SetValue(true);
-	if(opt->UTC == true)
-		m_radioBtnUTC->SetValue(true);
-
-	if(opt->traditional)
-		m_choicePositionFormat->SetSelection(1);
-	else
-		m_choicePositionFormat->SetSelection(0);
-
-	m_checkBoxToolTips->SetValue(opt->showToolTips);
-
-	m_choiceTzIndicator->SetSelection(opt->tzIndicator);
-	m_choiceTzHours->SetSelection(opt->tzHour);
-
-	m_checkBoxNoGPS->SetValue(opt->noGPS);
-    m_checkBoxEngine->SetValue(opt->engineMessageSails);
-    m_checkBoxEngineRunning->SetValue(opt->engineMessageRunning);
-	m_checkBoxSailsDown->SetValue(opt->engineAllwaysSailsDown);
-    m_checkBoxGenerator->SetValue(opt->generator);
-    m_checkBoxStatusBar->SetValue(opt->statusbar);
-
-    m_checkBoxKMLRoute->SetValue((opt->kmlRoute)?true:false);
-    m_checkBoxKMLTrack->SetValue((opt->kmlTrack)?true:false);
-    m_textCtrlKMLLineWidt->SetValue(opt->kmlLineWidth);
-    m_choiceKMLLineTranparency->SetSelection(opt->kmlLineTransparancy);
-    m_choiceKMLRouteLineColo->SetSelection(opt->kmlRouteColor);
-    m_choiceKMLTrackLineColor->SetSelection(opt->kmlTrackColor);
-
-    if(opt->bRPMIsChecked)
-    {
-        m_checkBoxEng1RPM->SetValue(opt->bEng1RPMIsChecked);
-        m_checkBoxEng2RPM->SetValue(opt->bEng2RPMIsChecked);
-        m_checkBoxGenRPM->SetValue(opt->bGenRPMIsChecked);
-        m_textCtrlEngine1->SetValue(opt->engine1Id);
-        m_textCtrlEngine2->SetValue(opt->engine2Id);
-        m_textCtrlGenerator->SetValue(opt->generatorId);
-        m_checkBoxNMEAUseRPM->SetValue(opt->NMEAUseERRPM);
+    m_checkBoxNoGPS->SetValue( opt->noGPS );
+    m_checkBoxEngine->SetValue( opt->engineMessageSails );
+    m_checkBoxEngineRunning->SetValue( opt->engineMessageRunning );
+    m_checkBoxSailsDown->SetValue( opt->engineAllwaysSailsDown );
+    m_checkBoxGenerator->SetValue( opt->generator );
+    m_checkBoxStatusBar->SetValue( opt->statusbar );
+    m_checkBoxWindspeeds->SetValue( opt->windspeeds );
+    m_checkBoxOverview->SetValue( opt->overviewlines );
+
+    m_checkBoxKMLRoute->SetValue( ( opt->kmlRoute )?true:false );
+    m_checkBoxKMLTrack->SetValue( ( opt->kmlTrack )?true:false );
+    m_textCtrlKMLLineWidt->SetValue( opt->kmlLineWidth );
+    m_choiceKMLLineTranparency->SetSelection( opt->kmlLineTransparancy );
+    m_choiceKMLRouteLineColo->SetSelection( opt->kmlRouteColor );
+    m_choiceKMLTrackLineColor->SetSelection( opt->kmlTrackColor );
+
+    if ( opt->bRPMIsChecked )
+    {
+        m_checkBoxEng1RPM->SetValue( opt->bEng1RPMIsChecked );
+        m_checkBoxEng2RPM->SetValue( opt->bEng2RPMIsChecked );
+        m_checkBoxGenRPM->SetValue( opt->bGenRPMIsChecked );
+        m_textCtrlEngine1->SetValue( opt->engine1Id );
+        m_textCtrlEngine2->SetValue( opt->engine2Id );
+        m_textCtrlGenerator->SetValue( opt->generatorId );
+        m_checkBoxNMEAUseRPM->SetValue( opt->NMEAUseERRPM );
     }
 
-    m_checkBoxNMEAUseWIMDA->SetValue(opt->NMEAUseWIMDA);
+    m_checkBoxNMEAUseWIMDA->SetValue( opt->NMEAUseWIMDA );
 
-	int row = 0;
-    for(unsigned int col = 0; col < opt->abrSails.Count(); col++)
+    int row = 0;
+    for ( unsigned int col = 0; col < opt->abrSails.Count(); col++ )
     {
-        m_gridSailNames->SetCellValue(row,0,opt->abrSails.Item(col));
-        m_gridSailNames->SetCellValue(row++,1,opt->sailsName.Item(col));
+        m_gridSailNames->SetCellValue( row,0,opt->abrSails.Item( col ) );
+        m_gridSailNames->SetCellValue( row++,1,opt->sailsName.Item( col ) );
     }
 }
 
 void LogbookOptions::OnChoiceNoEngines( wxCommandEvent& event )
 {
     opt->engines = m_choiceNoEngines->GetSelection();
-    if(log_pi->m_plogbook_window)
+    if ( log_pi->m_plogbook_window )
     {
-        if(opt->engines == 0)
+        if ( opt->engines == 0 )
         {
-            if(opt->engine2Running)
+            if ( opt->engine2Running )
             {
-                log_pi->m_plogbook_window->stopEngine2(false, false, true);
-                wxMessageBox(_("Your Engine #2 is still running .\n\nEngine #2 stopped now."),_("Information"));
+                log_pi->m_plogbook_window->stopEngine2( false, false, true );
+                wxMessageBox( _( "Your Engine #2 is still running .\n\nEngine #2 stopped now." ),_( "Information" ) );
             }
             else
             {
-                log_pi->m_plogbook_window->stopEngine2(false, false, false);
+                log_pi->m_plogbook_window->stopEngine2( false, false, false );
             }
         }
         else
         {
-            log_pi->m_plogbook_window->stopEngine2(true, true, false);
+            log_pi->m_plogbook_window->stopEngine2( true, true, false );
         }
         log_pi->m_plogbook_window->setToNumberEngine();
     }
@@ -2254,106 +2229,108 @@
 
 void LogbookOptions::getValues()
 {
-	opt->popup = m_checkBoxPopUp->GetValue();
+    opt->popup = m_checkBoxPopUp->GetValue();
 
-	opt->dateformat = m_choiceDateFormat->GetSelection();
-	opt->dateseparatorindiv = m_textCtrlDateSeparator->GetValue();
-	opt->dateseparatorlocale = wxString(LogbookDialog::dateSeparator);
-	opt->date1 = m_choiceDate1->GetSelection();
-	opt->date2 = m_choiceDate2->GetSelection();
-	opt->date3 = m_choiceDate3->GetSelection();
+    opt->dateformat = m_choiceDateFormat->GetSelection();
+    opt->dateseparatorindiv = m_textCtrlDateSeparator->GetValue();
+    opt->dateseparatorlocale = wxString( LogbookDialog::dateSeparator );
+    opt->date1 = m_choiceDate1->GetSelection();
+    opt->date2 = m_choiceDate2->GetSelection();
+    opt->date3 = m_choiceDate3->GetSelection();
     opt->engines = m_choiceNoEngines->GetSelection();
 
-	opt->timeformat = m_choiceTimeFormat->GetSelection();
-	opt->noseconds = m_checkBoxNoSeconds->GetValue();
+    opt->timeformat = m_choiceTimeFormat->GetSelection();
+    opt->noseconds = m_checkBoxNoSeconds->GetValue();
 
-	wxString t = m_textCtrlWatermaker->GetValue();
-	opt->watermaker =  t.substr(0,t.find_first_of(' '));
-	t = m_textCtrlBank1->GetValue();
-	opt->bank1 =  t.substr(0,t.find_first_of(' '));
-	t = m_textCtrlBank2->GetValue();
-	opt->bank2 =  t.substr(0,t.find_first_of(' '));
-	t = m_textCtrlTankFuel->GetValue();
-	opt->fuelTank =  t.substr(0,t.find_first_of(' '));
-	t = m_textCtrlTankWater->GetValue();
-	opt->waterTank =  t.substr(0,t.find_first_of(' '));
-	opt->guardChangeText = m_textCtrlGuradChanged->GetValue();
-	opt->waypointText = m_textCtrlWayPoint->GetValue();
-	opt->courseChangeText = m_textCtrlChancedCourse->GetValue();
-	opt->everySMText = m_textCtrlEverySMText->GetValue();
-
-	opt->ttext = m_timerText->GetValue();
-
-	opt->timerSec = (wxAtol(opt->thour)* 3600000 +
-					 wxAtol(opt->tmin) *60000 +
-					 wxAtol(opt->tsec) * 1000);
-
-	opt->Deg = m_sDeg->GetValue();
-	opt->Min = m_sMin->GetValue();
-	opt->Sec =m_sSec->GetValue();
-
-	opt->distance = m_sDist->GetValue();
-	opt->speed    = m_sSpeed->GetValue();
-
-	opt->baro        = m_sBaro->GetValue();
-	opt->temperature = m_textCtrlTemperature->GetValue();
-	opt->meter       = m_smeter->GetValue();
-	opt->feet        = m_sFeet->GetValue();
-	opt->fathom      = m_sFathom->GetValue();
-
-	opt->windkts   = m_sKnots->GetValue();
-	opt->windmeter = m_sMeterSec->GetValue();
-	opt->windkmh   = m_sKmh->GetValue();
+    wxString t = m_textCtrlWatermaker->GetValue();
+    opt->watermaker =  t.substr( 0,t.find_first_of( ' ' ) );
+    t = m_textCtrlBank1->GetValue();
+    opt->bank1 =  t.substr( 0,t.find_first_of( ' ' ) );
+    t = m_textCtrlBank2->GetValue();
+    opt->bank2 =  t.substr( 0,t.find_first_of( ' ' ) );
+    t = m_textCtrlTankFuel->GetValue();
+    opt->fuelTank =  t.substr( 0,t.find_first_of( ' ' ) );
+    t = m_textCtrlTankWater->GetValue();
+    opt->waterTank =  t.substr( 0,t.find_first_of( ' ' ) );
+    opt->guardChangeText = m_textCtrlGuradChanged->GetValue();
+    opt->waypointText = m_textCtrlWayPoint->GetValue();
+    opt->courseChangeText = m_textCtrlChancedCourse->GetValue();
+    opt->everySMText = m_textCtrlEverySMText->GetValue();
+
+    opt->ttext = m_timerText->GetValue();
+
+    opt->timerSec = ( wxAtol( opt->thour )* 3600000 +
+                      wxAtol( opt->tmin ) *60000 +
+                      wxAtol( opt->tsec ) * 1000 );
+
+    opt->Deg = m_sDeg->GetValue();
+    opt->Min = m_sMin->GetValue();
+    opt->Sec =m_sSec->GetValue();
+
+    opt->distance = m_sDist->GetValue();
+    opt->speed    = m_sSpeed->GetValue();
+
+    opt->baro        = m_sBaro->GetValue();
+    opt->temperature = m_textCtrlTemperature->GetValue();
+    opt->meter       = m_smeter->GetValue();
+    opt->feet        = m_sFeet->GetValue();
+    opt->fathom      = m_sFathom->GetValue();
+
+    opt->windkts   = m_sKnots->GetValue();
+    opt->windmeter = m_sMeterSec->GetValue();
+    opt->windkmh   = m_sKmh->GetValue();
 
-	opt->vol    = m_sLiter->GetValue();
-	opt->motorh = m_sMotorh->GetValue();
+    opt->vol    = m_sLiter->GetValue();
+    opt->motorh = m_sMotorh->GetValue();
     opt->engine = m_textCtrlEngine->GetValue();
     opt->shaft = m_textCtrlPropShaft->GetValue();
     opt->rpm = m_textCtrRPM->GetValue();
-	opt->ampere = m_textCtrlAmpere->GetValue();
+    opt->ampere = m_textCtrlAmpere->GetValue();
 
-	opt->days = m_Days->GetValue();
-	opt->weeks = m_Weeks->GetValue();
-	opt->month = m_textMonth->GetValue();
-
-	opt->showDepth       = m_choiceDepth->GetSelection();
-	opt->showWaveSwell   = m_choiceWaveSwell->GetSelection();
-	opt->showWindSpeed   = m_choiceWind->GetSelection();
-	opt->showWindDir     = m_choiceDir->GetSelection();
-	opt->showHeading     = m_choiceHeading->GetSelection();
-	opt->showWindHeading = m_choiceWindTo->GetSelection();
-
-	opt->htmlEditor = m_textCtrlHTMLEditorPath->GetValue();
-	opt->odtEditor  = m_textCtrlODTEditor->GetValue();
-	opt->dataManager= m_textCtrlDataManager->GetValue();
-	opt->mailClient = m_textCtrlMailClient->GetValue();
-
-	if(m_radioBtnLocal->GetValue() == true)
-		opt->local = true;
-	if(m_radioBtnGPSAuto->GetValue() == true)
-	{
-		opt->gpsAuto = true;
-		opt->local = true;
-	}
-	if(this->m_radioBtnUTC->GetValue() == true)
-		opt->UTC = true;
-
-	if(	m_choicePositionFormat->GetSelection())
-		opt->traditional = true;
-	else
-		opt->traditional= false;
-
-	opt->showToolTips = m_checkBoxToolTips->GetValue();
-
-	opt->tzIndicator = m_choiceTzIndicator->GetSelection();
-	opt->tzHour = m_choiceTzHours->GetSelection();
-	opt->noGPS = m_checkBoxNoGPS->GetValue();
+    opt->days = m_Days->GetValue();
+    opt->weeks = m_Weeks->GetValue();
+    opt->month = m_textMonth->GetValue();
+
+    opt->showDepth       = m_choiceDepth->GetSelection();
+    opt->showWaveSwell   = m_choiceWaveSwell->GetSelection();
+    opt->showWindSpeed   = m_choiceWind->GetSelection();
+    opt->showWindDir     = m_choiceDir->GetSelection();
+    opt->showHeading     = m_choiceHeading->GetSelection();
+    opt->showWindHeading = m_choiceWindTo->GetSelection();
+
+    opt->htmlEditor = m_textCtrlHTMLEditorPath->GetValue();
+    opt->odtEditor  = m_textCtrlODTEditor->GetValue();
+    opt->dataManager= m_textCtrlDataManager->GetValue();
+    opt->mailClient = m_textCtrlMailClient->GetValue();
+
+    if ( m_radioBtnLocal->GetValue() == true )
+        opt->local = true;
+    if ( m_radioBtnGPSAuto->GetValue() == true )
+    {
+        opt->gpsAuto = true;
+        opt->local = true;
+    }
+    if ( this->m_radioBtnUTC->GetValue() == true )
+        opt->UTC = true;
+
+    if (	m_choicePositionFormat->GetSelection() )
+        opt->traditional = true;
+    else
+        opt->traditional= false;
+
+    opt->showToolTips = m_checkBoxToolTips->GetValue();
+
+    opt->tzIndicator = m_choiceTzIndicator->GetSelection();
+    opt->tzHour = m_choiceTzHours->GetSelection();
+    opt->noGPS = m_checkBoxNoGPS->GetValue();
     opt->engineMessageSails = m_checkBoxEngine->GetValue();
     opt->engineMessageRunning = m_checkBoxEngineRunning->GetValue();
     opt->engineAllwaysSailsDown = m_checkBoxSailsDown->GetValue();
     opt->generator = m_checkBoxGenerator->GetValue();
     opt->statusbar = m_checkBoxStatusBar->GetValue();
-    
+    opt->windspeeds = m_checkBoxWindspeeds->GetValue();
+    opt->overviewlines = m_checkBoxOverview->GetValue();
+
     opt->kmlRoute = m_checkBoxKMLRoute->GetValue();
     opt->kmlTrack = m_checkBoxKMLTrack->GetValue();
     opt->kmlLineWidth = m_textCtrlKMLLineWidt->GetValue();
@@ -2374,236 +2351,236 @@
     //int row = 0;
     opt->abrSails.Clear();
     opt->sailsName.Clear();
-    for(int row = 0; row < m_gridSailNames->GetNumberRows(); row++)
+    for ( int row = 0; row < m_gridSailNames->GetNumberRows(); row++ )
     {
-        opt->abrSails.Add(m_gridSailNames->GetCellValue(row,0));
-        opt->sailsName.Add(m_gridSailNames->GetCellValue(row,1));
+        opt->abrSails.Add( m_gridSailNames->GetCellValue( row,0 ) );
+        opt->sailsName.Add( m_gridSailNames->GetCellValue( row,1 ) );
     }
 }
 
 void LogbookOptions::onRadioBtnUTC( wxCommandEvent& ev )
 {
-	if(ev.IsChecked())
-	{
-		opt->local = false;
-		opt->gpsAuto = false;
-		opt->UTC = true;
-		this->m_choiceTzIndicator->Enable(false);
-		this->m_choiceTzHours->Enable(false);
-	}
+    if ( ev.IsChecked() )
+    {
+        opt->local = false;
+        opt->gpsAuto = false;
+        opt->UTC = true;
+        this->m_choiceTzIndicator->Enable( false );
+        this->m_choiceTzHours->Enable( false );
+    }
 
 }
 void LogbookOptions::onRadioBtnLocal( wxCommandEvent& ev )
 {
-	if(ev.IsChecked())
-	{
-		opt->local = true;
-		opt->gpsAuto = false;
-		opt->UTC = false;
-		this->m_choiceTzIndicator->Enable(true);
-		this->m_choiceTzHours->Enable(true); 
-	}
+    if ( ev.IsChecked() )
+    {
+        opt->local = true;
+        opt->gpsAuto = false;
+        opt->UTC = false;
+        this->m_choiceTzIndicator->Enable( true );
+        this->m_choiceTzHours->Enable( true );
+    }
 }
 
 void LogbookOptions::onRadioBtnGPSAuto( wxCommandEvent& ev )
 {
-	if(ev.IsChecked())
-	{
-		opt->local = true;
-		opt->gpsAuto = true;
-		opt->UTC = false;
-		this->m_choiceTzIndicator->Enable(true);
-		this->m_choiceTzHours->Enable(true);
-		this->m_choiceTzHours->SetSelection(opt->tzHour);
-		this->m_choiceTzIndicator->SetSelection(opt->tzIndicator);
-		this->m_choiceTzHours->Refresh();
-		this->m_choiceTzIndicator->Refresh();
+    if ( ev.IsChecked() )
+    {
+        opt->local = true;
+        opt->gpsAuto = true;
+        opt->UTC = false;
+        this->m_choiceTzIndicator->Enable( true );
+        this->m_choiceTzHours->Enable( true );
+        this->m_choiceTzHours->SetSelection( opt->tzHour );
+        this->m_choiceTzIndicator->SetSelection( opt->tzIndicator );
+        this->m_choiceTzHours->Refresh();
+        this->m_choiceTzIndicator->Refresh();
 
-	}
+    }
 }
 
 void LogbookOptions::onButtonClickInstallHTMLFiles( wxCommandEvent& event )
 {
-	log_pi->loadLayouts(this);
+    log_pi->loadLayouts( this );
 }
 
-void LogbookOptions::onButtonHTMLEditor(wxCommandEvent & ev)
+void LogbookOptions::onButtonHTMLEditor( wxCommandEvent & ev )
 {
-	wxFileDialog *openFileDialog = 
-			new wxFileDialog(this, _("Set Path to HTML-Editor"), _T(""), _T(""),
-										   _T(""), 
-										   wxFD_OPEN);
+    wxFileDialog *openFileDialog =
+        new wxFileDialog( this, _( "Set Path to HTML-Editor" ), _T( "" ), _T( "" ),
+                          _T( "" ),
+                          wxFD_OPEN );
 
-	if (openFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    if ( openFileDialog->ShowModal() == wxID_CANCEL )
+        return;
 
-	m_textCtrlHTMLEditorPath->SetValue(openFileDialog->GetPath());
-	opt->htmlEditor = openFileDialog->GetPath();
+    m_textCtrlHTMLEditorPath->SetValue( openFileDialog->GetPath() );
+    opt->htmlEditor = openFileDialog->GetPath();
 }
 
-void LogbookOptions::onButtonClickDataManager(wxCommandEvent& ev)
+void LogbookOptions::onButtonClickDataManager( wxCommandEvent& ev )
 {
-	wxFileDialog *openFileDialog = 
-			new wxFileDialog(this, _("Set Path to DataManager"), _T(""), _T(""),
-										   _T(""), 
-										   wxFD_OPEN);
+    wxFileDialog *openFileDialog =
+        new wxFileDialog( this, _( "Set Path to DataManager" ), _T( "" ), _T( "" ),
+                          _T( "" ),
+                          wxFD_OPEN );
 
-	if (openFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    if ( openFileDialog->ShowModal() == wxID_CANCEL )
+        return;
 
-	m_textCtrlDataManager->SetValue(openFileDialog->GetPath());
-	opt->dataManager = openFileDialog->GetPath();
+    m_textCtrlDataManager->SetValue( openFileDialog->GetPath() );
+    opt->dataManager = openFileDialog->GetPath();
 }
 
-void LogbookOptions::onButtonClickMail(wxCommandEvent& ev)
+void LogbookOptions::onButtonClickMail( wxCommandEvent& ev )
 {
-	wxFileDialog *openFileDialog = 
-			new wxFileDialog(this, _("Set Path to MailClient"), _T(""), _T(""),
-										   _T(""), 
-										   wxFD_OPEN);
+    wxFileDialog *openFileDialog =
+        new wxFileDialog( this, _( "Set Path to MailClient" ), _T( "" ), _T( "" ),
+                          _T( "" ),
+                          wxFD_OPEN );
 
-	if (openFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    if ( openFileDialog->ShowModal() == wxID_CANCEL )
+        return;
 
-	m_textCtrlMailClient->SetValue(openFileDialog->GetPath());
-	opt->mailClient = openFileDialog->GetPath();
+    m_textCtrlMailClient->SetValue( openFileDialog->GetPath() );
+    opt->mailClient = openFileDialog->GetPath();
 }
 
-void LogbookOptions::onButtonClickODT(wxCommandEvent& ev)
+void LogbookOptions::onButtonClickODT( wxCommandEvent& ev )
 {
-	wxFileDialog *openFileDialog = 
-			new wxFileDialog(this, _("Set Path to ODT-Editor"), _T(""), _T(""),
-										   _T(""), 
-										   wxFD_OPEN);
+    wxFileDialog *openFileDialog =
+        new wxFileDialog( this, _( "Set Path to ODT-Editor" ), _T( "" ), _T( "" ),
+                          _T( "" ),
+                          wxFD_OPEN );
 
-	if (openFileDialog->ShowModal() == wxID_CANCEL)
-            return;
+    if ( openFileDialog->ShowModal() == wxID_CANCEL )
+        return;
 
-	m_textCtrlODTEditor->SetValue(openFileDialog->GetPath());
-	opt->odtEditor = openFileDialog->GetPath();
+    m_textCtrlODTEditor->SetValue( openFileDialog->GetPath() );
+    opt->odtEditor = openFileDialog->GetPath();
 }
 
 
 
 void LogbookOptions::onTextEnterm_sKnots( wxCommandEvent& ev )
 {
-	choicesWind[0] = ev.GetString();
-	updateWindChoice();
-	m_sMeterSec->SetFocus();
+    choicesWind[0] = ev.GetString();
+    updateWindChoice();
+    m_sMeterSec->SetFocus();
 }
 
 void LogbookOptions::onTextEnterm_sMeterSec( wxCommandEvent& ev )
 {
-	choicesWind[1] = ev.GetString();
-	updateWindChoice();
-	m_sKmh->SetFocus();
+    choicesWind[1] = ev.GetString();
+    updateWindChoice();
+    m_sKmh->SetFocus();
 }
 
 void LogbookOptions::onTextEnterm_sKmh( wxCommandEvent& ev )
 {
-	choicesWind[2] = ev.GetString();
-	updateWindChoice();
-	m_choiceWind->SetFocus();
+    choicesWind[2] = ev.GetString();
+    updateWindChoice();
+    m_choiceWind->SetFocus();
 }
 
 void LogbookOptions::onTextm_sLiter( wxCommandEvent& event )
 {
-	wxString t = wxString::Format(_T("%i %s/%s"),wxAtoi(opt->watermaker),m_sLiter->GetValue().c_str(),opt->motorh.c_str());
-	this->m_textCtrlWatermaker->SetValue(t);
+    wxString t = wxString::Format( _T( "%i %s/%s" ),wxAtoi( opt->watermaker ),m_sLiter->GetValue().c_str(),opt->motorh.c_str() );
+    this->m_textCtrlWatermaker->SetValue( t );
 
-	t = wxString::Format(_T("%i %s"),wxAtoi(m_textCtrlTankWater->GetValue()),m_sLiter->GetValue().c_str());
-	this->m_textCtrlTankWater->SetValue(t);
+    t = wxString::Format( _T( "%i %s" ),wxAtoi( m_textCtrlTankWater->GetValue() ),m_sLiter->GetValue().c_str() );
+    this->m_textCtrlTankWater->SetValue( t );
 
-	t = wxString::Format(_T("%i %s"),wxAtoi(m_textCtrlTankFuel->GetValue()),m_sLiter->GetValue().c_str());
-	this->m_textCtrlTankFuel->SetValue(t);
+    t = wxString::Format( _T( "%i %s" ),wxAtoi( m_textCtrlTankFuel->GetValue() ),m_sLiter->GetValue().c_str() );
+    this->m_textCtrlTankFuel->SetValue( t );
 
 }
 
 void LogbookOptions::OnTextEnterm_textCtrlWatermaker( wxCommandEvent& event )
 {
-	long a;
-	wxString t = m_textCtrlWatermaker->GetValue();
-	t.ToLong(&a);
-	m_textCtrlWatermaker->Clear();
-	t = wxString::Format(_T("%i %s/%s"),a, m_sLiter->GetValue().c_str(),opt->motorh.c_str());
+    long a;
+    wxString t = m_textCtrlWatermaker->GetValue();
+    t.ToLong( &a );
+    m_textCtrlWatermaker->Clear();
+    t = wxString::Format( _T( "%i %s/%s" ),a, m_sLiter->GetValue().c_str(),opt->motorh.c_str() );
 
-	m_textCtrlWatermaker->SetValue(t);
-	m_textCtrlTankFuel->SetFocus();
+    m_textCtrlWatermaker->SetValue( t );
+    m_textCtrlTankFuel->SetFocus();
 }
 
 void LogbookOptions::OnTextEnterFuelTank( wxCommandEvent& event )
 {
-	long a;
-	wxString t = m_textCtrlTankFuel->GetValue();
-	t.ToLong(&a);
-	m_textCtrlTankFuel->Clear();
-	t = wxString::Format(_T("%i %s"),a, m_sLiter->GetValue().c_str());
+    long a;
+    wxString t = m_textCtrlTankFuel->GetValue();
+    t.ToLong( &a );
+    m_textCtrlTankFuel->Clear();
+    t = wxString::Format( _T( "%i %s" ),a, m_sLiter->GetValue().c_str() );
 
-	m_textCtrlTankFuel->SetValue(t);
-	m_textCtrlBank1->SetFocus();
+    m_textCtrlTankFuel->SetValue( t );
+    m_textCtrlBank1->SetFocus();
 }
 
 void LogbookOptions::OnTextEnterWaterTank( wxCommandEvent& event )
 {
-	long a;
-	wxString t = m_textCtrlTankWater->GetValue();
-	t.ToLong(&a);
-	m_textCtrlTankWater->Clear();
-	t = wxString::Format(_T("%i %s"),a, m_sLiter->GetValue().c_str());
+    long a;
+    wxString t = m_textCtrlTankWater->GetValue();
+    t.ToLong( &a );
+    m_textCtrlTankWater->Clear();
+    t = wxString::Format( _T( "%i %s" ),a, m_sLiter->GetValue().c_str() );
 
-	m_textCtrlTankWater->SetValue(t);
-	m_textCtrlWatermaker->SetFocus();
+    m_textCtrlTankWater->SetValue( t );
+    m_textCtrlWatermaker->SetFocus();
 }
 
 void LogbookOptions::OnTextEnterBank1( wxCommandEvent& event )
 {
-	long a;
-	wxString t = m_textCtrlBank1->GetValue();
-	t.ToLong(&a);
-	m_textCtrlBank1->Clear();
-	t = wxString::Format(_T("%i %s"),a, opt->ampereh.c_str());
+    long a;
+    wxString t = m_textCtrlBank1->GetValue();
+    t.ToLong( &a );
+    m_textCtrlBank1->Clear();
+    t = wxString::Format( _T( "%i %s" ),a, opt->ampereh.c_str() );
 
-	m_textCtrlBank1->SetValue(t);
-	m_textCtrlBank2->SetFocus();
+    m_textCtrlBank1->SetValue( t );
+    m_textCtrlBank2->SetFocus();
 }
 
 void LogbookOptions::onTextEnterBank2( wxCommandEvent& event )
 {
-	long a;
-	wxString t = m_textCtrlBank2->GetValue();
-	t.ToLong(&a);
-	m_textCtrlBank2->Clear();
-	t = wxString::Format(_T("%i %s"),a, opt->ampereh.c_str());
+    long a;
+    wxString t = m_textCtrlBank2->GetValue();
+    t.ToLong( &a );
+    m_textCtrlBank2->Clear();
+    t = wxString::Format( _T( "%i %s" ),a, opt->ampereh.c_str() );
 
-	m_textCtrlBank2->SetValue(t);
-	m_textCtrlTankWater->SetFocus();
+    m_textCtrlBank2->SetValue( t );
+    m_textCtrlTankWater->SetFocus();
 }
 
 void LogbookOptions::onCheckBoNoGPS( wxCommandEvent& event )
 {
-	opt->noGPS = m_checkBoxNoGPS->GetValue();
+    opt->noGPS = m_checkBoxNoGPS->GetValue();
 }
 
 void LogbookOptions::updateChoiceBoxes()
 {
-	LogbookDialog *dialog = log_pi->m_plogbook_window;
+    LogbookDialog *dialog = log_pi->m_plogbook_window;
 
-	if(dialog != NULL)
-	{
-		dialog->loadLayoutChoice(LogbookDialog::LOGBOOK,dialog->logbook->layout_locn, dialog->logbookChoice,opt->layoutPrefix[LogbookDialog::LOGBOOK]);
-        dialog->loadLayoutChoice(LogbookDialog::OVERVIEW,dialog->overview->layout_locn, dialog->overviewChoice,opt->layoutPrefix[LogbookDialog::OVERVIEW]);
-        dialog->loadLayoutChoice(LogbookDialog::CREW,dialog->crewList->layout_locn, dialog->crewChoice,opt->layoutPrefix[LogbookDialog::CREW]);
-        dialog->loadLayoutChoice(LogbookDialog::BOAT,dialog->boat->layout_locn, dialog->boatChoice,opt->layoutPrefix[LogbookDialog::BOAT]);
-        dialog->loadLayoutChoice(LogbookDialog::GSERVICE,dialog->maintenance->layout_locnService, dialog->m_choiceSelectLayoutService,opt->layoutPrefix[LogbookDialog::GSERVICE]);
-        dialog->loadLayoutChoice(LogbookDialog::GREPAIRS,dialog->maintenance->layout_locnRepairs, dialog->m_choiceSelectLayoutRepairs,opt->layoutPrefix[LogbookDialog::GREPAIRS]);
-        dialog->loadLayoutChoice(LogbookDialog::GBUYPARTS,dialog->maintenance->layout_locnBuyParts, dialog->m_choiceSelectLayoutBuyParts,opt->layoutPrefix[LogbookDialog::GBUYPARTS]);
-	}
+    if ( dialog != NULL )
+    {
+        dialog->loadLayoutChoice( LogbookDialog::LOGBOOK,dialog->logbook->layout_locn, dialog->logbookChoice,opt->layoutPrefix[LogbookDialog::LOGBOOK] );
+        dialog->loadLayoutChoice( LogbookDialog::OVERVIEW,dialog->overview->layout_locn, dialog->overviewChoice,opt->layoutPrefix[LogbookDialog::OVERVIEW] );
+        dialog->loadLayoutChoice( LogbookDialog::CREW,dialog->crewList->layout_locn, dialog->crewChoice,opt->layoutPrefix[LogbookDialog::CREW] );
+        dialog->loadLayoutChoice( LogbookDialog::BOAT,dialog->boat->layout_locn, dialog->boatChoice,opt->layoutPrefix[LogbookDialog::BOAT] );
+        dialog->loadLayoutChoice( LogbookDialog::GSERVICE,dialog->maintenance->layout_locnService, dialog->m_choiceSelectLayoutService,opt->layoutPrefix[LogbookDialog::GSERVICE] );
+        dialog->loadLayoutChoice( LogbookDialog::GREPAIRS,dialog->maintenance->layout_locnRepairs, dialog->m_choiceSelectLayoutRepairs,opt->layoutPrefix[LogbookDialog::GREPAIRS] );
+        dialog->loadLayoutChoice( LogbookDialog::GBUYPARTS,dialog->maintenance->layout_locnBuyParts, dialog->m_choiceSelectLayoutBuyParts,opt->layoutPrefix[LogbookDialog::GBUYPARTS] );
+    }
 }
 
 void LogbookOptions::updateWindChoice()
 {
-	int s = m_choiceWind->GetSelection();
-	for(int i = 0; i < 3; i++)
-		m_choiceWind->SetString(i,choicesWind[i]);
-	m_choiceWind->SetSelection(s);
+    int s = m_choiceWind->GetSelection();
+    for ( int i = 0; i < 3; i++ )
+        m_choiceWind->SetString( i,choicesWind[i] );
+    m_choiceWind->SetSelection( s );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/LogbookOptions.h opencpn-plugin-logbookkonni-1.2024/src/LogbookOptions.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/LogbookOptions.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/LogbookOptions.h	2016-02-25 13:06:29.000000000 +0000
@@ -11,7 +11,7 @@
 #include "wx/wxprec.h"
 
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
 #ifdef __WXOSX__
@@ -68,300 +68,303 @@
 class Options;
 class logbook_pi;
 
-class LogbookOptions : public wxDialog 
+class LogbookOptions : public wxDialog
 {
-	public:
-		wxScrolledWindow* m_scrolledWindow1;
-		wxNotebook* m_notebook4;
-		wxPanel* m_panel15;
-		wxStaticText* m_staticText132;
-		wxChoice* m_choiceDateFormat;
-		wxChoice* m_choiceDate1;
-		wxChoice* m_choiceDate2;
-		wxChoice* m_choiceDate3;
-		wxStaticText* m_staticText128;
-		wxTextCtrl* m_textCtrlDateSeparator;
-		wxStaticText* m_staticTextDate;
-		wxStaticText* m_staticText133;
-		wxChoice* m_choiceTimeFormat;
-		wxCheckBox* m_checkBoxNoSeconds;
-        wxStaticText* m_staticText59;
-		wxStaticText* m_staticTextTime;
-		wxRadioButton* m_radioBtnUTC;
-		wxStaticText* m_staticText71;
-		wxStaticLine* m_staticline44;
-		wxCheckBox* m_checkBoxShowLogbook;
-		wxStaticText* m_staticText76;
-        wxStaticText* m_staticText1361;
-		wxCheckBox* m_checkBoxShowOnlySelectedLayouts;
-		wxStaticText* m_staticText741;
-		wxStaticLine* m_staticline25;
-		wxStaticLine* m_staticline22;
-		wxStaticText* m_staticText123;
-		wxStaticText* m_staticText56;
-		wxTextCtrl* m_timerText;
-		wxStaticText* m_staticText121;
-		wxStaticText* m_staticText122;
-		wxStaticText* m_staticText1231;
-		wxStaticText* m_staticText124;
-        wxCheckBox* m_checkBoxPopUp;
-		wxStaticLine* m_staticline10;
-		wxStaticText* m_staticText731;
-		wxStaticText* m_staticText751;
-		wxButton* m_buttonInstallHTMLFiles;
-		wxButton* m_buttonUninstall;
-		wxStaticLine* m_staticline261;
-		wxPanel* m_panel20;
-		wxStaticText* m_staticText1041;
-		wxStaticLine* m_staticline34;
-		wxStaticText* m_staticText99;
-		wxStaticText* m_staticText100;
-		wxStaticText* m_staticText102;
-		wxStaticLine* m_staticline33;
-		wxStaticText* m_staticText96;
-		wxStaticText* m_staticText97;
-		wxStaticLine* m_staticline32;
-		wxStaticText* m_staticText104;
-		wxStaticText* m_staticText105;
-		wxStaticText* m_staticText107;
-		wxPanel* m_panel16;
-		wxStaticText* m_staticText34;
-		wxStaticText* m_staticText31;
-		wxTextCtrl* m_sDeg;
-		wxStaticText* m_staticText35;
-		wxTextCtrl* m_sMin;
-		wxStaticText* m_staticText36;
-		wxTextCtrl* m_sSec;
-		wxStaticText* m_staticText38;
-		wxTextCtrl* m_sDist;
-		wxStaticText* m_staticText39;
-		wxTextCtrl* m_sSpeed;
-		wxStaticText* m_staticText40;
-		wxStaticText* m_staticText41;
-		wxTextCtrl* m_smeter;
-		wxStaticText* m_staticText63;
-		wxStaticText* m_staticText48;
-		wxTextCtrl* m_sFeet;
-		wxStaticText* m_staticText632;
-		wxStaticText* m_staticText49;
-		wxTextCtrl* m_sFathom;
-		wxStaticText* m_staticText42;
-		wxStaticText* m_staticText43;
-		wxTextCtrl* m_sBaro;
-		wxStaticText* m_staticText44;
-		wxTextCtrl* m_sKnots;
-		wxTextCtrl* m_sMeterSec;
-		wxTextCtrl* m_sKmh;
-		wxStaticText* m_staticText791;
-		wxStaticText* m_staticText46;
-		wxStaticText* m_staticText47;
-		wxTextCtrl* m_sLiter;
-		wxStaticText* m_staticText50;
-		wxTextCtrl* m_sMotorh;
-		wxStaticText* m_staticText106;
-        wxStaticText* m_staticText135;
-        wxStaticText* m_staticText137;
-        wxStaticText* m_staticText136;
-		wxStaticText* m_staticText70;
-		wxStaticText* m_staticText712;
-		wxStaticText* m_staticText72;
-		wxStaticText* m_staticText73;
-		wxStaticLine* m_staticline251;
-		wxStaticText* m_staticText75;
-		wxStaticLine* m_staticline26;
-		wxStaticText* m_staticText51;
-		wxChoice* m_choiceWind;
-		wxStaticText* m_staticText45;
-		wxChoice* m_choiceDir;
-		wxPanel* m_panel17;
-		wxStaticText* m_staticText761;
-		wxBitmapButton* m_bpButtonODT;
-		wxStaticText* m_staticText77;
-		wxBitmapButton* m_bpButtonDatamanager;
-		wxStaticText* m_staticText78;
-		wxBitmapButton* m_bpButtonMail;
-		wxStaticText* m_staticText79;
-		wxButton* m_buttonResetPath;
-        wxPanel* m_panel24;
-        wxNotebook* m_notebook7;
-        wxPanel* m_panel27;
-        wxStaticText* m_staticText1381;
-        wxCheckBox* m_checkBoxKMLRoute;
-        wxCheckBox* m_checkBoxKMLTrack;
-        wxStaticText* m_staticText1281;
-        wxStaticText* m_staticText131;
-        wxStaticText* m_staticText129;
-        wxStaticText* m_staticText1291;
-        wxPanel* m_panel28;
-	wxStaticText* m_staticTextUseRPM;
-        wxStaticText* m_staticTextRPMSentence;
-        wxToggleButton* m_toggleBtnRPMCheck;
-        wxCheckBox* m_checkBoxEng1RPM;
-        wxTextCtrl* m_textCtrlEngine1;
-        wxCheckBox* m_checkBoxEng2RPM;
-        wxTextCtrl* m_textCtrlEngine2;
-        wxCheckBox* m_checkBoxGenRPM;
-        wxTextCtrl* m_textCtrlGenerator;
-        wxButton* m_buttonToSailsSpace;
-        wxStaticText* m_staticText1351;
-        wxButton* m_buttonBackToSails;
-        wxButton* m_button60;
-        wxButton* m_button61;
-        wxButton* m_button62;
-        wxButton* m_button63;
-        wxButton* m_buttonSpaceRPlus;
-        wxButton* m_buttonSpaceRMinus;
-        wxButton* m_buttonSpaceCPlus;
-        wxButton* m_buttonSpaceCMinus;
-        wxButton* m_buttonSpaceReset;
-		wxStdDialogButtonSizer* m_sdbSizer1;
-		wxButton* m_sdbSizer1OK;
-		wxButton* m_sdbSizer1Cancel;
-        wxCheckBox* m_checkBoxSailsDown;
-        wxCheckBox* m_checkBoxStatusBar;
-
-		wxDateTime textCtrlDate;
-
-		// Virtual event handlers, overide them in your derived class
-        virtual void OnClose( wxCloseEvent& event );
-        virtual void OnChoiceDateFormat( wxCommandEvent& event );
-        virtual void OnChoiceDate1( wxCommandEvent& event );
-        virtual void OnChoiceDate2( wxCommandEvent& event );
-        virtual void OnChoiceDate3( wxCommandEvent& event );
-        virtual void OnTextDateSeparator( wxCommandEvent& event );
-        virtual void OnChoiceTimeFormat( wxCommandEvent& event );
-        virtual void OnCheckboxNoSeconds( wxCommandEvent& event );
-        virtual void onRadioBtnUTC( wxCommandEvent& event );
-        virtual void onRadioBtnLocal( wxCommandEvent& event );
-        virtual void onRadioBtnGPSAuto( wxCommandEvent& event );
-        virtual void onChoicePositionFormat( wxCommandEvent& event );
-        virtual void onCheckBoxToolTips( wxCommandEvent& event );
-        virtual void OnChoiceNoEngines( wxCommandEvent& event );
-        virtual void OnCheckBoxEngineMessage( wxCommandEvent& event );
-        virtual void OnCheckBoxGeneratorMessage( wxCommandEvent& event );
-        virtual void OnCheckBoxEngineRunning( wxCommandEvent& event );
-        virtual void onCheckBoNoGPS( wxCommandEvent& event );
-        virtual void onButtonClickInstallHTMLFiles( wxCommandEvent& event );
-        virtual void OnButtonClickUninstall( wxCommandEvent& event );
-        virtual void OnTextEnterWaterTank( wxCommandEvent& event );
-        virtual void OnTextEnterm_textCtrlWatermaker( wxCommandEvent& event );
-        virtual void OnTextEnterFuelTank( wxCommandEvent& event );
-        virtual void OnTextEnterBank1( wxCommandEvent& event );
-        virtual void onTextEnterBank2( wxCommandEvent& event );
-        virtual void onTextEnterm_sKnots( wxCommandEvent& event );
-        virtual void onTextEnterm_sMeterSec( wxCommandEvent& event );
-        virtual void onTextEnterm_sKmh( wxCommandEvent& event );
-        virtual void onTextm_sLiter( wxCommandEvent& event );
-        virtual void onButtonClickODT( wxCommandEvent& event );
-        virtual void onButtonClickDataManager( wxCommandEvent& event );
-        virtual void onButtonClickMail( wxCommandEvent& event );
-        virtual void onButtonHTMLEditor( wxCommandEvent& event );
-        virtual void OnButtonResetPaths( wxCommandEvent& event );
-	virtual void OnCheckBoxEng1RPM( wxCommandEvent& event );
-	virtual void OnCheckBoxEng2RPM( wxCommandEvent& event );
-	virtual void OnCheckBoxGenRPM( wxCommandEvent& event );
-        virtual void OnToggleButtonRPMCheck( wxCommandEvent& event );
-        virtual void OnButtonToSailsSpace( wxCommandEvent& event );
-        virtual void onButtonBackToSails( wxCommandEvent& event );
-        virtual void OnButtonSpaceRPlus( wxCommandEvent& event );
-        virtual void OnButtonSpaceRMinus( wxCommandEvent& event );
-        virtual void OnButtonSpaceCPlus( wxCommandEvent& event );
-        virtual void OnButtonSpaceCMinus( wxCommandEvent& event );
-        virtual void OnButtonSpaceReset( wxCommandEvent& event );
-        virtual void OnCancel( wxCommandEvent& event );
-        virtual void OnButtonOKClick( wxCommandEvent& event );
-        virtual void OnTextEng1IdEntry( wxCommandEvent& event );
-        virtual void OnTextEng2IdEntry( wxCommandEvent& event );
-        virtual void OnTextGenIdEntry( wxCommandEvent& event );
-   
-	public:
-        wxRadioButton* m_radioBtnLocal;
-        wxChoice* m_choiceTzIndicator;
-        wxChoice* m_choiceTzHours;
-        wxRadioButton* m_radioBtnGPSAuto;
-        wxChoice* m_choicePositionFormat;
-		wxCheckBox* m_checkBoxToolTips;
-        wxChoice* m_choiceNoEngines;
-		wxCheckBox* m_checkBoxShowAllLayouts;
-		wxTextCtrl* m_textCtrlLayoutPrefix;
-		wxCheckBox* m_checkBoxNoGPS;
-		wxChoice* m_choiceWindTo;
-		wxStaticText* m_staticText54;
-		wxTextCtrl* m_textCtrlWayPoint;
-		wxTextCtrl* m_textCtrlGuradChanged;
-		wxTextCtrl* m_textCtrlEverySMText;
-		wxTextCtrl* m_textCtrlChancedCourse;
-		wxTextCtrl* m_textCtrlTankWater;
-		wxTextCtrl* m_textCtrlWatermaker;
-		wxTextCtrl* m_textCtrlTankFuel;
-		wxTextCtrl* m_textCtrlBank1;
-		wxTextCtrl* m_textCtrlBank2;
-		wxChoice* m_choiceDepth;
-		wxChoice* m_choiceWaveSwell;
-		wxChoice* m_choiceHeading;
-		wxTextCtrl* m_textCtrlTemperature;
-		wxTextCtrl* m_textCtrlAmpere;
-        wxTextCtrl* m_textCtrlEngine;
-        wxTextCtrl* m_textCtrlPropShaft;
-        wxTextCtrl* m_textCtrRPM;
-		wxTextCtrl* m_Days;
-		wxTextCtrl* m_Weeks;
-		wxTextCtrl* m_textMonth;
-		wxTextCtrl* m_textCtrlODTEditor;
-		wxTextCtrl* m_textCtrlDataManager;
-		wxTextCtrl* m_textCtrlMailClient;
-		wxTextCtrl* m_textCtrlHTMLEditorPath;
-		wxBitmapButton* m_bpButtonHTMLEditor;
-        wxTextCtrl* m_textCtrlKMLLineWidt;
-        wxChoice* m_choiceKMLLineTranparency;
-        wxChoice* m_choiceKMLRouteLineColo;
-        wxChoice* m_choiceKMLTrackLineColor;
-        wxCheckBox* m_checkBoxNMEAUseRPM;
-        wxCheckBox* m_checkBoxNMEAUseWIMDA;
-        wxPanel* m_panelSails;
-        wxPanel* m_panelSailNames;
-        wxGrid* m_gridSailNames;
-        wxPanel* m_panelSailsCheckbox;
-        wxFlexGridSizer* fgSizerSailsCheckboxes;
-        wxCheckBox* m_checkBoxEngine;
-        wxCheckBox* m_checkBoxEngineRunning;
-        wxCheckBox* m_checkBoxGenerator;
+public:
+    wxScrolledWindow* m_scrolledWindow1;
+    wxNotebook* m_notebook4;
+    wxPanel* m_panel15;
+    wxStaticText* m_staticText132;
+    wxChoice* m_choiceDateFormat;
+    wxChoice* m_choiceDate1;
+    wxChoice* m_choiceDate2;
+    wxChoice* m_choiceDate3;
+    wxStaticText* m_staticText128;
+    wxTextCtrl* m_textCtrlDateSeparator;
+    wxStaticText* m_staticTextDate;
+    wxStaticText* m_staticText133;
+    wxChoice* m_choiceTimeFormat;
+    wxCheckBox* m_checkBoxNoSeconds;
+    wxStaticText* m_staticText59;
+    wxStaticText* m_staticTextTime;
+    wxRadioButton* m_radioBtnUTC;
+    wxStaticText* m_staticText71;
+    wxStaticLine* m_staticline44;
+    wxCheckBox* m_checkBoxShowLogbook;
+    wxStaticText* m_staticText76;
+    wxStaticText* m_staticText1361;
+    wxCheckBox* m_checkBoxShowOnlySelectedLayouts;
+    wxStaticText* m_staticText741;
+    wxStaticLine* m_staticline25;
+    wxStaticLine* m_staticline22;
+    wxStaticText* m_staticText123;
+    wxStaticText* m_staticText56;
+    wxTextCtrl* m_timerText;
+    wxStaticText* m_staticText121;
+    wxStaticText* m_staticText122;
+    wxStaticText* m_staticText1231;
+    wxStaticText* m_staticText124;
+    wxCheckBox* m_checkBoxPopUp;
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticText731;
+    wxStaticText* m_staticText751;
+    wxButton* m_buttonInstallHTMLFiles;
+    wxButton* m_buttonUninstall;
+    wxStaticLine* m_staticline261;
+    wxPanel* m_panel20;
+    wxStaticText* m_staticText1041;
+    wxStaticLine* m_staticline34;
+    wxStaticText* m_staticText99;
+    wxStaticText* m_staticText100;
+    wxStaticText* m_staticText102;
+    wxStaticLine* m_staticline33;
+    wxStaticText* m_staticText96;
+    wxStaticText* m_staticText97;
+    wxStaticLine* m_staticline32;
+    wxStaticText* m_staticText104;
+    wxStaticText* m_staticText105;
+    wxStaticText* m_staticText107;
+    wxPanel* m_panel16;
+    wxStaticText* m_staticText34;
+    wxStaticText* m_staticText31;
+    wxTextCtrl* m_sDeg;
+    wxStaticText* m_staticText35;
+    wxTextCtrl* m_sMin;
+    wxStaticText* m_staticText36;
+    wxTextCtrl* m_sSec;
+    wxStaticText* m_staticText38;
+    wxTextCtrl* m_sDist;
+    wxStaticText* m_staticText39;
+    wxTextCtrl* m_sSpeed;
+    wxStaticText* m_staticText40;
+    wxStaticText* m_staticText41;
+    wxTextCtrl* m_smeter;
+    wxStaticText* m_staticText63;
+    wxStaticText* m_staticText48;
+    wxTextCtrl* m_sFeet;
+    wxStaticText* m_staticText632;
+    wxStaticText* m_staticText49;
+    wxTextCtrl* m_sFathom;
+    wxStaticText* m_staticText42;
+    wxStaticText* m_staticText43;
+    wxTextCtrl* m_sBaro;
+    wxStaticText* m_staticText44;
+    wxTextCtrl* m_sKnots;
+    wxTextCtrl* m_sMeterSec;
+    wxTextCtrl* m_sKmh;
+    wxStaticText* m_staticText791;
+    wxStaticText* m_staticText46;
+    wxStaticText* m_staticText47;
+    wxTextCtrl* m_sLiter;
+    wxStaticText* m_staticText50;
+    wxTextCtrl* m_sMotorh;
+    wxStaticText* m_staticText106;
+    wxStaticText* m_staticText135;
+    wxStaticText* m_staticText137;
+    wxStaticText* m_staticText136;
+    wxStaticText* m_staticText70;
+    wxStaticText* m_staticText712;
+    wxStaticText* m_staticText72;
+    wxStaticText* m_staticText73;
+    wxStaticLine* m_staticline251;
+    wxStaticText* m_staticText75;
+    wxStaticLine* m_staticline26;
+    wxStaticText* m_staticText51;
+    wxChoice* m_choiceWind;
+    wxStaticText* m_staticText45;
+    wxChoice* m_choiceDir;
+    wxPanel* m_panel17;
+    wxStaticText* m_staticText761;
+    wxBitmapButton* m_bpButtonODT;
+    wxStaticText* m_staticText77;
+    wxBitmapButton* m_bpButtonDatamanager;
+    wxStaticText* m_staticText78;
+    wxBitmapButton* m_bpButtonMail;
+    wxStaticText* m_staticText79;
+    wxButton* m_buttonResetPath;
+    wxPanel* m_panel24;
+    wxNotebook* m_notebook7;
+    wxPanel* m_panel27;
+    wxStaticText* m_staticText1381;
+    wxCheckBox* m_checkBoxKMLRoute;
+    wxCheckBox* m_checkBoxKMLTrack;
+    wxStaticText* m_staticText1281;
+    wxStaticText* m_staticText131;
+    wxStaticText* m_staticText129;
+    wxStaticText* m_staticText1291;
+    wxPanel* m_panel28;
+    wxStaticText* m_staticTextUseRPM;
+    wxStaticText* m_staticTextRPMSentence;
+    wxToggleButton* m_toggleBtnRPMCheck;
+    wxCheckBox* m_checkBoxEng1RPM;
+    wxTextCtrl* m_textCtrlEngine1;
+    wxCheckBox* m_checkBoxEng2RPM;
+    wxTextCtrl* m_textCtrlEngine2;
+    wxCheckBox* m_checkBoxGenRPM;
+    wxTextCtrl* m_textCtrlGenerator;
+    wxButton* m_buttonToSailsSpace;
+    wxStaticText* m_staticText1351;
+    wxButton* m_buttonBackToSails;
+    wxButton* m_button60;
+    wxButton* m_button61;
+    wxButton* m_button62;
+    wxButton* m_button63;
+    wxButton* m_buttonSpaceRPlus;
+    wxButton* m_buttonSpaceRMinus;
+    wxButton* m_buttonSpaceCPlus;
+    wxButton* m_buttonSpaceCMinus;
+    wxButton* m_buttonSpaceReset;
+    wxStdDialogButtonSizer* m_sdbSizer1;
+    wxButton* m_sdbSizer1OK;
+    wxButton* m_sdbSizer1Cancel;
+    wxCheckBox* m_checkBoxSailsDown;
+    wxCheckBox* m_checkBoxStatusBar;
+    wxCheckBox* m_checkBoxWindspeeds;
+    wxCheckBox* m_checkBoxOverview;
+
+    wxDateTime textCtrlDate;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event );
+    virtual void OnChoiceDateFormat( wxCommandEvent& event );
+    virtual void OnChoiceDate1( wxCommandEvent& event );
+    virtual void OnChoiceDate2( wxCommandEvent& event );
+    virtual void OnChoiceDate3( wxCommandEvent& event );
+    virtual void OnTextDateSeparator( wxCommandEvent& event );
+    virtual void OnChoiceTimeFormat( wxCommandEvent& event );
+    virtual void OnCheckboxNoSeconds( wxCommandEvent& event );
+    virtual void onRadioBtnUTC( wxCommandEvent& event );
+    virtual void onRadioBtnLocal( wxCommandEvent& event );
+    virtual void onRadioBtnGPSAuto( wxCommandEvent& event );
+    virtual void onChoicePositionFormat( wxCommandEvent& event );
+    virtual void onCheckBoxToolTips( wxCommandEvent& event );
+    virtual void OnChoiceNoEngines( wxCommandEvent& event );
+    virtual void OnCheckBoxEngineMessage( wxCommandEvent& event );
+    virtual void OnCheckBoxGeneratorMessage( wxCommandEvent& event );
+    virtual void OnCheckBoxEngineRunning( wxCommandEvent& event );
+    virtual void OnCheckBoxOverview( wxCommandEvent& event );
+    virtual void onCheckBoNoGPS( wxCommandEvent& event );
+    virtual void onButtonClickInstallHTMLFiles( wxCommandEvent& event );
+    virtual void OnButtonClickUninstall( wxCommandEvent& event );
+    virtual void OnTextEnterWaterTank( wxCommandEvent& event );
+    virtual void OnTextEnterm_textCtrlWatermaker( wxCommandEvent& event );
+    virtual void OnTextEnterFuelTank( wxCommandEvent& event );
+    virtual void OnTextEnterBank1( wxCommandEvent& event );
+    virtual void onTextEnterBank2( wxCommandEvent& event );
+    virtual void onTextEnterm_sKnots( wxCommandEvent& event );
+    virtual void onTextEnterm_sMeterSec( wxCommandEvent& event );
+    virtual void onTextEnterm_sKmh( wxCommandEvent& event );
+    virtual void onTextm_sLiter( wxCommandEvent& event );
+    virtual void onButtonClickODT( wxCommandEvent& event );
+    virtual void onButtonClickDataManager( wxCommandEvent& event );
+    virtual void onButtonClickMail( wxCommandEvent& event );
+    virtual void onButtonHTMLEditor( wxCommandEvent& event );
+    virtual void OnButtonResetPaths( wxCommandEvent& event );
+    virtual void OnCheckBoxEng1RPM( wxCommandEvent& event );
+    virtual void OnCheckBoxEng2RPM( wxCommandEvent& event );
+    virtual void OnCheckBoxGenRPM( wxCommandEvent& event );
+    virtual void OnToggleButtonRPMCheck( wxCommandEvent& event );
+    virtual void OnButtonToSailsSpace( wxCommandEvent& event );
+    virtual void onButtonBackToSails( wxCommandEvent& event );
+    virtual void OnButtonSpaceRPlus( wxCommandEvent& event );
+    virtual void OnButtonSpaceRMinus( wxCommandEvent& event );
+    virtual void OnButtonSpaceCPlus( wxCommandEvent& event );
+    virtual void OnButtonSpaceCMinus( wxCommandEvent& event );
+    virtual void OnButtonSpaceReset( wxCommandEvent& event );
+    virtual void OnCancel( wxCommandEvent& event );
+    virtual void OnButtonOKClick( wxCommandEvent& event );
+    virtual void OnTextEng1IdEntry( wxCommandEvent& event );
+    virtual void OnTextEng2IdEntry( wxCommandEvent& event );
+    virtual void OnTextGenIdEntry( wxCommandEvent& event );
+
+public:
+    wxRadioButton* m_radioBtnLocal;
+    wxChoice* m_choiceTzIndicator;
+    wxChoice* m_choiceTzHours;
+    wxRadioButton* m_radioBtnGPSAuto;
+    wxChoice* m_choicePositionFormat;
+    wxCheckBox* m_checkBoxToolTips;
+    wxChoice* m_choiceNoEngines;
+    wxCheckBox* m_checkBoxShowAllLayouts;
+    wxTextCtrl* m_textCtrlLayoutPrefix;
+    wxCheckBox* m_checkBoxNoGPS;
+    wxChoice* m_choiceWindTo;
+    wxStaticText* m_staticText54;
+    wxTextCtrl* m_textCtrlWayPoint;
+    wxTextCtrl* m_textCtrlGuradChanged;
+    wxTextCtrl* m_textCtrlEverySMText;
+    wxTextCtrl* m_textCtrlChancedCourse;
+    wxTextCtrl* m_textCtrlTankWater;
+    wxTextCtrl* m_textCtrlWatermaker;
+    wxTextCtrl* m_textCtrlTankFuel;
+    wxTextCtrl* m_textCtrlBank1;
+    wxTextCtrl* m_textCtrlBank2;
+    wxChoice* m_choiceDepth;
+    wxChoice* m_choiceWaveSwell;
+    wxChoice* m_choiceHeading;
+    wxTextCtrl* m_textCtrlTemperature;
+    wxTextCtrl* m_textCtrlAmpere;
+    wxTextCtrl* m_textCtrlEngine;
+    wxTextCtrl* m_textCtrlPropShaft;
+    wxTextCtrl* m_textCtrRPM;
+    wxTextCtrl* m_Days;
+    wxTextCtrl* m_Weeks;
+    wxTextCtrl* m_textMonth;
+    wxTextCtrl* m_textCtrlODTEditor;
+    wxTextCtrl* m_textCtrlDataManager;
+    wxTextCtrl* m_textCtrlMailClient;
+    wxTextCtrl* m_textCtrlHTMLEditorPath;
+    wxBitmapButton* m_bpButtonHTMLEditor;
+    wxTextCtrl* m_textCtrlKMLLineWidt;
+    wxChoice* m_choiceKMLLineTranparency;
+    wxChoice* m_choiceKMLRouteLineColo;
+    wxChoice* m_choiceKMLTrackLineColor;
+    wxCheckBox* m_checkBoxNMEAUseRPM;
+    wxCheckBox* m_checkBoxNMEAUseWIMDA;
+    wxPanel* m_panelSails;
+    wxPanel* m_panelSailNames;
+    wxGrid* m_gridSailNames;
+    wxPanel* m_panelSailsCheckbox;
+    wxFlexGridSizer* fgSizerSailsCheckboxes;
+    wxCheckBox* m_checkBoxEngine;
+    wxCheckBox* m_checkBoxEngineRunning;
+    wxCheckBox* m_checkBoxGenerator;
 
 #ifdef __WXOSX__
-        LogbookOptions( wxWindow* parent, Options* opt, logbookkonni_pi* log_pi, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(680,700), long style = wxDEFAULT_DIALOG_STYLE|wxVSCROLL );
+    LogbookOptions( wxWindow* parent, Options* opt, logbookkonni_pi* log_pi, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 680,700 ), long style = wxDEFAULT_DIALOG_STYLE|wxVSCROLL );
 #else
-		LogbookOptions( wxWindow* parent, Options* opt, logbookkonni_pi* log_pi, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(654,422), long style = wxDEFAULT_DIALOG_STYLE|wxVSCROLL );
+    LogbookOptions( wxWindow* parent, Options* opt, logbookkonni_pi* log_pi, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 654,422 ), long style = wxDEFAULT_DIALOG_STYLE|wxVSCROLL );
 #endif
-		~LogbookOptions();
+    ~LogbookOptions();
 
-		void getValues();
-		void setTimeFormat(int i);
-		void setDateFormat();
-        void setRPMSentence(wxString sentence);
-
-	private:
-		Options			 *opt;
-		logbookkonni_pi* log_pi;
-		wxDateTime		 sample;
-		wxString		 path;
-	    bool			 modified;
-		wxString		oldPattern;
-		wxString		oldDateFormat;
-		int				iOldDateFormat;
-		int				ioldDate1;
-		int				ioldDate2;
-		int				ioldDate3;
-		int				ioldTimeFormat;
-		bool			boldNoSeconds;
-
-		wxString choicesWind[3];
-
-		void init();
-		void setValues();
-		void updateWindChoice();
-		void updateChoiceBoxes();
-		void setDateEnabled(int i);
-		void resetToOldDateTimeFormat();
-        void setUseRPM();
+    void getValues();
+    void setTimeFormat( int i );
+    void setDateFormat();
+    void setRPMSentence( wxString sentence );
+
+private:
+    Options			 *opt;
+    logbookkonni_pi* log_pi;
+    wxDateTime		 sample;
+    wxString		 path;
+    bool			 modified;
+    wxString		oldPattern;
+    wxString		oldDateFormat;
+    int				iOldDateFormat;
+    int				ioldDate1;
+    int				ioldDate2;
+    int				ioldDate3;
+    int				ioldTimeFormat;
+    bool			boldNoSeconds;
+
+    wxString choicesWind[3];
+
+    void init();
+    void setValues();
+    void updateWindChoice();
+    void updateChoiceBoxes();
+    void setDateEnabled( int i );
+    void resetToOldDateTimeFormat();
+    void setUseRPM();
 };
 #endif
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/logbook_pi.cpp opencpn-plugin-logbookkonni-1.2024/src/logbook_pi.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/logbook_pi.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/logbook_pi.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -38,11 +38,10 @@
 #include "LogbookDialog.h"
 #include "LogbookOptions.h"
 #include "Options.h"
-#include "MessageBoxOSX.h"
 #include "wx/stdpaths.h"
-#include <wx/timer.h> 
-#include <wx/event.h> 
-#include <wx/sysopt.h> 
+#include <wx/timer.h>
+#include <wx/event.h>
+#include <wx/sysopt.h>
 #include <wx/dir.h>
 #include <wx/stdpaths.h>
 #include <wx/filefn.h>
@@ -55,22 +54,22 @@
 
 #ifndef DECL_EXP
 #ifdef __WXMSW__
-  #define DECL_EXP     __declspec(dllexport)
+#define DECL_EXP     __declspec(dllexport)
 #else
-  #define DECL_EXP
+#define DECL_EXP
 #endif
 #endif
 
 // the class factories, used to create and destroy instances of the PlugIn
 
-extern "C" DECL_EXP opencpn_plugin* create_pi(void *ppimgr)
+extern "C" DECL_EXP opencpn_plugin* create_pi( void *ppimgr )
 {
-	return (opencpn_plugin *)new logbookkonni_pi(ppimgr);
+    return ( opencpn_plugin * )new logbookkonni_pi( ppimgr );
 }
 
-extern "C" DECL_EXP void destroy_pi(opencpn_plugin* p)
+extern "C" DECL_EXP void destroy_pi( opencpn_plugin* p )
 {
-	delete p;
+    delete p;
 }
 
 
@@ -81,342 +80,342 @@
 //          PlugIn initialization and de-init
 //
 //---------------------------------------------------------------------------------------------------------
-logbookkonni_pi::logbookkonni_pi(void *ppimgr)
-      :opencpn_plugin_17(ppimgr)
-{	
-      // Create the PlugIn icons
-      initialize_images();
-	  opt = new Options();
-	  m_timer = NULL;
-	  state = 0;
+logbookkonni_pi::logbookkonni_pi( void *ppimgr )
+    :opencpn_plugin_17( ppimgr )
+{
+    // Create the PlugIn icons
+    initialize_images();
+    opt = new Options();
+    m_timer = NULL;
+    state = 0;
 }
 
 
 logbookkonni_pi::~logbookkonni_pi()
 {
-	if(m_timer != NULL && m_timer->IsRunning())
-	{
-		m_timer->Stop();
-		m_timer = NULL;
-	}
-	if(opt != NULL)
-		delete opt;
-}
-
-int logbookkonni_pi::Init(void)
-{
-	state = OFF;
-	dlgShow = false;
-
-    AddLocaleCatalog( _T("opencpn-logbookkonni_pi") );
-
-	m_plogbook_window = NULL;
-	lastWaypointInRoute = _T("-1");
-	eventsEnabled = true;
-
-	opt = new Options();
-	// Get a pointer to the opencpn display canvas, to use as a parent for windows created
-	m_parent_window = GetOCPNCanvasWindow();
-
-	m_pconfig = GetOCPNConfigObject(); 
-
-	LoadConfig();
-	if(m_bLOGShowIcon)
-            m_leftclick_tool_id  = InsertPlugInTool(_T(""), _img_logbook_pi, _img_logbook_pi, wxITEM_NORMAL,
-                  _("Logbook"), _T(""), NULL,
-                   LOGBOOK_TOOL_POSITION, 0, this);
-
-	// Create the Context Menu Items
-
-	//    In order to avoid an ASSERT on msw debug builds,
-	//    we need to create a dummy menu to act as a surrogate parent of the created MenuItems
-	//    The Items will be re-parented when added to the real context meenu
-	wxMenu dummy_menu;
-
-	timer = new LogbookTimer(this);
-	m_timer = new wxTimer(timer,ID_LOGTIMER);
-	timer->Connect( wxEVT_TIMER, wxObjectEventFunction( &LogbookTimer::OnTimer ));
-	
-	SendPluginMessage(_T("LOGBOOK_READY_FOR_REQUESTS"), _T("TRUE"));
-
-	return (
-           WANTS_CURSOR_LATLON       |
-           WANTS_TOOLBAR_CALLBACK    |
-           INSTALLS_TOOLBAR_TOOL     |
-           WANTS_CONFIG              |
-		   WANTS_PREFERENCES         |
-           WANTS_NMEA_SENTENCES      |
-           WANTS_NMEA_EVENTS		 |
-           USES_AUI_MANAGER			 |
-		   WANTS_PLUGIN_MESSAGING
-		);
-}
-
-bool logbookkonni_pi::DeInit(void)
-{
-	shutdown(false);
-	return true;
-}
-
-void logbookkonni_pi::shutdown(bool menu)
-{
-	SendPluginMessage(_T("LOGBOOK_READY_FOR_REQUESTS"), _T("FALSE"));
-
-	if(m_timer)
-		if(m_timer->IsRunning())
-			m_timer->Stop();
-	if(timer)
-	{
-		timer->Disconnect( wxEVT_TIMER, wxObjectEventFunction( &LogbookTimer::OnTimer ));
-		delete timer;
-	}
-
-	timer = NULL;
-	m_timer = NULL;
-
-	if(m_plogbook_window != NULL)
-	{
-		if(m_plogbook_window->IsIconized()) m_plogbook_window->Iconize(false);
-		m_plogbook_window->setIniValues();
-
-		if((opt->engine1Running && opt->toggleEngine1)
-            || (opt->engine2Running && opt->toggleEngine2)
-            || (opt->generatorRunning && opt->toggleGenerator))
-        {
-            int a = wxMessageBox(_("Your engine(s) are still running\n\nStop engine(s) ?"),_T(""),wxYES_NO | wxICON_QUESTION, NULL);
-            if( a == wxYES)
-                m_plogbook_window->logbook->resetEngineManualMode(0);
+    if ( m_timer != NULL && m_timer->IsRunning() )
+    {
+        m_timer->Stop();
+        m_timer = NULL;
+    }
+    if ( opt != NULL )
+        delete opt;
+}
+
+int logbookkonni_pi::Init( void )
+{
+    state = OFF;
+    dlgShow = false;
+
+    AddLocaleCatalog( _T( "opencpn-logbookkonni_pi" ) );
+
+    m_plogbook_window = NULL;
+    lastWaypointInRoute = _T( "-1" );
+    eventsEnabled = true;
+
+    opt = new Options();
+    // Get a pointer to the opencpn display canvas, to use as a parent for windows created
+    m_parent_window = GetOCPNCanvasWindow();
+
+    m_pconfig = GetOCPNConfigObject();
+
+    LoadConfig();
+    if ( m_bLOGShowIcon )
+        m_leftclick_tool_id  = InsertPlugInTool( _T( "" ), _img_logbook_pi, _img_logbook_pi, wxITEM_NORMAL,
+                               _( "Logbook" ), _T( "" ), NULL,
+                               LOGBOOK_TOOL_POSITION, 0, this );
+
+    // Create the Context Menu Items
+
+    //    In order to avoid an ASSERT on msw debug builds,
+    //    we need to create a dummy menu to act as a surrogate parent of the created MenuItems
+    //    The Items will be re-parented when added to the real context meenu
+    wxMenu dummy_menu;
+
+    timer = new LogbookTimer( this );
+    m_timer = new wxTimer( timer,ID_LOGTIMER );
+    timer->Connect( wxEVT_TIMER, wxObjectEventFunction( &LogbookTimer::OnTimer ) );
+
+    SendPluginMessage( _T( "LOGBOOK_READY_FOR_REQUESTS" ), _T( "TRUE" ) );
+
+    return (
+               WANTS_CURSOR_LATLON       |
+               WANTS_TOOLBAR_CALLBACK    |
+               INSTALLS_TOOLBAR_TOOL     |
+               WANTS_CONFIG              |
+               WANTS_PREFERENCES         |
+               WANTS_NMEA_SENTENCES      |
+               WANTS_NMEA_EVENTS		 |
+               USES_AUI_MANAGER			 |
+               WANTS_PLUGIN_MESSAGING
+           );
+}
+
+bool logbookkonni_pi::DeInit( void )
+{
+    shutdown( false );
+    return true;
+}
+
+void logbookkonni_pi::shutdown( bool menu )
+{
+    SendPluginMessage( _T( "LOGBOOK_READY_FOR_REQUESTS" ), _T( "FALSE" ) );
+
+    if ( m_timer )
+        if ( m_timer->IsRunning() )
+            m_timer->Stop();
+    if ( timer )
+    {
+        timer->Disconnect( wxEVT_TIMER, wxObjectEventFunction( &LogbookTimer::OnTimer ) );
+        delete timer;
+    }
+
+    timer = NULL;
+    m_timer = NULL;
+
+    if ( m_plogbook_window != NULL )
+    {
+        if ( m_plogbook_window->IsIconized() ) m_plogbook_window->Iconize( false );
+        m_plogbook_window->setIniValues();
+
+        if ( ( opt->engine1Running && opt->toggleEngine1 )
+                || ( opt->engine2Running && opt->toggleEngine2 )
+                || ( opt->generatorRunning && opt->toggleGenerator ) )
+        {
+            int a = wxMessageBox( _( "Your engine(s) are still running\n\nStop engine(s) ?" ),_T( "" ),wxYES_NO | wxICON_QUESTION, NULL );
+            if ( a == wxYES )
+                m_plogbook_window->logbook->resetEngineManualMode( 0 );
         }
         SaveConfig();
-		m_plogbook_window->Close();
-		m_plogbook_window->Destroy();
-		m_plogbook_window = NULL;
-		dlgShow = false;
-	//	SetToolbarItemState( m_leftclick_tool_id, dlgShow );
-	}
-}
-
-
-void logbookkonni_pi::SetPluginMessage(wxString &message_id, wxString &message_body)
-{
-    if(message_id == _T("OCPN_MAN_OVERBOARD"))
-        {
-            wxJSONReader reader;
-            wxJSONValue  data;
-            int numErrors = reader.Parse( message_body, &data );
-            if(numErrors != 0) return;
-
-            if(!m_plogbook_window)
-                startLogbook();
-
-            m_plogbook_window->logbook->MOB_GUID = data.Item(_T("GUID")).AsString();
-            m_plogbook_window->logbook->MOBIsActive = true;
-
-            m_plogbook_window->logbook->appendRow(true, false);
-        }
-        else if(message_id == _T("POLAR_SAVE_LOGBOOK"))
-        {
-            if(m_plogbook_window)
-                m_plogbook_window->logbook->update();
-        }
-       else if(message_id == _T("LOGBOOK_LOG_LASTLINE_REQUEST"))
-       {
-		if(!m_plogbook_window)
-			startLogbook();
-
-		  wxJSONValue key;
-		  int tcol = 0;
-		  int lastRow = m_plogbook_window->logGrids[0]->GetNumberRows()-1;
-		  for(unsigned int g = 0; g < LOGGRIDS; g++)
-			  for( int col = 0; col < m_plogbook_window->logGrids[g]->GetNumberCols(); col++)
-				  key[tcol++] = m_plogbook_window->logGrids[g]->GetCellValue(lastRow,col);
-		  wxJSONWriter w;
-		  wxString out;
-		  w.Write(key, out);
-		  wxString id = _T("LOGBOOK_LOG_LASTLINE_RESPONSE");
-		  SetPluginMessage(id,out);
-		  return;
-      }
-      else if(message_id == _T("LOGBOOK_IS_READY_FOR_REQUEST"))
-      {
-	  	SendPluginMessage(_T("LOGBOOK_READY_FOR_REQUESTS"), _T("TRUE"));
-	  }
-      else if(message_id == _T("LOGBOOK_BUYPARTS_ADDLINE_REQUEST"))
-      {
-		wxJSONReader reader;
-		wxJSONValue  data;
-		int priority, amount;
-		wxString category, title, unit, text, plugin;
-		wxString prText[6]; 
-
-		int numErrors = reader.Parse( message_body, &data );
-		if(numErrors != 0) return;
-
-		if(!m_plogbook_window)
-			startLogbook();
-
-		m_plogbook_window->Show();		
-		m_plogbook_window->m_logbook->SetSelection(4); // Maintenance
-		m_plogbook_window->m_notebook6->SetSelection(2); // BuyParts
-
-		for(int i = 0; i < data.Size(); i++)
-		{
-			priority = data[i].Item(_T("Priority")).AsInt();
-			category = data[i].Item(_T("Category")).AsString();
-			title    = _("from ");
-			plugin = data[i].Item(_T("PluginName")).AsString();
-			title   += plugin + _("-Plugin");
-			amount   = data[i].Item(_T("Amount")).AsInt();
-			unit     = data[i].Item(_T("Unit")).AsString();
-			text     = data[i].Item(_T("Text")).AsString();
-			
-			prText[priority] += wxString::Format(_T("%4i  %-15s %-30s\n"),amount,unit.c_str(),text.c_str());
-
-		}
-
-		if(plugin == _T("FindIt"))
-			m_plogbook_window->maintenance->deleteFindItRow(category,plugin);
-
-		for(int i = 0; i < 6; i++)
-		{
-			if(prText[i] != wxEmptyString)
-			{
-				m_plogbook_window->maintenance->addLineBuyParts();
-
-				int lastRow = m_plogbook_window->m_gridMaintenanceBuyParts->GetRows()-1;
-
-				m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue(lastRow,0,wxString::Format(_T("%i"),i));
-				m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue(lastRow,1,category);
-				m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue(lastRow,2,title);
-				m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue(lastRow,3,prText[i].RemoveLast());
-				m_plogbook_window->m_gridMaintenanceBuyParts->AutoSizeRow(lastRow,false);
-			}
-		}
-
-		m_plogbook_window->maintenance->checkBuyParts();
-		
-		return;
-      }
-      else if(message_id == _T("LOGBOOK_LOG_ADDLINE_REQUEST"))
-      {
-		wxJSONReader reader;
-		wxJSONValue  data;
-		int numErrors = reader.Parse( message_body, &data );
-		if(numErrors != 0) return;
-
-		if(!m_plogbook_window)
-			startLogbook();
-
-		m_plogbook_window->logbook->appendRow(true, true);
-		int lastRow = m_plogbook_window->m_gridGlobal->GetRows()-1;
-
-		m_plogbook_window->m_gridGlobal->SetCellValue(lastRow,13,data.Item(_T("Remarks")).AsString());
-		m_plogbook_window->m_gridMotorSails->SetCellValue(lastRow,8,data.Item(_T("MotorRemarks")).AsString());
-		return;
-      }
-      else if(message_id == _T("OCPN_WPT_ARRIVED"))
-      {
-		if(!opt->waypointArrived || eventsEnabled) return;
-
-		wxJSONReader reader;
-		wxJSONValue  data;
-		int numErrors = reader.Parse( message_body, &data );
-		if(numErrors != 0) return;
-
-		if(!m_plogbook_window)
-			startLogbook();
-
-		RMB rmb;
-		rmb.From = data.Item(_T("WP_arrived")).AsString();
-		rmb.To   = lastWaypointInRoute =  data.Item(_T("Next_WP")).AsString();
-		m_plogbook_window->logbook->WP_skipped = data.Item(_T("isSkipped")).AsBool();
-		m_plogbook_window->logbook->OCPN_Message = true;
-
-		m_plogbook_window->logbook->checkWayPoint(rmb);
-
-		m_plogbook_window->logbook->OCPN_Message = false;
-		m_plogbook_window->logbook->WP_skipped = false;
-	  }
-	  else if(message_id == _T("OCPN_RTE_ENDED"))
-      {
-		if(!opt->waypointArrived) return;
-
-		wxJSONReader reader;
-		wxJSONValue  data;
-		int numErrors = reader.Parse( message_body, &data );
-		if(numErrors != 0) return;
-
-		if(!m_plogbook_window)
-			startLogbook();
-
-		RMB rmb;
-		rmb.From = lastWaypointInRoute;
-		rmb.To = _T("-1");
-		m_plogbook_window->logbook->WP_skipped = false;
-		m_plogbook_window->logbook->OCPN_Message = true;
-
-		m_plogbook_window->logbook->checkWayPoint(rmb);
-		m_plogbook_window->logbook->OCPN_Message = false;
-		lastWaypointInRoute = _T("-1");
-		m_plogbook_window->logbook->lastWayPoint = wxEmptyString;
+        m_plogbook_window->Close();
+        m_plogbook_window->Destroy();
+        m_plogbook_window = NULL;
+        dlgShow = false;
+        //	SetToolbarItemState( m_leftclick_tool_id, dlgShow );
+    }
+}
+
+
+void logbookkonni_pi::SetPluginMessage( wxString &message_id, wxString &message_body )
+{
+    if ( message_id == _T( "OCPN_MAN_OVERBOARD" ) )
+    {
+        wxJSONReader reader;
+        wxJSONValue  data;
+        int numErrors = reader.Parse( message_body, &data );
+        if ( numErrors != 0 ) return;
+
+        if ( !m_plogbook_window )
+            startLogbook();
+
+        m_plogbook_window->logbook->MOB_GUID = data.Item( _T( "GUID" ) ).AsString();
+        m_plogbook_window->logbook->MOBIsActive = true;
+
+        m_plogbook_window->logbook->appendRow( true, false );
+    }
+    else if ( message_id == _T( "POLAR_SAVE_LOGBOOK" ) )
+    {
+        if ( m_plogbook_window )
+            m_plogbook_window->logbook->update();
+    }
+    else if ( message_id == _T( "LOGBOOK_LOG_LASTLINE_REQUEST" ) )
+    {
+        if ( !m_plogbook_window )
+            startLogbook();
+
+        wxJSONValue key;
+        int tcol = 0;
+        int lastRow = m_plogbook_window->logGrids[0]->GetNumberRows()-1;
+        for ( unsigned int g = 0; g < LOGGRIDS; g++ )
+            for ( int col = 0; col < m_plogbook_window->logGrids[g]->GetNumberCols(); col++ )
+                key[tcol++] = m_plogbook_window->logGrids[g]->GetCellValue( lastRow,col );
+        wxJSONWriter w;
+        wxString out;
+        w.Write( key, out );
+        wxString id = _T( "LOGBOOK_LOG_LASTLINE_RESPONSE" );
+        SetPluginMessage( id,out );
+        return;
+    }
+    else if ( message_id == _T( "LOGBOOK_IS_READY_FOR_REQUEST" ) )
+    {
+        SendPluginMessage( _T( "LOGBOOK_READY_FOR_REQUESTS" ), _T( "TRUE" ) );
+    }
+    else if ( message_id == _T( "LOGBOOK_BUYPARTS_ADDLINE_REQUEST" ) )
+    {
+        wxJSONReader reader;
+        wxJSONValue  data;
+        int priority, amount;
+        wxString category, title, unit, text, plugin;
+        wxString prText[6];
+
+        int numErrors = reader.Parse( message_body, &data );
+        if ( numErrors != 0 ) return;
+
+        if ( !m_plogbook_window )
+            startLogbook();
+
+        m_plogbook_window->Show();
+        m_plogbook_window->m_logbook->SetSelection( 4 ); // Maintenance
+        m_plogbook_window->m_notebook6->SetSelection( 2 ); // BuyParts
+
+        for ( int i = 0; i < data.Size(); i++ )
+        {
+            priority = data[i].Item( _T( "Priority" ) ).AsInt();
+            category = data[i].Item( _T( "Category" ) ).AsString();
+            title    = _( "from " );
+            plugin = data[i].Item( _T( "PluginName" ) ).AsString();
+            title   += plugin + _( "-Plugin" );
+            amount   = data[i].Item( _T( "Amount" ) ).AsInt();
+            unit     = data[i].Item( _T( "Unit" ) ).AsString();
+            text     = data[i].Item( _T( "Text" ) ).AsString();
+
+            prText[priority] += wxString::Format( _T( "%4i  %-15s %-30s\n" ),amount,unit.c_str(),text.c_str() );
+
+        }
+
+        if ( plugin == _T( "FindIt" ) )
+            m_plogbook_window->maintenance->deleteFindItRow( category,plugin );
+
+        for ( int i = 0; i < 6; i++ )
+        {
+            if ( prText[i] != wxEmptyString )
+            {
+                m_plogbook_window->maintenance->addLineBuyParts();
+
+                int lastRow = m_plogbook_window->m_gridMaintenanceBuyParts->GetRows()-1;
+
+                m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue( lastRow,0,wxString::Format( _T( "%i" ),i ) );
+                m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue( lastRow,1,category );
+                m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue( lastRow,2,title );
+                m_plogbook_window->m_gridMaintenanceBuyParts->SetCellValue( lastRow,3,prText[i].RemoveLast() );
+                m_plogbook_window->m_gridMaintenanceBuyParts->AutoSizeRow( lastRow,false );
+            }
+        }
+
+        m_plogbook_window->maintenance->checkBuyParts();
+
+        return;
+    }
+    else if ( message_id == _T( "LOGBOOK_LOG_ADDLINE_REQUEST" ) )
+    {
+        wxJSONReader reader;
+        wxJSONValue  data;
+        int numErrors = reader.Parse( message_body, &data );
+        if ( numErrors != 0 ) return;
+
+        if ( !m_plogbook_window )
+            startLogbook();
+
+        m_plogbook_window->logbook->appendRow( true, true );
+        int lastRow = m_plogbook_window->m_gridGlobal->GetRows()-1;
+
+        m_plogbook_window->m_gridGlobal->SetCellValue( lastRow,13,data.Item( _T( "Remarks" ) ).AsString() );
+        m_plogbook_window->m_gridMotorSails->SetCellValue( lastRow,8,data.Item( _T( "MotorRemarks" ) ).AsString() );
+        return;
+    }
+    else if ( message_id == _T( "OCPN_WPT_ARRIVED" ) )
+    {
+        if ( !opt->waypointArrived || eventsEnabled ) return;
+
+        wxJSONReader reader;
+        wxJSONValue  data;
+        int numErrors = reader.Parse( message_body, &data );
+        if ( numErrors != 0 ) return;
+
+        if ( !m_plogbook_window )
+            startLogbook();
+
+        RMB rmb;
+        rmb.From = data.Item( _T( "WP_arrived" ) ).AsString();
+        rmb.To   = lastWaypointInRoute =  data.Item( _T( "Next_WP" ) ).AsString();
+        m_plogbook_window->logbook->WP_skipped = data.Item( _T( "isSkipped" ) ).AsBool();
+        m_plogbook_window->logbook->OCPN_Message = true;
+
+        m_plogbook_window->logbook->checkWayPoint( rmb );
+
+        m_plogbook_window->logbook->OCPN_Message = false;
+        m_plogbook_window->logbook->WP_skipped = false;
+    }
+    else if ( message_id == _T( "OCPN_RTE_ENDED" ) )
+    {
+        if ( !opt->waypointArrived ) return;
+
+        wxJSONReader reader;
+        wxJSONValue  data;
+        int numErrors = reader.Parse( message_body, &data );
+        if ( numErrors != 0 ) return;
+
+        if ( !m_plogbook_window )
+            startLogbook();
+
+        RMB rmb;
+        rmb.From = lastWaypointInRoute;
+        rmb.To = _T( "-1" );
+        m_plogbook_window->logbook->WP_skipped = false;
+        m_plogbook_window->logbook->OCPN_Message = true;
+
+        m_plogbook_window->logbook->checkWayPoint( rmb );
+        m_plogbook_window->logbook->OCPN_Message = false;
+        lastWaypointInRoute = _T( "-1" );
+        m_plogbook_window->logbook->lastWayPoint = wxEmptyString;
         m_plogbook_window->logbook->routeIsActive = false;
-	  }
-	  else if(message_id == _T("OCPN_RTE_DEACTIVATED"))
-      {
-		wxJSONReader reader;
-		wxJSONValue  data;
-		int numErrors = reader.Parse( message_body, &data );
-		if(numErrors != 0) return;
+    }
+    else if ( message_id == _T( "OCPN_RTE_DEACTIVATED" ) )
+    {
+        wxJSONReader reader;
+        wxJSONValue  data;
+        int numErrors = reader.Parse( message_body, &data );
+        if ( numErrors != 0 ) return;
 
-		if(!m_plogbook_window)
-			startLogbook();
+        if ( !m_plogbook_window )
+            startLogbook();
 
-		m_plogbook_window->logbook->activeRoute = wxEmptyString;
-		m_plogbook_window->logbook->activeRouteGUID = wxEmptyString;
+        m_plogbook_window->logbook->activeRoute = wxEmptyString;
+        m_plogbook_window->logbook->activeRouteGUID = wxEmptyString;
         m_plogbook_window->logbook->routeIsActive = false;
-		if(!m_plogbook_window->logbook->activeMOB.IsEmpty())
+        if ( !m_plogbook_window->logbook->activeMOB.IsEmpty() )
             m_plogbook_window->logbook->MOBIsActive = false;
 
-	  }
-	  else if(message_id == _T("OCPN_RTE_ACTIVATED"))
-      {
-		wxJSONReader reader;
-		wxJSONValue  data;
-		int numErrors = reader.Parse( message_body, &data );
-		if(numErrors != 0) return;
+    }
+    else if ( message_id == _T( "OCPN_RTE_ACTIVATED" ) )
+    {
+        wxJSONReader reader;
+        wxJSONValue  data;
+        int numErrors = reader.Parse( message_body, &data );
+        if ( numErrors != 0 ) return;
 
-		if(!m_plogbook_window)
-			startLogbook();
+        if ( !m_plogbook_window )
+            startLogbook();
 
-		m_plogbook_window->logbook->activeRoute = data.Item(_T("Route_activated")).AsString();
-		m_plogbook_window->logbook->activeRouteGUID = data.Item(_T("GUID")).AsString();
+        m_plogbook_window->logbook->activeRoute = data.Item( _T( "Route_activated" ) ).AsString();
+        m_plogbook_window->logbook->activeRouteGUID = data.Item( _T( "GUID" ) ).AsString();
         m_plogbook_window->logbook->routeIsActive = true;
-      }
-      else if(message_id == _T("OCPN_TRK_ACTIVATED"))
-      {
-        if(!m_plogbook_window)
+    }
+    else if ( message_id == _T( "OCPN_TRK_ACTIVATED" ) )
+    {
+        if ( !m_plogbook_window )
             startLogbook();
 
         wxJSONReader reader;
         wxJSONValue  data;
         int numErrors = reader.Parse( message_body, &data );
-        if(numErrors != 0) return;
+        if ( numErrors != 0 ) return;
 
-        m_plogbook_window->logbook->activeTrack = data.Item(_T("Name")).AsString();
-        m_plogbook_window->logbook->activeTrackGUID = data.Item(_T("GUID")).AsString();
+        m_plogbook_window->logbook->activeTrack = data.Item( _T( "Name" ) ).AsString();
+        m_plogbook_window->logbook->activeTrackGUID = data.Item( _T( "GUID" ) ).AsString();
         m_plogbook_window->logbook->trackIsActive = true;
-      }
-      else if(message_id == _T("OCPN_TRK_DEACTIVATED"))
-      {
+    }
+    else if ( message_id == _T( "OCPN_TRK_DEACTIVATED" ) )
+    {
         wxJSONReader reader;
         wxJSONValue  data;
         int numErrors = reader.Parse( message_body, &data );
-        if(numErrors != 0) return;
+        if ( numErrors != 0 ) return;
 
-        if(!m_plogbook_window)
+        if ( !m_plogbook_window )
             startLogbook();
 
-        if(m_plogbook_window)
+        if ( m_plogbook_window )
         {
             m_plogbook_window->logbook->activeTrack = wxEmptyString;
             m_plogbook_window->logbook->activeTrackGUID = wxEmptyString;
@@ -424,1175 +423,1201 @@
         }
 
     }
-    else if(message_id == _T("OCPN_TRACKPOINTS_COORDS"))
+    else if ( message_id == _T( "OCPN_TRACKPOINTS_COORDS" ) )
     {
         wxJSONReader reader;
         wxJSONValue  data;
         int numErrors = reader.Parse( message_body, &data );
-        if(numErrors != 0) return;
+        if ( numErrors != 0 ) return;
 
-        bool error = data[_T("error")].AsBool();
+        bool error = data[_T( "error" )].AsBool();
 
-        if(!error)
+        if ( !error )
         {
-            double lat = data[_T("lat")].AsDouble();
-            double lon = data[_T("lon")].AsDouble();
-            int total = data[_T("TotalNodes")].AsInt();
-            int i = data[_T("NodeNr")].AsInt();
-            if(i == 1)
+            double lat = data[_T( "lat" )].AsDouble();
+            double lon = data[_T( "lon" )].AsDouble();
+            int total = data[_T( "TotalNodes" )].AsInt();
+            int i = data[_T( "NodeNr" )].AsInt();
+            if ( i == 1 )
             {
                 wxString ph = m_plogbook_window->kmlPathHeader;
-                ph.Replace(_T("#NAME#"),_T("Trackline"));
-                ph.Replace(_T("#LINE#"),_T("#LineTrack"));
+                ph.Replace( _T( "#NAME#" ),_T( "Trackline" ) );
+                ph.Replace( _T( "#LINE#" ),_T( "#LineTrack" ) );
                 *m_plogbook_window->logbook->kmlFile << ph;
             }
-            if(i <= total)
-                *m_plogbook_window->logbook->kmlFile << wxString::Format(_T("%f,%f\n"),lon,lat);
-            if(i == total)
+            if ( i <= total )
+                *m_plogbook_window->logbook->kmlFile << wxString::Format( _T( "%f,%f\n" ),lon,lat );
+            if ( i == total )
                 *m_plogbook_window->logbook->kmlFile << m_plogbook_window->kmlPathFooter;
         }
         //		m_plogbook_window->logbook->writeTrackToKML(data);
     }
-    else if(message_id == _T("OCPN_TRACKS_MERGED"))
+    else if ( message_id == _T( "OCPN_TRACKS_MERGED" ) )
     {
-        if(!m_plogbook_window)
+        if ( !m_plogbook_window )
             startLogbook();
 
         wxJSONReader reader;
         wxJSONValue  data;
         int numErrors = reader.Parse( message_body, &data );
-        if(numErrors != 0) return;
+        if ( numErrors != 0 ) return;
 
         unsigned int i = 1;
-        wxString target = data[_T("targetTrack")].AsString();
-        while(true)
+        wxString target = data[_T( "targetTrack" )].AsString();
+        while ( true )
         {
-            if(data.HasMember(_T("mergeTrack")+wxString::Format(_T("%d"),i)))
-                m_plogbook_window->logbook->mergeList.Add(data[_T("mergeTrack")+wxString::Format(_T("%d"),i++)].AsString());
+            if ( data.HasMember( _T( "mergeTrack" )+wxString::Format( _T( "%d" ),i ) ) )
+                m_plogbook_window->logbook->mergeList.Add( data[_T( "mergeTrack" )+wxString::Format( _T( "%d" ),i++ )].AsString() );
             else
                 break;
 
         }
-        m_plogbook_window->logbook->setTrackToNewID(target);
+        m_plogbook_window->logbook->setTrackToNewID( target );
     }
-    else if(message_id == _T("OCPN_ROUTE_RESPONSE"))
+    else if ( message_id == _T( "OCPN_ROUTE_RESPONSE" ) )
     {
         wxJSONReader reader;
         wxJSONValue  data;
         int numErrors = reader.Parse( message_body, &data );
-        if(numErrors != 0) return;
+        if ( numErrors != 0 ) return;
 
-        bool error = data[0][_T("error")].AsBool();
+        bool error = data[0][_T( "error" )].AsBool();
 
-        if(!error)
-            m_plogbook_window->logbook->writeRouteToKML(data);
+        if ( !error )
+            m_plogbook_window->logbook->writeRouteToKML( data );
     }
-    else if(message_id == _T("OCPN_ROUTELIST_RESPONSE"))
+    else if ( message_id == _T( "OCPN_ROUTELIST_RESPONSE" ) )
     {
         wxJSONReader reader;
         wxJSONValue  data;
         int numErrors = reader.Parse( message_body, &data );
-        if(numErrors != 0) return;
+        if ( numErrors != 0 ) return;
 
-        m_plogbook_window->writeToRouteDlg(data);
-	  }
+        m_plogbook_window->writeToRouteDlg( data );
+    }
 }
 
 void logbookkonni_pi::startLogbook()
 {
-		if(!m_plogbook_window)
-		{
-			m_plogbook_window = new LogbookDialog(this, m_timer, timer, m_parent_window, wxID_ANY,_("Active Logbook"), wxDefaultPosition, wxSize( opt->dlgWidth,opt->dlgHeight ), wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER);
-			m_plogbook_window->init();
-			m_plogbook_window->SetPosition(wxPoint(-1,this->m_parent_window->GetParent()->GetPosition().y+80));
-
-			if (m_plogbook_window->IsShown())
-				SendPluginMessage(wxString(_T("LOGBOOK_WINDOW_SHOWN")), wxEmptyString);
-			else
-				SendPluginMessage(_T("LOGBOOK_WINDOW_HIDDEN"), wxEmptyString);		
-		}
+    if ( !m_plogbook_window )
+    {
+        m_plogbook_window = new LogbookDialog( this, m_timer, timer, m_parent_window, wxID_ANY,_( "Active Logbook" ), wxDefaultPosition, wxSize( opt->dlgWidth,opt->dlgHeight ), wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+        m_plogbook_window->init();
+        m_plogbook_window->SetPosition( wxPoint( -1,this->m_parent_window->GetParent()->GetPosition().y+80 ) );
+
+        if ( m_plogbook_window->IsShown() )
+            SendPluginMessage( wxString( _T( "LOGBOOK_WINDOW_SHOWN" ) ), wxEmptyString );
+        else
+            SendPluginMessage( _T( "LOGBOOK_WINDOW_HIDDEN" ), wxEmptyString );
+    }
 }
 
 
-void logbookkonni_pi::SendLogbookMessage(wxString message_id, wxString message_body)
+void logbookkonni_pi::SendLogbookMessage( wxString message_id, wxString message_body )
 {
-	SendPluginMessage(message_id,message_body);
+    SendPluginMessage( message_id,message_body );
 }
 
 void logbookkonni_pi::GetOriginalColors()
 {
-	mcol = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
-	mcol1 = wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVEBORDER  );
-	muitext = wxColour(0,0,0);
-	mgridline = m_plogbook_window->m_gridGlobal->GetGridLineColour();
-	mudkrd = m_plogbook_window->m_gridGlobal->GetCellTextColour(0,0);
-	mback_color = wxColour(255,255,255);
-	mtext_color = wxColour(0,0,0);
+    mcol = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
+    mcol1 = wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER  );
+    muitext = wxColour( 0,0,0 );
+    mgridline = m_plogbook_window->m_gridGlobal->GetGridLineColour();
+    mudkrd = m_plogbook_window->m_gridGlobal->GetCellTextColour( 0,0 );
+    mback_color = wxColour( 255,255,255 );
+    mtext_color = wxColour( 0,0,0 );
 }
 
 void logbookkonni_pi::SetOriginalColors()
 {
-	col = mcol;
-	col1 = mcol1;
-	gridline = mgridline;
-	uitext = muitext;
-	udkrd = mudkrd;
-	back_color = mback_color;
-	text_color = mtext_color;
-}
-
-void logbookkonni_pi::SetColorScheme(PI_ColorScheme cs)
-{  
-	if(NULL != m_plogbook_window)
-	  {
-		  if(cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
-		  {
-			SetOriginalColors();
-		  }
-		  else
-		  {
-			GetGlobalColor(_T("DILG0"),&col);       // Dialog Background white
-			GetGlobalColor(_T("DILG1"),&col1);      // Dialog Background
-			GetGlobalColor(_T("DILG2"),&back_color);// Control Background
-			GetGlobalColor(_T("DILG3"),&text_color);// Text
-			GetGlobalColor(_T("UITX1"),&uitext);    // Menu Text, derived from UINFF
-			GetGlobalColor(_T("UDKRD"),&udkrd);
-			GetGlobalColor(_T("GREY2"),&gridline);          
-		  }
-
-		  if(cs == 0 || cs == 1)
-				m_plogbook_window->SetBackgroundColour(wxColour(255,255,255));
-		  else
-				m_plogbook_window->SetBackgroundColour(col);
-
-            m_plogbook_window->SetForegroundColour(uitext);
-			dialogDimmer(cs,m_plogbook_window,col,col1,back_color,text_color,uitext,udkrd);
-			m_plogbook_window->Refresh();		  
-	 }
+    col = mcol;
+    col1 = mcol1;
+    gridline = mgridline;
+    uitext = muitext;
+    udkrd = mudkrd;
+    back_color = mback_color;
+    text_color = mtext_color;
 }
 
-void logbookkonni_pi::dialogDimmer(PI_ColorScheme cs,wxWindow* ctrl,wxColour col, wxColour col1, wxColour back_color,wxColour text_color,
-								   wxColour uitext, wxColour udkrd)
+void logbookkonni_pi::SetColorScheme( PI_ColorScheme cs )
 {
-            wxWindowList kids = ctrl->GetChildren();
-            for(unsigned int i = 0 ; i < kids.GetCount() ; i++)
-            {
-                  wxWindowListNode *node = kids.Item(i);
-                  wxWindow *win = node->GetData();
+    if ( NULL != m_plogbook_window )
+    {
+        if ( cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
+        {
+            SetOriginalColors();
+        }
+        else
+        {
+            GetGlobalColor( _T( "DILG0" ),&col );   // Dialog Background white
+            GetGlobalColor( _T( "DILG1" ),&col1 );  // Dialog Background
+            GetGlobalColor( _T( "DILG2" ),&back_color ); // Control Background
+            GetGlobalColor( _T( "DILG3" ),&text_color ); // Text
+            GetGlobalColor( _T( "UITX1" ),&uitext ); // Menu Text, derived from UINFF
+            GetGlobalColor( _T( "UDKRD" ),&udkrd );
+            GetGlobalColor( _T( "GREY2" ),&gridline );
+        }
+
+        if ( cs == 0 || cs == 1 )
+            m_plogbook_window->SetBackgroundColour( wxColour( 255,255,255 ) );
+        else
+            m_plogbook_window->SetBackgroundColour( col );
+
+        m_plogbook_window->SetForegroundColour( uitext );
+        dialogDimmer( cs,m_plogbook_window,col,col1,back_color,text_color,uitext,udkrd );
+        m_plogbook_window->Refresh();
+    }
+}
+
+void logbookkonni_pi::dialogDimmer( PI_ColorScheme cs,wxWindow* ctrl,wxColour col, wxColour col1, wxColour back_color,wxColour text_color,
+                                    wxColour uitext, wxColour udkrd )
+{
+    wxWindowList kids = ctrl->GetChildren();
+    for ( unsigned int i = 0 ; i < kids.GetCount() ; i++ )
+    {
+        wxWindowListNode *node = kids.Item( i );
+        wxWindow *win = node->GetData();
 
-                  if(win->IsKindOf(CLASSINFO(wxListBox)))
-					if(cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
-						((wxListBox*)win)->SetBackgroundColour(wxNullColour);
-					else
-                        ((wxListBox*)win)->SetBackgroundColour(col1);
-
-                  else if(win->IsKindOf(CLASSINFO(wxChoice)))
-					if(cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
-                        ((wxChoice*)win)->SetBackgroundColour(wxColour(255,255,255));
-					else
-						((wxChoice*)win)->SetBackgroundColour(col1);
-
-                  else if(win->IsKindOf(CLASSINFO(wxRadioButton)))
-					  		if(cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
-								((wxRadioButton*)win)->SetForegroundColour(wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ));
-							else
-								((wxRadioButton*)win)->SetForegroundColour(col1);
-
-                  else if(win->IsKindOf(CLASSINFO(wxNotebook)))
-				  {
-						if(cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
-							((wxNotebook*)win)->SetBackgroundColour(wxColour(255,255,255));
-						else
-							((wxNotebook*)win)->SetBackgroundColour(col1);
-						((wxNotebook*)win)->SetForegroundColour(text_color);
-				  }
-
-                  else if(win->IsKindOf(CLASSINFO(wxGrid)))
-				  {
-					  if(cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
-						((wxGrid*)win)->SetDefaultCellBackgroundColour(wxColour(255,255,255));
-					  else
-						((wxGrid*)win)->SetDefaultCellBackgroundColour(col1);
-					  ((wxGrid*)win)->SetDefaultCellTextColour(uitext);
-					  ((wxGrid*)win)->SetLabelBackgroundColour(col);
-					  ((wxGrid*)win)->SetLabelTextColour(uitext);
-					  ((wxGrid*)win)->SetDividerPen(wxPen(col));
-					  ((wxGrid*)win)->SetGridLineColour(gridline);
-					  
-				  }
-
-                  else if(win->IsKindOf(CLASSINFO(wxButton)))
-				  {
-					  if(cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
-					  {
-						  ((wxButton*)win)->SetForegroundColour(wxNullColour);
-						   ((wxButton*)win)->SetBackgroundColour(wxNullColour);
-					  }
-					  else
-					  {
-						((wxButton*)win)->SetBackgroundColour(col1);
-					  }
-
-				  }
-
-                 else
-				  {;
-				  }
-
-				  if(win->GetChildren().GetCount() > 0)
-				  {
-					  wxWindow * w = win;
-					  dialogDimmer(cs,w,col,col1,back_color,text_color,uitext,udkrd);
-				  }
+        if ( win->IsKindOf( CLASSINFO( wxListBox ) ) )
+            if ( cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
+                ( ( wxListBox* )win )->SetBackgroundColour( wxNullColour );
+            else
+                ( ( wxListBox* )win )->SetBackgroundColour( col1 );
+
+        else if ( win->IsKindOf( CLASSINFO( wxChoice ) ) )
+            if ( cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
+                ( ( wxChoice* )win )->SetBackgroundColour( wxColour( 255,255,255 ) );
+            else
+                ( ( wxChoice* )win )->SetBackgroundColour( col1 );
+
+        else if ( win->IsKindOf( CLASSINFO( wxRadioButton ) ) )
+            if ( cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
+                ( ( wxRadioButton* )win )->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+            else
+                ( ( wxRadioButton* )win )->SetForegroundColour( col1 );
+
+        else if ( win->IsKindOf( CLASSINFO( wxNotebook ) ) )
+        {
+            if ( cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
+                ( ( wxNotebook* )win )->SetBackgroundColour( wxColour( 255,255,255 ) );
+            else
+                ( ( wxNotebook* )win )->SetBackgroundColour( col1 );
+            ( ( wxNotebook* )win )->SetForegroundColour( text_color );
+        }
+
+        else if ( win->IsKindOf( CLASSINFO( wxGrid ) ) )
+        {
+            if ( cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
+                ( ( wxGrid* )win )->SetDefaultCellBackgroundColour( wxColour( 255,255,255 ) );
+            else
+                ( ( wxGrid* )win )->SetDefaultCellBackgroundColour( col1 );
+            ( ( wxGrid* )win )->SetDefaultCellTextColour( uitext );
+            ( ( wxGrid* )win )->SetLabelBackgroundColour( col );
+            ( ( wxGrid* )win )->SetLabelTextColour( uitext );
+            ( ( wxGrid* )win )->SetDividerPen( wxPen( col ) );
+            ( ( wxGrid* )win )->SetGridLineColour( gridline );
+
+        }
+
+        else if ( win->IsKindOf( CLASSINFO( wxButton ) ) )
+        {
+            if ( cs == PI_GLOBAL_COLOR_SCHEME_DAY || cs == PI_GLOBAL_COLOR_SCHEME_RGB )
+            {
+                ( ( wxButton* )win )->SetForegroundColour( wxNullColour );
+                ( ( wxButton* )win )->SetBackgroundColour( wxNullColour );
+            }
+            else
+            {
+                ( ( wxButton* )win )->SetBackgroundColour( col1 );
             }
+
+        }
+
+        else
+        {
+            ;
+        }
+
+        if ( win->GetChildren().GetCount() > 0 )
+        {
+            wxWindow * w = win;
+            dialogDimmer( cs,w,col,col1,back_color,text_color,uitext,udkrd );
+        }
+    }
 }
 
-void logbookkonni_pi::UpdateAuiStatus(void)
+void logbookkonni_pi::UpdateAuiStatus( void )
 {
 }
 
 int logbookkonni_pi::GetAPIVersionMajor()
 {
-	return MY_API_VERSION_MAJOR;
+    return MY_API_VERSION_MAJOR;
 }
 
 int logbookkonni_pi::GetAPIVersionMinor()
 {
-	return MY_API_VERSION_MINOR;
+    return MY_API_VERSION_MINOR;
 }
 
 int logbookkonni_pi::GetPlugInVersionMajor()
 {
-	return PLUGIN_VERSION_MAJOR;
+    return PLUGIN_VERSION_MAJOR;
 }
 
 int logbookkonni_pi::GetPlugInVersionMinor()
 {
-	return PLUGIN_VERSION_MINOR;
+    return PLUGIN_VERSION_MINOR;
 }
 
 wxString logbookkonni_pi::GetCommonName()
 {
-	return _("Logbook");
+    return _( "Logbook" );
 }
 
 wxString logbookkonni_pi::GetShortDescription()
 {
-	return _("Logbook for OpenCPN");
+    return _( "Logbook for OpenCPN" );
 }
 
 wxString logbookkonni_pi::GetLongDescription()
 {
-	return _("Logbook for OpenCPN\n\n\
+    return _( "Logbook for OpenCPN\n\n\
 Thanks to the community for their helpful suggestions.\n\n\
 If you find a bug post it on\nhttp://www.cruisersforum.com/forums/f134/logbook-konni-for-opencpn-68945.html\n\
-Helpful videos are at Youtube, search for LogbookKonni.");
+Helpful videos are at Youtube, search for LogbookKonni." );
 }
 
 
-void logbookkonni_pi::OnContextMenuItemCallback(int id)
+void logbookkonni_pi::OnContextMenuItemCallback( int id )
 {
 }
 
-void logbookkonni_pi::SetNMEASentence(wxString &sentence)
+void logbookkonni_pi::SetNMEASentence( wxString &sentence )
 {
-      if(m_plogbook_window)
-      {
-		  m_plogbook_window->logbook->SetSentence(sentence);
-      }
+    if ( m_plogbook_window )
+    {
+        m_plogbook_window->logbook->SetSentence( sentence );
+    }
+}
+
+void logbookkonni_pi::SetPositionFix( PlugIn_Position_Fix &pfix )
+{
+    if ( m_plogbook_window )
+    {
+        if ( m_plogbook_window->logbook )
+            m_plogbook_window->logbook->SetPosition( pfix );
+    }
 }
 
-void logbookkonni_pi::SetPositionFix(PlugIn_Position_Fix &pfix)
+void logbookkonni_pi::SetDefaults( void )
 {
-      if(m_plogbook_window)
-	  {
-		  if(m_plogbook_window->logbook)
-			m_plogbook_window->logbook->SetPosition(pfix);
-      }
+    // If the config somehow says NOT to show the icon, override it so the user gets good feedback
+    if ( !m_bLOGShowIcon )
+    {
+        m_bLOGShowIcon = true;
+        m_leftclick_tool_id  = InsertPlugInTool( _T( "" ), _img_logbook_pi, _img_logbook_pi, wxITEM_NORMAL,
+                               _( "Logbook" ), _T( "" ), NULL,
+                               LOGBOOK_TOOL_POSITION, 0, this );
+
+    }
 }
 
-void logbookkonni_pi::SetDefaults(void)
+wxString logbookkonni_pi::StandardPath( void )
 {
-      // If the config somehow says NOT to show the icon, override it so the user gets good feedback
-      if(!m_bLOGShowIcon)
-      {
-            m_bLOGShowIcon = true;
-            m_leftclick_tool_id  = InsertPlugInTool(_T(""), _img_logbook_pi, _img_logbook_pi, wxITEM_NORMAL,
-                  _("Logbook"), _T(""), NULL,
-                   LOGBOOK_TOOL_POSITION, 0, this);
+    wxStandardPathsBase& std_path = wxStandardPathsBase::Get();
+    wxString s = wxFileName::GetPathSeparator();
+
+#ifdef __WXMSW__
+    wxString stdPath  = std_path.GetConfigDir();
+#endif
+#ifdef __WXGTK__
+    wxString stdPath  = std_path.GetUserDataDir();
+#endif
+#ifdef __WXOSX__
+    wxString stdPath  = ( std_path.GetUserConfigDir() + s + _T( "opencpn" ) );
+#endif
 
-      }
+    stdPath += s + _T( "plugins" );
+    if ( !wxDirExists( stdPath ) )
+        wxMkdir( stdPath );
+
+    stdPath += s + _T( "logbook" );
+
+#ifdef __WXOSX__
+    // Compatibility with pre-OCPN-4.2; move config dir to
+    // ~/Library/Preferences/opencpn if it exists
+    wxString oldPath = ( std_path.GetUserConfigDir() + s + _T( "plugins" ) + s + _T( "logbook" ) );
+    if ( wxDirExists( oldPath ) && !wxDirExists( stdPath ) )
+    {
+        wxLogMessage( "logbookkonni_pi: moving config dir %s to %s", oldPath, stdPath );
+        wxRenameFile( oldPath, stdPath );
+    }
+#endif
+
+    if ( !wxDirExists( stdPath ) )
+        wxMkdir( stdPath );
+
+    stdPath += s; // is this necessary?
+    return stdPath;
 }
 
 wxBitmap *logbookkonni_pi::GetPlugInBitmap()
 {
-      return _img_logbook_pi;
+    return _img_logbook_pi;
 }
 
-int logbookkonni_pi::GetToolbarToolCount(void)
+int logbookkonni_pi::GetToolbarToolCount( void )
 {
-      return 1;
+    return 1;
 }
 
 void logbookkonni_pi::ShowPreferencesDialog( wxWindow* parent )
 {
-	dlgShow = false;
+    dlgShow = false;
 
 //#ifdef __WXOSX__
 // Not tested yet
 //#else
-	if(opt->firstTime)
-	{
+    if ( opt->firstTime )
+    {
 //		loadLayouts(parent);
 //		delete opt;
 //		opt = new Options();
 //		LoadConfig();
-		opt->firstTime = false;
-	}
+        opt->firstTime = false;
+    }
 //#endif
 
 #ifdef __WXMSW__
-	optionsDialog = new LogbookOptions(parent, opt, this, -1, _("Logbook Preferences"), wxDefaultPosition,  wxSize( 692,660  ),
-		wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    optionsDialog = new LogbookOptions( parent, opt, this, -1, _( "Logbook Preferences" ), wxDefaultPosition,  wxSize( 692,660  ),
+                                        wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 #elif defined __WXOSX__
-    optionsDialog = new LogbookOptions(parent, opt, this, -1, _("Logbook Preferences"), wxDefaultPosition,  wxSize( 710,685 ) ,
-		wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    optionsDialog = new LogbookOptions( parent, opt, this, -1, _( "Logbook Preferences" ), wxDefaultPosition,  wxSize( 710,685 ) ,
+                                        wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 #else
-	optionsDialog = new LogbookOptions(parent, opt, this, -1, _("Logbook Preferences"), wxDefaultPosition,  wxSize( 740,700 ) ,
-		wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );	
+    optionsDialog = new LogbookOptions( parent, opt, this, -1, _( "Logbook Preferences" ), wxDefaultPosition,  wxSize( 740,700 ) ,
+                                        wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 #endif
-	optionsDialog->m_checkBoxShowLogbook->SetValue(m_bLOGShowIcon);
+    optionsDialog->m_checkBoxShowLogbook->SetValue( m_bLOGShowIcon );
 
-     if(optionsDialog->ShowModal() == wxID_OK)
-      {
-		  optionsDialog->getValues();
-            //    Show Icon changed value?
-		  if(m_bLOGShowIcon != optionsDialog->m_checkBoxShowLogbook->GetValue())
-            {
-                  m_bLOGShowIcon= optionsDialog->m_checkBoxShowLogbook->GetValue();
+    if ( optionsDialog->ShowModal() == wxID_OK )
+    {
+        optionsDialog->getValues();
+        //    Show Icon changed value?
+        if ( m_bLOGShowIcon != optionsDialog->m_checkBoxShowLogbook->GetValue() )
+        {
+            m_bLOGShowIcon= optionsDialog->m_checkBoxShowLogbook->GetValue();
 
-                  if(m_bLOGShowIcon)
-                        m_leftclick_tool_id  = InsertPlugInTool(_T(""), _img_logbook_pi, _img_logbook_pi, wxITEM_NORMAL,
-                              _("Logbook"), _T(""), NULL, LOGBOOK_TOOL_POSITION,
-                              0, this);
-                  else
-                        RemovePlugInTool(m_leftclick_tool_id);
-            }
-            SaveConfig();
-      }
+            if ( m_bLOGShowIcon )
+                m_leftclick_tool_id  = InsertPlugInTool( _T( "" ), _img_logbook_pi, _img_logbook_pi, wxITEM_NORMAL,
+                                       _( "Logbook" ), _T( "" ), NULL, LOGBOOK_TOOL_POSITION,
+                                       0, this );
+            else
+                RemovePlugInTool( m_leftclick_tool_id );
+        }
+        SaveConfig();
+    }
 }
 
-void logbookkonni_pi::OnToolbarToolCallback(int id)
+void logbookkonni_pi::OnToolbarToolCallback( int id )
 {
 #ifdef __WXOSX__
-	if(dlgShow && !m_plogbook_window->IsIconized())
-	{
-		m_plogbook_window->Raise();
-		return;
-	}
+    if ( dlgShow && !m_plogbook_window->IsIconized() )
+    {
+        m_plogbook_window->Raise();
+        return;
+    }
 #endif
-	dlgShow = !dlgShow;
-      // show the Logbook dialog
-	if(NULL == m_plogbook_window)
-	{
-		if(m_timer == NULL)
-		{
-			if(timer == NULL)
-					timer = new LogbookTimer(this);
-			m_timer = new wxTimer(timer,ID_LOGTIMER);
-			timer->Connect( wxEVT_TIMER, wxObjectEventFunction( &LogbookTimer::OnTimer ));
-		}
-        m_plogbook_window = new LogbookDialog(this, m_timer, timer, m_parent_window, wxID_ANY, _("Active Logbook"), wxDefaultPosition, wxSize( opt->dlgWidth,opt->dlgHeight ), wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER);
-		m_plogbook_window->init();
-		m_plogbook_window->CenterOnParent();
-		m_plogbook_window->Show();
-		dlgShow = true;
-	}
-	else
-	{
-		if(m_plogbook_window->IsIconized())
-		{
-			m_plogbook_window->Iconize(false);
-			m_plogbook_window->Show(true);
-			dlgShow = true;
-		}
-		else
-		{
-			m_plogbook_window->Show(dlgShow);
-		}
-	}
-
-    if (m_plogbook_window->IsShown())
-            SendPluginMessage(wxString(_T("LOGBOOK_WINDOW_SHOWN")), wxEmptyString);
-      else
-            SendPluginMessage(_T("LOGBOOK_WINDOW_HIDDEN"), wxEmptyString);
-
-	if(state == OFF)
-	{
-		if(!opt->checkStateOfEvents())
-			state = ONNOEVENTS;
-		else
-			state = ONWITHEVENTS;
-	}
-	else
-	{
-		state = OFF;
-	}
-
-      // Toggle is handled by the toolbar but we must keep plugin manager b_toggle updated
-      // to actual status to ensure correct status upon toolbar rebuild
-     // SetToolbarItemState( m_leftclick_tool_id, dlgShow );
+    dlgShow = !dlgShow;
+    // show the Logbook dialog
+    if ( NULL == m_plogbook_window )
+    {
+        if ( m_timer == NULL )
+        {
+            if ( timer == NULL )
+                timer = new LogbookTimer( this );
+            m_timer = new wxTimer( timer,ID_LOGTIMER );
+            timer->Connect( wxEVT_TIMER, wxObjectEventFunction( &LogbookTimer::OnTimer ) );
+        }
+        m_plogbook_window = new LogbookDialog( this, m_timer, timer, m_parent_window, wxID_ANY, _( "Active Logbook" ), wxDefaultPosition, wxSize( opt->dlgWidth,opt->dlgHeight ), wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+        m_plogbook_window->init();
+        m_plogbook_window->CenterOnParent();
+        m_plogbook_window->Show();
+        dlgShow = true;
+    }
+    else
+    {
+        if ( m_plogbook_window->IsIconized() )
+        {
+            m_plogbook_window->Iconize( false );
+            m_plogbook_window->Show( true );
+            dlgShow = true;
+        }
+        else
+        {
+            m_plogbook_window->Show( dlgShow );
+        }
+    }
+
+    if ( m_plogbook_window->IsShown() )
+        SendPluginMessage( wxString( _T( "LOGBOOK_WINDOW_SHOWN" ) ), wxEmptyString );
+    else
+        SendPluginMessage( _T( "LOGBOOK_WINDOW_HIDDEN" ), wxEmptyString );
+
+    if ( state == OFF )
+    {
+        if ( !opt->checkStateOfEvents() )
+            state = ONNOEVENTS;
+        else
+            state = ONWITHEVENTS;
+    }
+    else
+    {
+        state = OFF;
+    }
+
+    // Toggle is handled by the toolbar but we must keep plugin manager b_toggle updated
+    // to actual status to ensure correct status upon toolbar rebuild
+    // SetToolbarItemState( m_leftclick_tool_id, dlgShow );
 }
 
 void logbookkonni_pi::SaveConfig()
 {
-      wxFileConfig *pConf = (wxFileConfig *)m_pconfig;
-
-      if(pConf)
-      {
-			pConf->SetPath ( _T ( "/PlugIns/Logbook" ) );
-			pConf->Write ( _T( "ShowLOGIcon" ), m_bLOGShowIcon );
-			pConf->Write ( _T( "Traditional" ), opt->traditional );
-			pConf->Write ( _T( "ToolTips" ),    opt->showToolTips );
-
-			pConf->Write ( _T ( "FirstTime" ),  opt->firstTime);
-			if(m_plogbook_window)
-			{
-			  pConf->Write( _T( "DlgWidth" ),  m_plogbook_window->GetSize().GetX());
-			  pConf->Write ( _T( "DlgHeight" ), m_plogbook_window->GetSize().GetY());
-			}
-
-			pConf->Write ( _T ( "Popup"),opt->popup);
-			pConf->Write ( _T ( "DateFormat" ), opt->dateformat );
-			pConf->Write ( _T ( "DateSepIndiv" ), opt->dateseparatorindiv );
-			pConf->Write ( _T ( "DateSepLocale" ), opt->dateseparatorlocale );
-			pConf->Write ( _T ( "Date1" ), opt->date1);
-			pConf->Write ( _T ( "Date2" ), opt->date2);
-			pConf->Write ( _T ( "Date3" ), opt->date3 );
-            pConf->Write ( _T ( "NoEngines" ), opt->engines );
-
-			pConf->Write ( _T ( "TimeFormat" ), opt->timeformat );
-			pConf->Write ( _T ( "NoSeconds" ), opt->noseconds );
-
-			pConf->Write ( _T ( "GuardChange" ), opt->guardChange );
-			pConf->Write ( _T ( "GuardChangeText" ), opt->guardChangeText );
-			pConf->Write ( _T ( "WaypointArrived" ), opt->waypointArrived );
-			pConf->Write ( _T ( "WayPointText" ), opt->waypointText );
-			pConf->Write ( _T ( "CourseChange" ), opt->courseChange );
-			pConf->Write ( _T ( "CouseChangeDegrees" ), opt->courseChangeDegrees );
-			pConf->Write ( _T ( "CouseChangeAfter" ), opt->courseTextAfterMinutes );
-			pConf->Write ( _T ( "CourseChangeText" ), opt->courseChangeText );
-			pConf->Write ( _T ( "EverySM" ), opt->everySM );
-			pConf->Write ( _T ( "EverySMAmount" ), opt->everySMAmount );
-			pConf->Write ( _T ( "everySMText" ), opt->everySMText );
-
-			pConf->Write ( _T ( "Timer" ), opt->timer );
-			pConf->Write ( _T ( "TimerType" ), opt->timerType );
-			pConf->Write ( _T ( "Local" ), opt->local );
-			pConf->Write ( _T ( "UTC" ),   opt->UTC );
-			pConf->Write ( _T ( "GPSAuto" ), opt->gpsAuto );
-			pConf->Write ( _T ( "TzIndicator" ), opt->tzIndicator );
-			pConf->Write ( _T ( "TzHours" ), opt->tzHour );
-			pConf->Write ( _T ( "TimerHours" ), opt->thour );
-			pConf->Write ( _T ( "TimerMin" ), opt->tmin );
-			pConf->Write ( _T ( "TimerSec" ), opt->tsec );
-			pConf->Write ( _T ( "TimerText" ), opt->ttext );
-
-			pConf->Write ( _T ( "NavDegrees" ), opt->Deg );
-			pConf->Write ( _T ( "NavMin" ), opt->Min );
-			pConf->Write ( _T ( "NavSec" ), opt->Sec );
-			pConf->Write ( _T ( "NavDistance" ), opt->distance );
-			pConf->Write ( _T ( "NavSpeed" ), opt->speed );
-			pConf->Write ( _T ( "NavMeter" ), opt->meter );
-			pConf->Write ( _T ( "NavFeet" ), opt->feet);
-			pConf->Write ( _T ( "NavFathom" ), opt->fathom );
-
-			pConf->Write ( _T ( "Baro" ), opt->baro);
-			pConf->Write ( _T ( "Temperature" ), opt->temperature);
-			pConf->Write ( _T ( "Windkts" ), opt->windkts );
-			pConf->Write ( _T ( "WindMeter" ), opt->windmeter );
-			pConf->Write ( _T ( "WindKmh" ), opt->windkmh );
-
-			pConf->Write ( _T ( "Vol" ), opt->vol );
-			pConf->Write ( _T ( "Motorhours" ), opt->motorh);
-            pConf->Write ( _T ( "Engine" ), opt->engine );
-            pConf->Write ( _T ( "Shaft" ), opt->shaft);
-            pConf->Write ( _T ( "RPM" ), opt->rpm );
-
-			pConf->Write ( _T ( "Days" ), opt->days );
-			pConf->Write ( _T ( "Weeks" ), opt->weeks );
-			pConf->Write ( _T ( "Month" ), opt->month );
-
-			pConf->Write ( _T ( "Watermaker" ), opt->watermaker);
-			pConf->Write ( _T ( "FuelTank" ),   opt->fuelTank);
-			pConf->Write ( _T ( "WaterTank" ),  opt->waterTank);
-			pConf->Write ( _T ( "Ampere" ),     opt->ampere);
-			pConf->Write ( _T ( "Bank1" ),      opt->bank1);
-			pConf->Write ( _T ( "Bank2" ),      opt->bank2);
-
-			pConf->Write ( _T ( "ShowDepth" ), opt->showDepth);
-			pConf->Write ( _T ( "ShowWaveSwell" ), opt->showWaveSwell);
-			pConf->Write ( _T ( "ShowWindSpeed" ), opt->showWindSpeed);
-			pConf->Write ( _T ( "ShowWindDir" ), opt->showWindDir);
-			pConf->Write ( _T ( "ShowHeading" ), opt->showHeading);
-			pConf->Write ( _T ( "ShowWindHeading" ), opt->showWindHeading);
-			
-			pConf->Write ( _T ( "NavHTML" ), opt->navHTML);
-			pConf->Write ( _T ( "CrewHTML" ), opt->crewHTML);
-			pConf->Write ( _T ( "BoatHTML" ), opt->boatHTML);
-			pConf->Write ( _T ( "overviewHTML" ), opt->overviewHTML);
-			pConf->Write ( _T ( "serviceHTML" ), opt->serviceHTML);
-			pConf->Write ( _T ( "repairsHTML" ), opt->repairsHTML);
-			pConf->Write ( _T ( "buypartsHTML" ), opt->buypartsHTML);	
-			pConf->Write ( _T ( "OverViewAll" ), opt->overviewAll);
-
-			pConf->Write ( _T ( "NavGridLayout" ), opt->navGridLayoutChoice);
-			pConf->Write ( _T ( "CrewGridLayout" ), opt->crewGridLayoutChoice);
-			pConf->Write ( _T ( "BoatGridLayout" ), opt->boatGridLayoutChoice);
-			pConf->Write ( _T ( "overviewGridLayout" ), opt->overviewGridLayoutChoice);
-			pConf->Write ( _T ( "serviceGridLayout" ), opt->serviceGridLayoutChoice);
-			pConf->Write ( _T ( "repairsGridLayout" ), opt->repairsGridLayoutChoice);
-			pConf->Write ( _T ( "buypartsGridLayout" ), opt->buypartsGridLayoutChoice);	
-
-			pConf->Write ( _T ( "NavGridLayoutODT" ), opt->navGridLayoutChoiceODT);
-			pConf->Write ( _T ( "CrewGridLayoutODT" ), opt->crewGridLayoutChoiceODT);
-			pConf->Write ( _T ( "BoatGridLayoutODT" ), opt->boatGridLayoutChoiceODT);
-			pConf->Write ( _T ( "overviewGridLayoutODT" ), opt->overviewGridLayoutChoiceODT);
-			pConf->Write ( _T ( "serviceGridLayoutODT" ), opt->serviceGridLayoutChoiceODT);
-			pConf->Write ( _T ( "repairsGridLayoutODT" ), opt->repairsGridLayoutChoiceODT);
-			pConf->Write ( _T ( "buypartsGridLayoutODT" ), opt->buypartsGridLayoutChoiceODT);
-			
-			pConf->Write ( _T ( "HTMLEditor" ), opt->htmlEditor);
-			pConf->Write ( _T ( "ODTEditor" ), opt->odtEditor);
-			pConf->Write ( _T ( "DataManager" ), opt->dataManager);
-			pConf->Write ( _T ( "MailClient" ), opt->mailClient);
-
-			pConf->Write ( _T ( "GPSWarning" ), opt->noGPS);
-            pConf->Write ( _T ( "EngineMessageSails" ), opt->engineMessageSails);
-            pConf->Write ( _T ( "WriteEngineRun" ), opt->engineMessageRunning);
-            pConf->Write ( _T ( "SailsDown" ), opt->engineAllwaysSailsDown);
-            pConf->Write ( _T ( "StatusBar" ), opt->statusbar);
-            wxString str = wxEmptyString;
-            for(int i = 0; i < 7; i++)
-                str += wxString::Format(_T("%i,%s,"),opt->filterLayout[i],opt->layoutPrefix[i].c_str());
-            str.RemoveLast();
-            pConf->Write ( _T ( "PrefixLayouts" ), str);
-
-            wxString kmlRouteTrack = wxString::Format(_T("%i,%i"),opt->kmlRoute,opt->kmlTrack);
-            pConf->Write ( _T ( "KMLRouteTrack" ), kmlRouteTrack);
-            pConf->Write ( _T ( "KMLWidth" ), opt->kmlLineWidth);
-            pConf->Write ( _T ( "KMLTransp" ), opt->kmlLineTransparancy);
-            pConf->Write ( _T ( "KMLRouteColor" ), opt->kmlRouteColor);
-            pConf->Write ( _T ( "KMLTrackColor" ), opt->kmlTrackColor);
-
-            pConf->Write ( _T ( "RPMIsChecked" ), opt->bRPMIsChecked);
-            pConf->Write ( _T ( "Eng1RPMIsChecked" ), opt->bEng1RPMIsChecked);
-            pConf->Write ( _T ( "Eng2RPMIsChecked" ), opt->bEng2RPMIsChecked);
-            pConf->Write ( _T ( "GenRPMIsChecked" ), opt->bGenRPMIsChecked);
-
-            pConf->Write ( _T ( "NMEAUseRPM" ), opt->NMEAUseERRPM);
-            pConf->Write ( _T ( "NMEAUseWIMDA" ), opt->NMEAUseWIMDA);
-            pConf->Write ( _T ( "Engine1" ), opt->engine1Id);
-            pConf->Write ( _T ( "Engine2" ), opt->engine2Id);
-            pConf->Write ( _T ( "Engine1Runs" ), opt->engine1Running);
-            pConf->Write ( _T ( "Engine2Runs" ), opt->engine2Running);
-
-            pConf->Write ( _T ( "Generator" ), opt->generator);
-            pConf->Write ( _T ( "GeneratorId" ), opt->generatorId);
-
-            pConf->Write ( _T ( "GeneratorRuns" ), opt->generatorRunning);
-
-            pConf->Write ( _T ( "ShowLayoutP" ), opt->layoutShow);
-
-            pConf->Write ( _T ( "toggleEngine1" ), opt->toggleEngine1);
-            pConf->Write ( _T ( "toggleEngine2" ), opt->toggleEngine2);
-            pConf->Write ( _T ( "toggleGenerator" ), opt->toggleGenerator);
-
-            wxString sails = wxEmptyString;
-            sails = wxString::Format(_T("%i,%i,"),opt->rowGap,opt->colGap);
-            for(int i = 0; i < 14; i++)
-                sails += wxString::Format(_T("%s,%s,%i,"),opt->abrSails.Item(i).c_str(),opt->sailsName.Item(i).c_str(),opt->bSailIsChecked[i]);
-            sails.RemoveLast();
-            pConf->Write ( _T ( "Sails" ), sails);
-
-            if(opt->dtEngine1On.IsValid())
-                pConf->Write ( _T ( "Engine1TimeStart" ), opt->dtEngine1On.FormatISODate()+_T(" ")+
-                    opt->dtEngine1On.FormatISOTime());
-            else
-                pConf->Write ( _T ( "Engine1TimeStart" ),wxEmptyString);
+    wxFileConfig *pConf = ( wxFileConfig * )m_pconfig;
 
-            if(opt->dtEngine2On.IsValid())
-                pConf->Write ( _T ( "Engine2TimeStart" ), opt->dtEngine2On.FormatISODate()+_T(" ")+
-                    opt->dtEngine2On.FormatISOTime());
-            else
-                pConf->Write ( _T ( "Engine2TimeStart" ),wxEmptyString);
+    if ( pConf )
+    {
+        pConf->SetPath ( _T ( "/PlugIns/Logbook" ) );
+        pConf->Write ( _T( "ShowLOGIcon" ), m_bLOGShowIcon );
+        pConf->Write ( _T( "Traditional" ), opt->traditional );
+        pConf->Write ( _T( "ToolTips" ),    opt->showToolTips );
 
-            if(opt->dtGeneratorOn.IsValid())
-                pConf->Write ( _T ( "GeneratorTimeStart" ), opt->dtGeneratorOn.FormatISODate()+_T(" ")+
-                            opt->dtGeneratorOn.FormatISOTime());
-            else
-                pConf->Write ( _T ( "GeneratorTimeStart" ),wxEmptyString);
+        pConf->Write ( _T ( "FirstTime" ),  opt->firstTime );
+        if ( m_plogbook_window )
+        {
+            pConf->Write( _T( "DlgWidth" ),  m_plogbook_window->GetSize().GetX() );
+            pConf->Write ( _T( "DlgHeight" ), m_plogbook_window->GetSize().GetY() );
+        }
 
-            writeCols(pConf,opt->NavColWidth,		_T("NavGridColWidth"));
-            writeCols(pConf,opt->WeatherColWidth,	_T("WeatherGridColWidth"));
-            writeCols(pConf,opt->MotorColWidth,		_T("MotorGridColWidth"));
-            writeCols(pConf,opt->CrewColWidth,		_T("CrewGridColWidth"));
-            writeCols(pConf,opt->WakeColWidth,		_T("WakeGridColWidth"));
-            writeCols(pConf,opt->EquipColWidth,		_T("EquipGridColWidth"));
-            writeCols(pConf,opt->OverviewColWidth,	_T("OverviewGridColWidth"));
-            writeCols(pConf,opt->ServiceColWidth,	_T("ServiceGridColWidth"));
-            writeCols(pConf,opt->RepairsColWidth,	_T("RepairsGridColWidth"));
-            writeCols(pConf,opt->BuyPartsColWidth,	_T("BuyPartsGridColWidth"));
-	  }
+        pConf->Write ( _T ( "Popup" ),opt->popup );
+        pConf->Write ( _T ( "DateFormat" ), opt->dateformat );
+        pConf->Write ( _T ( "DateSepIndiv" ), opt->dateseparatorindiv );
+        pConf->Write ( _T ( "DateSepLocale" ), opt->dateseparatorlocale );
+        pConf->Write ( _T ( "Date1" ), opt->date1 );
+        pConf->Write ( _T ( "Date2" ), opt->date2 );
+        pConf->Write ( _T ( "Date3" ), opt->date3 );
+        pConf->Write ( _T ( "NoEngines" ), opt->engines );
+
+        pConf->Write ( _T ( "TimeFormat" ), opt->timeformat );
+        pConf->Write ( _T ( "NoSeconds" ), opt->noseconds );
+
+        pConf->Write ( _T ( "GuardChange" ), opt->guardChange );
+        pConf->Write ( _T ( "GuardChangeText" ), opt->guardChangeText );
+        pConf->Write ( _T ( "WaypointArrived" ), opt->waypointArrived );
+        pConf->Write ( _T ( "WayPointText" ), opt->waypointText );
+        pConf->Write ( _T ( "CourseChange" ), opt->courseChange );
+        pConf->Write ( _T ( "CouseChangeDegrees" ), opt->courseChangeDegrees );
+        pConf->Write ( _T ( "CouseChangeAfter" ), opt->courseTextAfterMinutes );
+        pConf->Write ( _T ( "CourseChangeText" ), opt->courseChangeText );
+        pConf->Write ( _T ( "EverySM" ), opt->everySM );
+        pConf->Write ( _T ( "EverySMAmount" ), opt->everySMAmount );
+        pConf->Write ( _T ( "everySMText" ), opt->everySMText );
+
+        pConf->Write ( _T ( "Timer" ), opt->timer );
+        pConf->Write ( _T ( "TimerType" ), opt->timerType );
+        pConf->Write ( _T ( "Local" ), opt->local );
+        pConf->Write ( _T ( "UTC" ),   opt->UTC );
+        pConf->Write ( _T ( "GPSAuto" ), opt->gpsAuto );
+        pConf->Write ( _T ( "TzIndicator" ), opt->tzIndicator );
+        pConf->Write ( _T ( "TzHours" ), opt->tzHour );
+        pConf->Write ( _T ( "TimerHours" ), opt->thour );
+        pConf->Write ( _T ( "TimerMin" ), opt->tmin );
+        pConf->Write ( _T ( "TimerSec" ), opt->tsec );
+        pConf->Write ( _T ( "TimerText" ), opt->ttext );
+
+        pConf->Write ( _T ( "NavDegrees" ), opt->Deg );
+        pConf->Write ( _T ( "NavMin" ), opt->Min );
+        pConf->Write ( _T ( "NavSec" ), opt->Sec );
+        pConf->Write ( _T ( "NavDistance" ), opt->distance );
+        pConf->Write ( _T ( "NavSpeed" ), opt->speed );
+        pConf->Write ( _T ( "NavMeter" ), opt->meter );
+        pConf->Write ( _T ( "NavFeet" ), opt->feet );
+        pConf->Write ( _T ( "NavFathom" ), opt->fathom );
+
+        pConf->Write ( _T ( "Baro" ), opt->baro );
+        pConf->Write ( _T ( "Temperature" ), opt->temperature );
+        pConf->Write ( _T ( "Windkts" ), opt->windkts );
+        pConf->Write ( _T ( "WindMeter" ), opt->windmeter );
+        pConf->Write ( _T ( "WindKmh" ), opt->windkmh );
+
+        pConf->Write ( _T ( "Vol" ), opt->vol );
+        pConf->Write ( _T ( "Motorhours" ), opt->motorh );
+        pConf->Write ( _T ( "Engine" ), opt->engine );
+        pConf->Write ( _T ( "Shaft" ), opt->shaft );
+        pConf->Write ( _T ( "RPM" ), opt->rpm );
+
+        pConf->Write ( _T ( "Days" ), opt->days );
+        pConf->Write ( _T ( "Weeks" ), opt->weeks );
+        pConf->Write ( _T ( "Month" ), opt->month );
+
+        pConf->Write ( _T ( "Watermaker" ), opt->watermaker );
+        pConf->Write ( _T ( "FuelTank" ),   opt->fuelTank );
+        pConf->Write ( _T ( "WaterTank" ),  opt->waterTank );
+        pConf->Write ( _T ( "Ampere" ),     opt->ampere );
+        pConf->Write ( _T ( "Bank1" ),      opt->bank1 );
+        pConf->Write ( _T ( "Bank2" ),      opt->bank2 );
+
+        pConf->Write ( _T ( "ShowDepth" ), opt->showDepth );
+        pConf->Write ( _T ( "ShowWaveSwell" ), opt->showWaveSwell );
+        pConf->Write ( _T ( "ShowWindSpeed" ), opt->showWindSpeed );
+        pConf->Write ( _T ( "ShowWindDir" ), opt->showWindDir );
+        pConf->Write ( _T ( "ShowHeading" ), opt->showHeading );
+        pConf->Write ( _T ( "ShowWindHeading" ), opt->showWindHeading );
+
+        pConf->Write ( _T ( "NavHTML" ), opt->navHTML );
+        pConf->Write ( _T ( "CrewHTML" ), opt->crewHTML );
+        pConf->Write ( _T ( "BoatHTML" ), opt->boatHTML );
+        pConf->Write ( _T ( "overviewHTML" ), opt->overviewHTML );
+        pConf->Write ( _T ( "serviceHTML" ), opt->serviceHTML );
+        pConf->Write ( _T ( "repairsHTML" ), opt->repairsHTML );
+        pConf->Write ( _T ( "buypartsHTML" ), opt->buypartsHTML );
+        pConf->Write ( _T ( "OverViewAll" ), opt->overviewAll );
+
+        pConf->Write ( _T ( "NavGridLayout" ), opt->navGridLayoutChoice );
+        pConf->Write ( _T ( "CrewGridLayout" ), opt->crewGridLayoutChoice );
+        pConf->Write ( _T ( "BoatGridLayout" ), opt->boatGridLayoutChoice );
+        pConf->Write ( _T ( "overviewGridLayout" ), opt->overviewGridLayoutChoice );
+        pConf->Write ( _T ( "serviceGridLayout" ), opt->serviceGridLayoutChoice );
+        pConf->Write ( _T ( "repairsGridLayout" ), opt->repairsGridLayoutChoice );
+        pConf->Write ( _T ( "buypartsGridLayout" ), opt->buypartsGridLayoutChoice );
+
+        pConf->Write ( _T ( "NavGridLayoutODT" ), opt->navGridLayoutChoiceODT );
+        pConf->Write ( _T ( "CrewGridLayoutODT" ), opt->crewGridLayoutChoiceODT );
+        pConf->Write ( _T ( "BoatGridLayoutODT" ), opt->boatGridLayoutChoiceODT );
+        pConf->Write ( _T ( "overviewGridLayoutODT" ), opt->overviewGridLayoutChoiceODT );
+        pConf->Write ( _T ( "serviceGridLayoutODT" ), opt->serviceGridLayoutChoiceODT );
+        pConf->Write ( _T ( "repairsGridLayoutODT" ), opt->repairsGridLayoutChoiceODT );
+        pConf->Write ( _T ( "buypartsGridLayoutODT" ), opt->buypartsGridLayoutChoiceODT );
+
+        pConf->Write ( _T ( "HTMLEditor" ), opt->htmlEditor );
+        pConf->Write ( _T ( "ODTEditor" ), opt->odtEditor );
+        pConf->Write ( _T ( "DataManager" ), opt->dataManager );
+        pConf->Write ( _T ( "MailClient" ), opt->mailClient );
+
+        pConf->Write ( _T ( "GPSWarning" ), opt->noGPS );
+        pConf->Write ( _T ( "EngineMessageSails" ), opt->engineMessageSails );
+        pConf->Write ( _T ( "WriteEngineRun" ), opt->engineMessageRunning );
+        pConf->Write ( _T ( "SailsDown" ), opt->engineAllwaysSailsDown );
+        pConf->Write ( _T ( "StatusBar" ), opt->statusbar );
+        pConf->Write ( _T ( "WindSpeeds" ), opt->windspeeds );
+        pConf->Write ( _T ( "OverviewLines" ), opt->overviewlines );
+
+        wxString str = wxEmptyString;
+        for ( int i = 0; i < 7; i++ )
+            str += wxString::Format( _T( "%i,%s," ),opt->filterLayout[i],opt->layoutPrefix[i].c_str() );
+        str.RemoveLast();
+        pConf->Write ( _T ( "PrefixLayouts" ), str );
+
+        wxString kmlRouteTrack = wxString::Format( _T( "%i,%i" ),opt->kmlRoute,opt->kmlTrack );
+        pConf->Write ( _T ( "KMLRouteTrack" ), kmlRouteTrack );
+        pConf->Write ( _T ( "KMLWidth" ), opt->kmlLineWidth );
+        pConf->Write ( _T ( "KMLTransp" ), opt->kmlLineTransparancy );
+        pConf->Write ( _T ( "KMLRouteColor" ), opt->kmlRouteColor );
+        pConf->Write ( _T ( "KMLTrackColor" ), opt->kmlTrackColor );
+
+        pConf->Write ( _T ( "RPMIsChecked" ), opt->bRPMIsChecked );
+        pConf->Write ( _T ( "Eng1RPMIsChecked" ), opt->bEng1RPMIsChecked );
+        pConf->Write ( _T ( "Eng2RPMIsChecked" ), opt->bEng2RPMIsChecked );
+        pConf->Write ( _T ( "GenRPMIsChecked" ), opt->bGenRPMIsChecked );
+
+        pConf->Write ( _T ( "NMEAUseRPM" ), opt->NMEAUseERRPM );
+        pConf->Write ( _T ( "NMEAUseWIMDA" ), opt->NMEAUseWIMDA );
+        pConf->Write ( _T ( "Engine1" ), opt->engine1Id );
+        pConf->Write ( _T ( "Engine2" ), opt->engine2Id );
+        pConf->Write ( _T ( "Engine1Runs" ), opt->engine1Running );
+        pConf->Write ( _T ( "Engine2Runs" ), opt->engine2Running );
+
+        pConf->Write ( _T ( "Generator" ), opt->generator );
+        pConf->Write ( _T ( "GeneratorId" ), opt->generatorId );
+
+        pConf->Write ( _T ( "GeneratorRuns" ), opt->generatorRunning );
+
+        pConf->Write ( _T ( "ShowLayoutP" ), opt->layoutShow );
+
+        pConf->Write ( _T ( "toggleEngine1" ), opt->toggleEngine1 );
+        pConf->Write ( _T ( "toggleEngine2" ), opt->toggleEngine2 );
+        pConf->Write ( _T ( "toggleGenerator" ), opt->toggleGenerator );
+
+        wxString sails = wxEmptyString;
+        sails = wxString::Format( _T( "%i,%i," ),opt->rowGap,opt->colGap );
+        for ( int i = 0; i < 14; i++ )
+            sails += wxString::Format( _T( "%s,%s,%i," ),opt->abrSails.Item( i ).c_str(),opt->sailsName.Item( i ).c_str(),opt->bSailIsChecked[i] );
+        sails.RemoveLast();
+        pConf->Write ( _T ( "Sails" ), sails );
+
+        if ( opt->dtEngine1On.IsValid() )
+            pConf->Write ( _T ( "Engine1TimeStart" ), opt->dtEngine1On.FormatISODate()+_T( " " )+
+                           opt->dtEngine1On.FormatISOTime() );
+        else
+            pConf->Write ( _T ( "Engine1TimeStart" ),wxEmptyString );
+
+        if ( opt->dtEngine2On.IsValid() )
+            pConf->Write ( _T ( "Engine2TimeStart" ), opt->dtEngine2On.FormatISODate()+_T( " " )+
+                           opt->dtEngine2On.FormatISOTime() );
+        else
+            pConf->Write ( _T ( "Engine2TimeStart" ),wxEmptyString );
+
+        if ( opt->dtGeneratorOn.IsValid() )
+            pConf->Write ( _T ( "GeneratorTimeStart" ), opt->dtGeneratorOn.FormatISODate()+_T( " " )+
+                           opt->dtGeneratorOn.FormatISOTime() );
+        else
+            pConf->Write ( _T ( "GeneratorTimeStart" ),wxEmptyString );
+
+        writeCols( pConf,opt->NavColWidth,		_T( "NavGridColWidth" ) );
+        writeCols( pConf,opt->WeatherColWidth,	_T( "WeatherGridColWidth" ) );
+        writeCols( pConf,opt->MotorColWidth,		_T( "MotorGridColWidth" ) );
+        writeCols( pConf,opt->CrewColWidth,		_T( "CrewGridColWidth" ) );
+        writeCols( pConf,opt->WakeColWidth,		_T( "WakeGridColWidth" ) );
+        writeCols( pConf,opt->EquipColWidth,		_T( "EquipGridColWidth" ) );
+        writeCols( pConf,opt->OverviewColWidth,	_T( "OverviewGridColWidth" ) );
+        writeCols( pConf,opt->ServiceColWidth,	_T( "ServiceGridColWidth" ) );
+        writeCols( pConf,opt->RepairsColWidth,	_T( "RepairsGridColWidth" ) );
+        writeCols( pConf,opt->BuyPartsColWidth,	_T( "BuyPartsGridColWidth" ) );
+    }
 }
 
-void logbookkonni_pi::writeCols(wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry)
+void logbookkonni_pi::writeCols( wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry )
 {
     wxString str = wxEmptyString;
-    for(unsigned int i = 0; i < ar.Count(); i++)
-        str += wxString::Format(_T("%i,"),ar[i]);
+    for ( unsigned int i = 0; i < ar.Count(); i++ )
+        str += wxString::Format( _T( "%i," ),ar[i] );
     str.RemoveLast();
-    pConf->Write(entry,str);
+    pConf->Write( entry,str );
 }
 
 void logbookkonni_pi::LoadConfig()
 {
-      wxFileConfig *pConf = (wxFileConfig *)m_pconfig;
+    wxFileConfig *pConf = ( wxFileConfig * )m_pconfig;
 
-      if(pConf)
-      {
-            pConf->SetPath ( _T( "/PlugIns/Logbook" ) );
-            pConf->Read ( _T( "ShowLOGIcon" ),  &m_bLOGShowIcon, 1 );
-			pConf->Read ( _T( "Traditional" ),  &opt->traditional, 1 );
-			pConf->Read ( _T( "ToolTips" ),  &opt->showToolTips );
-			pConf->Read ( _T( "FirstTime" ),  &opt->firstTime);
+    if ( pConf )
+    {
+        pConf->SetPath ( _T( "/PlugIns/Logbook" ) );
+        pConf->Read ( _T( "ShowLOGIcon" ),  &m_bLOGShowIcon, 1 );
+        pConf->Read ( _T( "Traditional" ),  &opt->traditional, 1 );
+        pConf->Read ( _T( "ToolTips" ),  &opt->showToolTips );
+        pConf->Read ( _T( "FirstTime" ),  &opt->firstTime );
 #ifdef __WXMSW__
-			pConf->Read ( _T( "DlgWidth" ),  &opt->dlgWidth,1010);
+        pConf->Read ( _T( "DlgWidth" ),  &opt->dlgWidth,1010 );
 #elif defined __WXGTK__
-			pConf->Read ( _T( "DlgWidth" ),  &opt->dlgWidth,1085);
+        pConf->Read ( _T( "DlgWidth" ),  &opt->dlgWidth,1085 );
 #elif defined __WXOSX__
-			pConf->Read ( _T( "DlgWidth" ),  &opt->dlgWidth,1085);
+        pConf->Read ( _T( "DlgWidth" ),  &opt->dlgWidth,1085 );
 #endif
-			pConf->Read ( _T( "DlgHeight" ),  &opt->dlgHeight,535);
-			pConf->Read ( _T( "Popup" ),  &opt->popup,true);
+        pConf->Read ( _T( "DlgHeight" ),  &opt->dlgHeight,535 );
+        pConf->Read ( _T( "Popup" ),  &opt->popup,true );
 
-			pConf->Read ( _T ( "DateFormat" ), &opt->dateformat,0 );
-			pConf->Read ( _T ( "DateSepIndiv" ), &opt->dateseparatorindiv );
-			pConf->Read ( _T ( "DateSepLocale" ), &opt->dateseparatorlocale );
-			pConf->Read ( _T ( "Date1" ), &opt->date1,0 );
-			pConf->Read ( _T ( "Date2" ), &opt->date2,1 );
-			pConf->Read ( _T ( "Date3" ), &opt->date3,2 );
-            pConf->Read ( _T ( "NoEngines" ), &opt->engines,0 );
-
-			pConf->Read ( _T ( "TimeFormat" ), &opt->timeformat, -1 );
-			pConf->Read ( _T ( "NoSeconds" ), &opt->noseconds );
-
-			pConf->Read ( _T ( "GuardChange" ), &opt->guardChange );
-			pConf->Read ( _T ( "GuardChangeText" ), &opt->guardChangeText );
-			pConf->Read ( _T ( "WaypointArrived" ), &opt->waypointArrived );
-			pConf->Read ( _T ( "WayPointText" ), &opt->waypointText );
-			pConf->Read ( _T ( "CourseChange" ), &opt->courseChange );
-			pConf->Read ( _T ( "CouseChangeDegrees" ), &opt->courseChangeDegrees );
-			pConf->Read ( _T ( "CouseChangeAfter" ), &opt->courseTextAfterMinutes );
-			pConf->Read ( _T ( "CourseChangeText" ), &opt->courseChangeText );
-			pConf->Read ( _T ( "EverySM" ), &opt->everySM );
-			pConf->Read ( _T ( "EverySMAmount" ), &opt->everySMAmount );
-			pConf->Read ( _T ( "everySMText" ), &opt->everySMText );
-			opt->courseChangeDegrees.ToDouble(&opt->dCourseChangeDegrees);
-			opt->everySMAmount.ToDouble(&opt->dEverySM);
-
-			pConf->Read ( _T ( "Timer" ), &opt->timer );
-			pConf->Read ( _T ( "TimerType" ), &opt->timerType );
-			pConf->Read ( _T ( "Local" ), &opt->local );
-			pConf->Read ( _T ( "UTC" ),	  &opt->UTC );
-			pConf->Read ( _T ( "GPSAuto" ), &opt->gpsAuto);
-			pConf->Read ( _T ( "TzIndicator" ), &opt->tzIndicator );
-			pConf->Read ( _T ( "TzHours" ), &opt->tzHour );
-			pConf->Read ( _T ( "TimerHours" ), &opt->thour,_T("0") );
-			pConf->Read ( _T ( "TimerMin" ), &opt->tmin,_T("1") );
-			pConf->Read ( _T ( "TimerSec" ), &opt->tsec,_T("0") );
-			pConf->Read ( _T ( "TimerText" ), &opt->ttext );
-
-			opt->timerSec = (wxAtol(opt->thour)* 3600000 +
-							 wxAtol(opt->tmin) *60000 +
-							 wxAtol(opt->tsec) * 1000);
-
-			pConf->Read ( _T ( "NavDegrees" ), &opt->Deg );
-			pConf->Read ( _T ( "NavMin" ), &opt->Min );
-			pConf->Read ( _T ( "NavSec" ), &opt->Sec );
-			pConf->Read ( _T ( "NavDistance" ), &opt->distance );
-			pConf->Read ( _T ( "NavSpeed" ), &opt->speed );
-			pConf->Read ( _T ( "Baro" ), &opt->baro);
-			pConf->Read ( _T ( "Temperature" ), &opt->temperature);
-			pConf->Read ( _T ( "NavMeter" ), &opt->meter );
-			pConf->Read ( _T ( "NavFeet" ), &opt->feet);
-			pConf->Read ( _T ( "NavFathom" ), &opt->fathom );
-
-			pConf->Read ( _T ( "Vol" ), &opt->vol );
-            pConf->Read ( _T ( "Motorhours" ), &opt->motorh);
-            pConf->Read ( _T ( "Engine" ), &opt->engine,_T("E") );
-            pConf->Read ( _T ( "Shaft" ), &opt->shaft,_T("S"));
-            pConf->Read ( _T ( "RPM" ), &opt->rpm,_T("RPM") );
-
-			pConf->Read ( _T ( "Windkts" ), &opt->windkts );
-			pConf->Read ( _T ( "WindMeter" ), &opt->windmeter );
-			pConf->Read ( _T ( "WindKmh" ), &opt->windkmh );
-
-			pConf->Read ( _T ( "Days" ), &opt->days );
-			pConf->Read ( _T ( "Weeks" ), &opt->weeks );
-			pConf->Read ( _T ( "Month" ), &opt->month );
-
-			pConf->Read ( _T ( "Watermaker" ), &opt->watermaker);
-			pConf->Read ( _T ( "FuelTank" ),   &opt->fuelTank);
-			pConf->Read ( _T ( "WaterTank" ),  &opt->waterTank);
-			pConf->Read ( _T ( "Ampere" ),     &opt->ampere);
-			pConf->Read ( _T ( "Bank1" ),      &opt->bank1);
-			pConf->Read ( _T ( "Bank2" ),      &opt->bank2);
-
-			pConf->Read ( _T ( "ShowDepth" ), &opt->showDepth);
-			pConf->Read ( _T ( "ShowWaveSwell" ), &opt->showWaveSwell);
-			pConf->Read ( _T ( "ShowWindSpeed" ), &opt->showWindSpeed);
-			pConf->Read ( _T ( "ShowWindDir" ), &opt->showWindDir);
-			pConf->Read ( _T ( "ShowHeading" ), &opt->showHeading);
-			pConf->Read ( _T ( "ShowWindHeading" ), &opt->showWindHeading);
-			
-			pConf->Read( _T ( "NavHTML" ), &opt->navHTML,1);
-			pConf->Read ( _T ( "CrewHTML" ), &opt->crewHTML,1);
-			pConf->Read ( _T ( "BoatHTML" ), &opt->boatHTML,1);
-			pConf->Read ( _T ( "overviewHTML" ), &opt->overviewHTML,1);
-			pConf->Read ( _T ( "serviceHTML" ), &opt->serviceHTML,1);
-			pConf->Read ( _T ( "repairsHTML" ), &opt->repairsHTML,1);
-			pConf->Read ( _T ( "buypartsHTML" ), &opt->buypartsHTML,1);		
-			pConf->Read ( _T ( "OverViewAll" ), &opt->overviewAll,0);
-
-			pConf->Read ( _T ( "NavGridLayout" ), &opt->navGridLayoutChoice,0);
-			pConf->Read ( _T ( "CrewGridLayout" ), &opt->crewGridLayoutChoice,0);
-			pConf->Read ( _T ( "BoatGridLayout" ), &opt->boatGridLayoutChoice,0);
-			pConf->Read ( _T ( "overviewGridLayout" ), &opt->overviewGridLayoutChoice,0);
-			pConf->Read ( _T ( "serviceGridLayout" ), &opt->serviceGridLayoutChoice,0);
-			pConf->Read ( _T ( "repairsGridLayout" ), &opt->repairsGridLayoutChoice,0);
-			pConf->Read ( _T ( "buypartsGridLayout" ), &opt->buypartsGridLayoutChoice,0);
-
-			pConf->Read ( _T ( "NavGridLayoutODT" ), &opt->navGridLayoutChoiceODT,0);
-			pConf->Read ( _T ( "CrewGridLayoutODT" ), &opt->crewGridLayoutChoiceODT,0);
-			pConf->Read ( _T ( "BoatGridLayoutODT" ), &opt->boatGridLayoutChoiceODT,0);
-			pConf->Read ( _T ( "overviewGridLayoutODT" ), &opt->overviewGridLayoutChoiceODT,0);
-			pConf->Read ( _T ( "serviceGridLayoutODT" ), &opt->serviceGridLayoutChoiceODT,0);
-			pConf->Read ( _T ( "repairsGridLayoutODT" ), &opt->repairsGridLayoutChoiceODT,0);
-			pConf->Read ( _T ( "buypartsGridLayout" ), &opt->buypartsGridLayoutChoiceODT,0);
-
-			pConf->Read ( _T ( "HTMLEditor" ), &opt->htmlEditor);
-			pConf->Read ( _T ( "ODTEditor" ), &opt->odtEditor);
-			pConf->Read ( _T ( "DataManager" ), &opt->dataManager);
-			pConf->Read ( _T ( "MailClient" ), &opt->mailClient);
-
-			pConf->Read ( _T ( "GPSWarning" ), &opt->noGPS);
-            pConf->Read ( _T ( "EngineMessageSails" ), &opt->engineMessageSails);
-            pConf->Read ( _T ( "WriteEngineRun" ), &opt->engineMessageRunning);
-            pConf->Read ( _T ( "SailsDown" ), &opt->engineAllwaysSailsDown);
-            pConf->Read ( _T ( "StatusBar" ), &opt->statusbar);
-
-
-            wxString str = wxEmptyString;
-            pConf->Read ( _T ( "PrefixLayouts" ), &str);
-            if(str.Contains(_T(",")))
+        pConf->Read ( _T ( "DateFormat" ), &opt->dateformat,0 );
+        pConf->Read ( _T ( "DateSepIndiv" ), &opt->dateseparatorindiv );
+        pConf->Read ( _T ( "DateSepLocale" ), &opt->dateseparatorlocale );
+        pConf->Read ( _T ( "Date1" ), &opt->date1,0 );
+        pConf->Read ( _T ( "Date2" ), &opt->date2,1 );
+        pConf->Read ( _T ( "Date3" ), &opt->date3,2 );
+        pConf->Read ( _T ( "NoEngines" ), &opt->engines,0 );
+
+        pConf->Read ( _T ( "TimeFormat" ), &opt->timeformat, -1 );
+        pConf->Read ( _T ( "NoSeconds" ), &opt->noseconds );
+
+        pConf->Read ( _T ( "GuardChange" ), &opt->guardChange );
+        pConf->Read ( _T ( "GuardChangeText" ), &opt->guardChangeText );
+        pConf->Read ( _T ( "WaypointArrived" ), &opt->waypointArrived );
+        pConf->Read ( _T ( "WayPointText" ), &opt->waypointText );
+        pConf->Read ( _T ( "CourseChange" ), &opt->courseChange );
+        pConf->Read ( _T ( "CouseChangeDegrees" ), &opt->courseChangeDegrees );
+        pConf->Read ( _T ( "CouseChangeAfter" ), &opt->courseTextAfterMinutes );
+        pConf->Read ( _T ( "CourseChangeText" ), &opt->courseChangeText );
+        pConf->Read ( _T ( "EverySM" ), &opt->everySM );
+        pConf->Read ( _T ( "EverySMAmount" ), &opt->everySMAmount );
+        pConf->Read ( _T ( "everySMText" ), &opt->everySMText );
+        opt->courseChangeDegrees.ToDouble( &opt->dCourseChangeDegrees );
+        opt->everySMAmount.ToDouble( &opt->dEverySM );
+
+        pConf->Read ( _T ( "Timer" ), &opt->timer );
+        pConf->Read ( _T ( "TimerType" ), &opt->timerType );
+        pConf->Read ( _T ( "Local" ), &opt->local );
+        pConf->Read ( _T ( "UTC" ),	  &opt->UTC );
+        pConf->Read ( _T ( "GPSAuto" ), &opt->gpsAuto );
+        pConf->Read ( _T ( "TzIndicator" ), &opt->tzIndicator );
+        pConf->Read ( _T ( "TzHours" ), &opt->tzHour );
+        pConf->Read ( _T ( "TimerHours" ), &opt->thour,_T( "0" ) );
+        pConf->Read ( _T ( "TimerMin" ), &opt->tmin,_T( "1" ) );
+        pConf->Read ( _T ( "TimerSec" ), &opt->tsec,_T( "0" ) );
+        pConf->Read ( _T ( "TimerText" ), &opt->ttext );
+
+        opt->timerSec = ( wxAtol( opt->thour )* 3600000 +
+                          wxAtol( opt->tmin ) *60000 +
+                          wxAtol( opt->tsec ) * 1000 );
+
+        pConf->Read ( _T ( "NavDegrees" ), &opt->Deg );
+        pConf->Read ( _T ( "NavMin" ), &opt->Min );
+        pConf->Read ( _T ( "NavSec" ), &opt->Sec );
+        pConf->Read ( _T ( "NavDistance" ), &opt->distance );
+        pConf->Read ( _T ( "NavSpeed" ), &opt->speed );
+        pConf->Read ( _T ( "Baro" ), &opt->baro );
+        pConf->Read ( _T ( "Temperature" ), &opt->temperature );
+        pConf->Read ( _T ( "NavMeter" ), &opt->meter );
+        pConf->Read ( _T ( "NavFeet" ), &opt->feet );
+        pConf->Read ( _T ( "NavFathom" ), &opt->fathom );
+
+        pConf->Read ( _T ( "Vol" ), &opt->vol );
+        pConf->Read ( _T ( "Motorhours" ), &opt->motorh );
+        pConf->Read ( _T ( "Engine" ), &opt->engine,_T( "E" ) );
+        pConf->Read ( _T ( "Shaft" ), &opt->shaft,_T( "S" ) );
+        pConf->Read ( _T ( "RPM" ), &opt->rpm,_T( "RPM" ) );
+
+        pConf->Read ( _T ( "Windkts" ), &opt->windkts );
+        pConf->Read ( _T ( "WindMeter" ), &opt->windmeter );
+        pConf->Read ( _T ( "WindKmh" ), &opt->windkmh );
+
+        pConf->Read ( _T ( "Days" ), &opt->days );
+        pConf->Read ( _T ( "Weeks" ), &opt->weeks );
+        pConf->Read ( _T ( "Month" ), &opt->month );
+
+        pConf->Read ( _T ( "Watermaker" ), &opt->watermaker );
+        pConf->Read ( _T ( "FuelTank" ),   &opt->fuelTank );
+        pConf->Read ( _T ( "WaterTank" ),  &opt->waterTank );
+        pConf->Read ( _T ( "Ampere" ),     &opt->ampere );
+        pConf->Read ( _T ( "Bank1" ),      &opt->bank1 );
+        pConf->Read ( _T ( "Bank2" ),      &opt->bank2 );
+
+        pConf->Read ( _T ( "ShowDepth" ), &opt->showDepth );
+        pConf->Read ( _T ( "ShowWaveSwell" ), &opt->showWaveSwell );
+        pConf->Read ( _T ( "ShowWindSpeed" ), &opt->showWindSpeed );
+        pConf->Read ( _T ( "ShowWindDir" ), &opt->showWindDir );
+        pConf->Read ( _T ( "ShowHeading" ), &opt->showHeading );
+        pConf->Read ( _T ( "ShowWindHeading" ), &opt->showWindHeading );
+
+        pConf->Read( _T ( "NavHTML" ), &opt->navHTML,1 );
+        pConf->Read ( _T ( "CrewHTML" ), &opt->crewHTML,1 );
+        pConf->Read ( _T ( "BoatHTML" ), &opt->boatHTML,1 );
+        pConf->Read ( _T ( "overviewHTML" ), &opt->overviewHTML,1 );
+        pConf->Read ( _T ( "serviceHTML" ), &opt->serviceHTML,1 );
+        pConf->Read ( _T ( "repairsHTML" ), &opt->repairsHTML,1 );
+        pConf->Read ( _T ( "buypartsHTML" ), &opt->buypartsHTML,1 );
+        pConf->Read ( _T ( "OverViewAll" ), &opt->overviewAll,0 );
+
+        pConf->Read ( _T ( "NavGridLayout" ), &opt->navGridLayoutChoice,0 );
+        pConf->Read ( _T ( "CrewGridLayout" ), &opt->crewGridLayoutChoice,0 );
+        pConf->Read ( _T ( "BoatGridLayout" ), &opt->boatGridLayoutChoice,0 );
+        pConf->Read ( _T ( "overviewGridLayout" ), &opt->overviewGridLayoutChoice,0 );
+        pConf->Read ( _T ( "serviceGridLayout" ), &opt->serviceGridLayoutChoice,0 );
+        pConf->Read ( _T ( "repairsGridLayout" ), &opt->repairsGridLayoutChoice,0 );
+        pConf->Read ( _T ( "buypartsGridLayout" ), &opt->buypartsGridLayoutChoice,0 );
+
+        pConf->Read ( _T ( "NavGridLayoutODT" ), &opt->navGridLayoutChoiceODT,0 );
+        pConf->Read ( _T ( "CrewGridLayoutODT" ), &opt->crewGridLayoutChoiceODT,0 );
+        pConf->Read ( _T ( "BoatGridLayoutODT" ), &opt->boatGridLayoutChoiceODT,0 );
+        pConf->Read ( _T ( "overviewGridLayoutODT" ), &opt->overviewGridLayoutChoiceODT,0 );
+        pConf->Read ( _T ( "serviceGridLayoutODT" ), &opt->serviceGridLayoutChoiceODT,0 );
+        pConf->Read ( _T ( "repairsGridLayoutODT" ), &opt->repairsGridLayoutChoiceODT,0 );
+        pConf->Read ( _T ( "buypartsGridLayout" ), &opt->buypartsGridLayoutChoiceODT,0 );
+
+        pConf->Read ( _T ( "HTMLEditor" ), &opt->htmlEditor );
+        pConf->Read ( _T ( "ODTEditor" ), &opt->odtEditor );
+        pConf->Read ( _T ( "DataManager" ), &opt->dataManager );
+        pConf->Read ( _T ( "MailClient" ), &opt->mailClient );
+
+        pConf->Read ( _T ( "GPSWarning" ), &opt->noGPS );
+        pConf->Read ( _T ( "EngineMessageSails" ), &opt->engineMessageSails );
+        pConf->Read ( _T ( "WriteEngineRun" ), &opt->engineMessageRunning );
+        pConf->Read ( _T ( "SailsDown" ), &opt->engineAllwaysSailsDown );
+        pConf->Read ( _T ( "StatusBar" ), &opt->statusbar );
+        pConf->Read ( _T ( "WindSpeeds" ), &opt->windspeeds );
+        pConf->Read ( _T ( "OverviewLines" ), &opt->overviewlines );
+
+        wxString str = wxEmptyString;
+        pConf->Read ( _T ( "PrefixLayouts" ), &str );
+        if ( str.Contains( _T( "," ) ) )
+        {
+            wxStringTokenizer tkz( str,_T( "," ) );
+            for ( int i = 0; i < 7; i++ )
             {
-                wxStringTokenizer tkz(str,_T(","));
-                for(int i = 0; i < 7; i++)
-                {
-                    opt->filterLayout[i] = (wxAtoi(tkz.GetNextToken()))?true:false;
-                    opt->layoutPrefix[i] = tkz.GetNextToken();
-                }
+                opt->filterLayout[i] = ( wxAtoi( tkz.GetNextToken() ) )?true:false;
+                opt->layoutPrefix[i] = tkz.GetNextToken();
             }
+        }
 
-            wxString kmlRouteTrack = wxEmptyString;
-            pConf->Read ( _T ( "KMLRouteTrack" ), &kmlRouteTrack,_T("1,1"));
-            wxStringTokenizer tkz(kmlRouteTrack,_T(","));
-            opt->kmlRoute = wxAtoi(tkz.GetNextToken());
-            opt->kmlTrack = wxAtoi(tkz.GetNextToken());
-            pConf->Read ( _T ( "KMLWidth" ), &opt->kmlLineWidth,_T("4"));
-            pConf->Read ( _T ( "KMLTransp" ), &opt->kmlLineTransparancy,0);
-            pConf->Read ( _T ( "KMLRouteColor" ), &opt->kmlRouteColor,0);
-            pConf->Read ( _T ( "KMLTrackColor" ), &opt->kmlTrackColor,3);
-
-            pConf->Read ( _T ( "RPMIsChecked" ), &opt->bRPMIsChecked,false);
-            pConf->Read ( _T ( "Eng1RPMIsChecked" ), &opt->bEng1RPMIsChecked,false);
-            pConf->Read ( _T ( "Eng2RPMIsChecked" ), &opt->bEng2RPMIsChecked,false);
-            pConf->Read ( _T ( "GenRPMIsChecked" ), &opt->bGenRPMIsChecked,false);
-
-            pConf->Read ( _T ( "NMEAUseRPM" ), &opt->NMEAUseERRPM,false);
-            pConf->Read ( _T ( "NMEAUseWIMDA" ), &opt->NMEAUseWIMDA,false);
-            pConf->Read ( _T ( "Engine1" ), &opt->engine1Id,_T(""));
-            pConf->Read ( _T ( "Engine2" ), &opt->engine2Id,_T(""));
-            pConf->Read ( _T ( "Engine1Runs" ), &opt->engine1Running);
-            pConf->Read ( _T ( "Engine2Runs" ), &opt->engine2Running);
-
-            pConf->Read ( _T ( "Generator" ), &opt->generator,false);
-            pConf->Read ( _T ( "GeneratorId" ), &opt->generatorId,_T(""));
-            pConf->Read ( _T ( "GeneratorRuns" ), &opt->generatorRunning);
-
-            pConf->Read ( _T ( "ShowLayoutP" ), &opt->layoutShow,true);
-
-            pConf->Read ( _T ( "toggleEngine1" ), &opt->toggleEngine1);
-            pConf->Read ( _T ( "toggleEngine2" ), &opt->toggleEngine2);
-            pConf->Read ( _T ( "toggleGenerator" ), &opt->toggleGenerator);
-
-            wxString sails = wxEmptyString;
-            pConf->Read ( _T ( "Sails" ), &sails);
-            if(!sails.IsEmpty())
+        wxString kmlRouteTrack = wxEmptyString;
+        pConf->Read ( _T ( "KMLRouteTrack" ), &kmlRouteTrack,_T( "1,1" ) );
+        wxStringTokenizer tkz( kmlRouteTrack,_T( "," ) );
+        opt->kmlRoute = wxAtoi( tkz.GetNextToken() );
+        opt->kmlTrack = wxAtoi( tkz.GetNextToken() );
+        pConf->Read ( _T ( "KMLWidth" ), &opt->kmlLineWidth,_T( "4" ) );
+        pConf->Read ( _T ( "KMLTransp" ), &opt->kmlLineTransparancy,0 );
+        pConf->Read ( _T ( "KMLRouteColor" ), &opt->kmlRouteColor,0 );
+        pConf->Read ( _T ( "KMLTrackColor" ), &opt->kmlTrackColor,3 );
+
+        pConf->Read ( _T ( "RPMIsChecked" ), &opt->bRPMIsChecked,false );
+        pConf->Read ( _T ( "Eng1RPMIsChecked" ), &opt->bEng1RPMIsChecked,false );
+        pConf->Read ( _T ( "Eng2RPMIsChecked" ), &opt->bEng2RPMIsChecked,false );
+        pConf->Read ( _T ( "GenRPMIsChecked" ), &opt->bGenRPMIsChecked,false );
+
+        pConf->Read ( _T ( "NMEAUseRPM" ), &opt->NMEAUseERRPM,false );
+        pConf->Read ( _T ( "NMEAUseWIMDA" ), &opt->NMEAUseWIMDA,false );
+        pConf->Read ( _T ( "Engine1" ), &opt->engine1Id,_T( "" ) );
+        pConf->Read ( _T ( "Engine2" ), &opt->engine2Id,_T( "" ) );
+        pConf->Read ( _T ( "Engine1Runs" ), &opt->engine1Running );
+        pConf->Read ( _T ( "Engine2Runs" ), &opt->engine2Running );
+
+        pConf->Read ( _T ( "Generator" ), &opt->generator,false );
+        pConf->Read ( _T ( "GeneratorId" ), &opt->generatorId,_T( "" ) );
+        pConf->Read ( _T ( "GeneratorRuns" ), &opt->generatorRunning );
+
+        pConf->Read ( _T ( "ShowLayoutP" ), &opt->layoutShow,true );
+
+        pConf->Read ( _T ( "toggleEngine1" ), &opt->toggleEngine1 );
+        pConf->Read ( _T ( "toggleEngine2" ), &opt->toggleEngine2 );
+        pConf->Read ( _T ( "toggleGenerator" ), &opt->toggleGenerator );
+
+        wxString sails = wxEmptyString;
+        pConf->Read ( _T ( "Sails" ), &sails );
+        if ( !sails.IsEmpty() )
+        {
+            wxStringTokenizer tkz( sails,_T( "," ) );
+            if ( wxString( sails.GetChar( 0 ) ).IsNumber() )
             {
-                wxStringTokenizer tkz(sails,_T(","));
-                if(wxString(sails.GetChar(0)).IsNumber())
-                {
-                    opt->rowGap = wxAtoi(tkz.GetNextToken());
-                    opt->colGap = wxAtoi(tkz.GetNextToken());
-                }
-
-                for(int i = 0; i < 14; i++)
-                {
-                    opt->abrSails.Item(i) = tkz.GetNextToken();
-                    opt->sailsName.Item(i) = tkz.GetNextToken();
-                    opt->bSailIsChecked[i] = (wxAtoi(tkz.GetNextToken())?true:false);
-                }
+                opt->rowGap = wxAtoi( tkz.GetNextToken() );
+                opt->colGap = wxAtoi( tkz.GetNextToken() );
             }
 
-            wxString engine1 = wxEmptyString, engine2 = wxEmptyString, genny = wxEmptyString;
-            pConf->Read ( _T ( "Engine1TimeStart" ), &engine1);
-            pConf->Read ( _T ( "Engine2TimeStart" ), &engine2);
-            pConf->Read ( _T ( "GeneratorTimeStart" ), &genny);
-
-            if(!engine1.IsEmpty())
+            for ( int i = 0; i < 14; i++ )
             {
-                wxStringTokenizer tkz(engine1,_T(" "));
-                wxString date = tkz.GetNextToken();
-                wxString time = tkz.GetNextToken();
-
-                wxDateTime dt;
-                dt.ParseDate(date);
-                dt.ParseTime(time);
-
-                if(dt.GetYear() != 1970)
-                    opt->dtEngine1On = dt;
+                opt->abrSails.Item( i ) = tkz.GetNextToken();
+                opt->sailsName.Item( i ) = tkz.GetNextToken();
+                opt->bSailIsChecked[i] = ( wxAtoi( tkz.GetNextToken() )?true:false );
             }
+        }
 
-            if(!engine2.IsEmpty())
-            {
-                wxStringTokenizer tkz(engine2,_T(" "));
-                wxString date = tkz.GetNextToken();
-                wxString time = tkz.GetNextToken();
-
-                wxDateTime dt;
-                dt.ParseDate(date);
-                dt.ParseTime(time);
+        wxString engine1 = wxEmptyString, engine2 = wxEmptyString, genny = wxEmptyString;
+        pConf->Read ( _T ( "Engine1TimeStart" ), &engine1 );
+        pConf->Read ( _T ( "Engine2TimeStart" ), &engine2 );
+        pConf->Read ( _T ( "GeneratorTimeStart" ), &genny );
 
-                if(dt.GetYear() != 1970)
-                    opt->dtEngine2On = dt;
-            }
+        if ( !engine1.IsEmpty() )
+        {
+            wxStringTokenizer tkz( engine1,_T( " " ) );
+            wxString date = tkz.GetNextToken();
+            wxString time = tkz.GetNextToken();
+
+            wxDateTime dt;
+            dt.ParseDate( date );
+            dt.ParseTime( time );
 
-            if(!genny.IsEmpty())
-            {
-                wxStringTokenizer tkz(genny,_T(" "));
-                wxString date = tkz.GetNextToken();
-                wxString time = tkz.GetNextToken();
-
-                wxDateTime dt;
-                dt.ParseDate(date);
-                dt.ParseTime(time);
-              
-                if(dt.GetYear() != 1970)
-                    opt->dtGeneratorOn = dt;
-            }
-          
+            if ( dt.GetYear() != 1970 )
+                opt->dtEngine1On = dt;
+        }
+
+        if ( !engine2.IsEmpty() )
+        {
+            wxStringTokenizer tkz( engine2,_T( " " ) );
+            wxString date = tkz.GetNextToken();
+            wxString time = tkz.GetNextToken();
+
+            wxDateTime dt;
+            dt.ParseDate( date );
+            dt.ParseTime( time );
+
+            if ( dt.GetYear() != 1970 )
+                opt->dtEngine2On = dt;
+        }
+
+        if ( !genny.IsEmpty() )
+        {
+            wxStringTokenizer tkz( genny,_T( " " ) );
+            wxString date = tkz.GetNextToken();
+            wxString time = tkz.GetNextToken();
+
+            wxDateTime dt;
+            dt.ParseDate( date );
+            dt.ParseTime( time );
+
+            if ( dt.GetYear() != 1970 )
+                opt->dtGeneratorOn = dt;
+        }
+
+
+        bool r;
+        r = pConf->Read ( _T ( "NavGridColWidth" ),&str );
+        if ( r )
+            opt->NavColWidth = readCols( opt->NavColWidth,str );
+        else
+            opt->NavColWidth = readColsOld( pConf,opt->NavColWidth,_T ( "NavGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "WeatherGridColWidth" ),&str );
+        if ( r )
+            opt->WeatherColWidth = readCols( opt->WeatherColWidth,str );
+        else
+            opt->WeatherColWidth = readColsOld( pConf,opt->WeatherColWidth,_T ( "WeatherGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "MotorGridColWidth" ),&str );
+        if ( r )
+            opt->MotorColWidth = readCols( opt->MotorColWidth,str );
+        else
+            opt->MotorColWidth = readColsOld( pConf,opt->MotorColWidth,_T ( "MotorGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "CrewGridColWidth" ),&str );
+        if ( r )
+            opt->CrewColWidth = readCols( opt->CrewColWidth,str );
+        else
+            opt->CrewColWidth = readColsOld( pConf,opt->CrewColWidth,_T ( "CrewGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "WakeGridColWidth" ),&str );
+        if ( r )
+            opt->WakeColWidth = readCols( opt->WakeColWidth,str );
+        else
+            opt->WakeColWidth = readColsOld( pConf,opt->WakeColWidth,_T ( "WakeGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "EquipGridColWidth" ),&str );
+        if ( r )
+            opt->EquipColWidth = readCols( opt->EquipColWidth,str );
+        else
+            opt->EquipColWidth = readColsOld( pConf,opt->EquipColWidth,_T ( "EquipGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "OverviewGridColWidth" ),&str );
+        if ( r )
+            opt->OverviewColWidth = readCols( opt->OverviewColWidth,str );
+        else
+            opt->OverviewColWidth = readColsOld( pConf,opt->OverviewColWidth,_T ( "OverviewGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "ServiceGridColWidth" ),&str );
+        if ( r )
+            opt->ServiceColWidth = readCols( opt->ServiceColWidth,str );
+        else
+            opt->ServiceColWidth = readColsOld( pConf,opt->ServiceColWidth,_T ( "ServiceGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "RepairsGridColWidth" ),&str );
+        if ( r )
+            opt->RepairsColWidth = readCols( opt->RepairsColWidth,str );
+        else
+            opt->RepairsColWidth = readColsOld( pConf,opt->RepairsColWidth,_T ( "RepairsGridColWidth" ) );
+
+        r = pConf->Read ( _T ( "BuyPartsGridColWidth" ),&str );
+        if ( r )
+            opt->BuyPartsColWidth = readCols( opt->BuyPartsColWidth,str );
+        else
+            opt->BuyPartsColWidth = readColsOld( pConf,opt->BuyPartsColWidth,_T ( "BuyPartsGridColWidth" ) );
+
+        pConf->DeleteEntry ( _T ( "ShowAllLayout" ) );
+        pConf->DeleteEntry ( _T ( "ShowFilteredLayout" ) );
+
+        opt->ampereh = opt->ampere+opt->motorh;
+    }
+
+    if ( opt->timeformat == -1 )
+    {
+        wxString am,pm;
+        wxDateTime::GetAmPmStrings( &am,&pm );
+        if ( am.IsEmpty() )
+            opt->timeformat = 0;
+        else
+            opt->timeformat = 1;
+    }
+}
 
-			bool r;
-          r = pConf->Read (_T ( "NavGridColWidth"),&str);
-          if(r)
-            opt->NavColWidth = readCols(opt->NavColWidth,str);
-          else
-            opt->NavColWidth = readColsOld(pConf,opt->NavColWidth,_T ("NavGridColWidth"));
-
-          r = pConf->Read (_T ( "WeatherGridColWidth"),&str);
-          if(r)
-            opt->WeatherColWidth = readCols(opt->WeatherColWidth,str);
-          else
-            opt->WeatherColWidth = readColsOld(pConf,opt->WeatherColWidth,_T ("WeatherGridColWidth"));
-
-          r = pConf->Read (_T ( "MotorGridColWidth"),&str);
-          if(r)
-            opt->MotorColWidth = readCols(opt->MotorColWidth,str);
-          else
-            opt->MotorColWidth = readColsOld(pConf,opt->MotorColWidth,_T ("MotorGridColWidth"));
-
-          r = pConf->Read (_T ( "CrewGridColWidth"),&str);
-          if(r)
-            opt->CrewColWidth = readCols(opt->CrewColWidth,str);
-          else
-            opt->CrewColWidth = readColsOld(pConf,opt->CrewColWidth,_T ("CrewGridColWidth"));
-
-          r = pConf->Read (_T ( "WakeGridColWidth"),&str);
-          if(r)
-            opt->WakeColWidth = readCols(opt->WakeColWidth,str);
-          else
-            opt->WakeColWidth = readColsOld(pConf,opt->WakeColWidth,_T ("WakeGridColWidth"));
-
-          r = pConf->Read (_T ( "EquipGridColWidth"),&str);
-          if(r)
-            opt->EquipColWidth = readCols(opt->EquipColWidth,str);
-          else
-            opt->EquipColWidth = readColsOld(pConf,opt->EquipColWidth,_T ("EquipGridColWidth"));
-
-          r = pConf->Read (_T ( "OverviewGridColWidth"),&str);
-          if(r)
-            opt->OverviewColWidth = readCols(opt->OverviewColWidth,str);
-          else
-            opt->OverviewColWidth = readColsOld(pConf,opt->OverviewColWidth,_T ("OverviewGridColWidth"));
-
-          r = pConf->Read (_T ( "ServiceGridColWidth"),&str);
-          if(r)
-            opt->ServiceColWidth = readCols(opt->ServiceColWidth,str);
-          else
-            opt->ServiceColWidth = readColsOld(pConf,opt->ServiceColWidth,_T ("ServiceGridColWidth"));
-
-          r = pConf->Read (_T ( "RepairsGridColWidth"),&str);
-          if(r)
-            opt->RepairsColWidth = readCols(opt->RepairsColWidth,str);
-          else
-            opt->RepairsColWidth = readColsOld(pConf,opt->RepairsColWidth,_T ("RepairsGridColWidth"));
-
-          r = pConf->Read (_T ( "BuyPartsGridColWidth"),&str);
-          if(r)
-            opt->BuyPartsColWidth = readCols(opt->BuyPartsColWidth,str);
-          else
-            opt->BuyPartsColWidth = readColsOld(pConf,opt->BuyPartsColWidth,_T ("BuyPartsGridColWidth"));
-
-          pConf->DeleteEntry ( _T ( "ShowAllLayout" ));
-          pConf->DeleteEntry ( _T ( "ShowFilteredLayout" ));
-
-          opt->ampereh = opt->ampere+opt->motorh;
-	  }
-
-	if(opt->timeformat == -1)
-	{
-		wxString am,pm;
-		wxDateTime::GetAmPmStrings(&am,&pm);
-		if(am.IsEmpty())
-			opt->timeformat = 0;
-		else
-			opt->timeformat = 1;
-	}
-}
-
-ArrayOfGridColWidth logbookkonni_pi::readCols(ArrayOfGridColWidth ar, wxString str)
-{
-    wxStringTokenizer tkz(str,_T(","));
-    while(tkz.HasMoreTokens())
-        ar.Add(wxAtoi(tkz.GetNextToken()));
+ArrayOfGridColWidth logbookkonni_pi::readCols( ArrayOfGridColWidth ar, wxString str )
+{
+    wxStringTokenizer tkz( str,_T( "," ) );
+    while ( tkz.HasMoreTokens() )
+        ar.Add( wxAtoi( tkz.GetNextToken() ) );
 
     return ar;
 }
 
-ArrayOfGridColWidth logbookkonni_pi::readColsOld(wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry)
+ArrayOfGridColWidth logbookkonni_pi::readColsOld( wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry )
 {
     int val;
     bool r;
     int i = 0;
 
-    while(true)
+    while ( true )
     {
-        r = pConf->Read (wxString::Format(entry+_T ( "/%i"),i++), &val);
-        if(!r) break;
-        ar.Add(val);
+        r = pConf->Read ( wxString::Format( entry+_T ( "/%i" ),i++ ), &val );
+        if ( !r ) break;
+        ar.Add( val );
     }
-    pConf->DeleteGroup(_T("/PlugIns/Logbook/"+entry));
+    pConf->DeleteGroup( _T( "/PlugIns/Logbook/"+entry ) );
 
     return ar;
 }
 
-void logbookkonni_pi::loadLayouts(wxWindow *parent)
+void logbookkonni_pi::loadLayouts( wxWindow *parent )
 {
-	wxString FILE = _T("LogbookKonni*.zip");
-	std::auto_ptr<wxZipEntry> entry;
-	wxString path, sep;
-	sep = wxFileName::GetPathSeparator();
-
-	wxStandardPathsBase& std_path = wxStandardPathsBase::Get();
-#ifdef __WXMSW__
-	wxString stdPath  = std_path.GetConfigDir();
-#elif defined __WXGTK__
-	wxString stdPath  = std_path.GetUserDataDir();	
-#elif defined __WXOSX__
-	wxString stdPath  = std_path.GetUserConfigDir();
-#endif
-
-	wxString *pHome_Locn = new wxString();
-	pHome_Locn->Append(stdPath);
-	pHome_Locn->append(sep); ;
-
-	pHome_Locn->append(_T("plugins"));
-	pHome_Locn->append(sep);
-	if(!wxDir::Exists(*pHome_Locn))
-		wxMkdir(*pHome_Locn);
-
-	pHome_Locn->Append(_T("logbook"));
-	pHome_Locn->append(sep);
-	if(!wxDir::Exists(*pHome_Locn))
-		wxMkdir(*pHome_Locn);
-  
-	wxString data = *pHome_Locn;
-	data.Append(_T("data"));
-	data.append(sep);
-	if(!wxDir::Exists(data))
-		wxMkdir(data);
-
-	wxString data1 = data;
-	wxString data2 = data;
-	wxString data3 = data;
-	wxString help  = data;
-
-	data.Append(_T("HTMLLayouts"));
-	data.append(sep);
-	if(!wxDir::Exists(data))
-		wxMkdir(data);
-
-	data1.Append(_T("ODTLayouts"));
-	data1.append(sep);
-	if(!wxDir::Exists(data1))
-		wxMkdir(data1);
-
-	data2.Append(_T("Clouds"));
-	data2.append(sep);
-	if(!wxDir::Exists(data2))
-		wxMkdir(data2);
-
-	data3.Append(_T("Images"));
-	data3.append(sep);
-	if(!wxDir::Exists(data3))
-		wxMkdir(data3);
+    wxString FILE = _T( "LogbookKonni*.zip" );
+    std::auto_ptr<wxZipEntry> entry;
+    wxString path, sep;
+    sep = wxFileName::GetPathSeparator();
+
+    wxString data = StandardPath();
+    data.Append( _T( "data" ) );
+    data.append( sep );
+    if ( !wxDir::Exists( data ) )
+        wxMkdir( data );
+
+    wxString data1 = data;
+    wxString data2 = data;
+    wxString data3 = data;
+    wxString help  = data;
+
+    data.Append( _T( "HTMLLayouts" ) );
+    data.append( sep );
+    if ( !wxDir::Exists( data ) )
+        wxMkdir( data );
+
+    data1.Append( _T( "ODTLayouts" ) );
+    data1.append( sep );
+    if ( !wxDir::Exists( data1 ) )
+        wxMkdir( data1 );
+
+    data2.Append( _T( "Clouds" ) );
+    data2.append( sep );
+    if ( !wxDir::Exists( data2 ) )
+        wxMkdir( data2 );
+
+    data3.Append( _T( "Images" ) );
+    data3.append( sep );
+    if ( !wxDir::Exists( data3 ) )
+        wxMkdir( data3 );
 #ifdef __WXOSX__
     wxFileDialog* openFileDialog =
-		new wxFileDialog( parent, _("Select zipped Layout-Files"), _T(""), _T(""), _T("*.zip"),
-		                  wxFD_DEFAULT_STYLE, wxDefaultPosition, wxDefaultSize);
+        new wxFileDialog( parent, _( "Select zipped Layout-Files" ), _T( "" ), _T( "" ), _T( "*.zip" ),
+                          wxFD_DEFAULT_STYLE, wxDefaultPosition, wxDefaultSize );
 #else
-	wxFileDialog* openFileDialog =
-		new wxFileDialog( parent, _("Select zipped Layout-Files"), _T(""), _T(""), _T("*.zip"),
-		                  wxFD_OPEN, wxDefaultPosition);
-#endif 
-	wxString n = _T("not ");
-	int ret = true;
-	
-	if ( openFileDialog->ShowModal() == wxID_OK )
-	{
-		wxFFileInputStream in(openFileDialog->GetPath());
-		wxZipInputStream zip(in);
-
-		while (entry.reset(zip.GetNextEntry()), entry.get() != NULL)
-		{
-			if(entry->GetName().Contains(_T("HTMLLayouts")))
-				path = data;
-			else if(entry->GetName().Contains(_T("ODTLayouts")))
-				path = data1;
-			else if(entry->GetName().Contains(_T("Clouds")))
-				path = data2;
-			else
-				path = data3;
-
-			wxString name = entry->GetName();
-
-			if(!name.Contains(_T(".htm")) && !name.Contains(_T(".odt")) && 
-				!name.Contains(_T(".jpg")) && !name.Contains(_T(".PNG")))
-				continue;
-			wxString fn = name.AfterLast(wxFileName::GetPathSeparator());
-
-			if(name.Contains(sep+_T("boat")))
-				path.append(_T("boat"));
-			else if(name.Contains(sep+_T("logbook")))
-				path.append(_T("logbook"));
-			else if(name.Contains(sep + _T("crew")))
-				path.append(_T("crew"));
-			else if(name.Contains(sep + _T("overview")))
-				path.append(_T("overview"));
-			else if(name.Contains(sep + _T("service")))
-				path.append(_T("service"));
-			else if(name.Contains(sep + _T("repairs")))
-				path.append(_T("repairs"));
-			else if(name.Contains(sep + _T("buyparts")))
-				path.append(_T("buyparts"));
-
-			if(!name.Contains(_T("Help")))
-			{
-				path.append(sep);
-				if(!wxFileName::DirExists(path))
-					wxMkdir(path);
-			}
-			else
-				path = help+sep;
-
-			path.append(fn);
-			
-			wxFileOutputStream out(path);
-			if(zip.OpenEntry(*entry) != true) { out.Close(); ret = false; break; }
-			zip.Read(out);
-			out.Close();
-		}
-		if(m_plogbook_window != NULL)
-		{
-            m_plogbook_window->loadLayoutChoice(LogbookDialog::LOGBOOK,
-                m_plogbook_window->logbook->layout_locn,m_plogbook_window->logbookChoice,opt->layoutPrefix[LogbookDialog::LOGBOOK]);
-            m_plogbook_window->loadLayoutChoice(LogbookDialog::CREW,
-                m_plogbook_window->crewList->layout_locn,m_plogbook_window->crewChoice,opt->layoutPrefix[LogbookDialog::CREW]);
-            m_plogbook_window->loadLayoutChoice(LogbookDialog::BOAT,
-                m_plogbook_window->boat->layout_locn,m_plogbook_window->boatChoice,opt->layoutPrefix[LogbookDialog::BOAT]);
-            m_plogbook_window->loadLayoutChoice(LogbookDialog::OVERVIEW,
-                m_plogbook_window->logbook->layout_locn,m_plogbook_window->overviewChoice,opt->layoutPrefix[LogbookDialog::OVERVIEW]);
-            m_plogbook_window->loadLayoutChoice(LogbookDialog::GSERVICE,
-                m_plogbook_window->maintenance->layout_locnService,m_plogbook_window->m_choiceSelectLayoutService,opt->layoutPrefix[LogbookDialog::GSERVICE]);
-            m_plogbook_window->loadLayoutChoice(LogbookDialog::GREPAIRS,
-                m_plogbook_window->maintenance->layout_locnRepairs,m_plogbook_window->m_choiceSelectLayoutRepairs,opt->layoutPrefix[LogbookDialog::GREPAIRS]);
-            m_plogbook_window->loadLayoutChoice(LogbookDialog::GBUYPARTS,
-                m_plogbook_window->maintenance->layout_locnBuyParts,m_plogbook_window->m_choiceSelectLayoutBuyParts,opt->layoutPrefix[LogbookDialog::GBUYPARTS]);
-		}
-	wxString ok = wxString::Format(_("Layouts %sinstalled at\n\n%s\n%s\n%s\n%s"),
-				       (!ret)?n.c_str():wxEmptyString,data.c_str(),data1.c_str(),data2.c_str(),data3.c_str());
-		wxMessageBox(ok);
-	}
+    wxFileDialog* openFileDialog =
+        new wxFileDialog( parent, _( "Select zipped Layout-Files" ), _T( "" ), _T( "" ), _T( "*.zip" ),
+                          wxFD_OPEN, wxDefaultPosition );
+#endif
+    wxString n = _T( "not " );
+    int ret = true;
+
+    if ( openFileDialog->ShowModal() == wxID_OK )
+    {
+        wxFFileInputStream in( openFileDialog->GetPath() );
+        wxZipInputStream zip( in );
+
+        while ( entry.reset( zip.GetNextEntry() ), entry.get() != NULL )
+        {
+            if ( entry->GetName().Contains( _T( "HTMLLayouts" ) ) )
+                path = data;
+            else if ( entry->GetName().Contains( _T( "ODTLayouts" ) ) )
+                path = data1;
+            else if ( entry->GetName().Contains( _T( "Clouds" ) ) )
+                path = data2;
+            else
+                path = data3;
+
+            wxString name = entry->GetName();
+
+            if ( !name.Contains( _T( ".htm" ) ) && !name.Contains( _T( ".odt" ) ) &&
+                    !name.Contains( _T( ".jpg" ) ) && !name.Contains( _T( ".PNG" ) ) )
+                continue;
+            wxString fn = name.AfterLast( wxFileName::GetPathSeparator() );
+
+            if ( name.Contains( sep+_T( "boat" ) ) )
+                path.append( _T( "boat" ) );
+            else if ( name.Contains( sep+_T( "logbook" ) ) )
+                path.append( _T( "logbook" ) );
+            else if ( name.Contains( sep + _T( "crew" ) ) )
+                path.append( _T( "crew" ) );
+            else if ( name.Contains( sep + _T( "overview" ) ) )
+                path.append( _T( "overview" ) );
+            else if ( name.Contains( sep + _T( "service" ) ) )
+                path.append( _T( "service" ) );
+            else if ( name.Contains( sep + _T( "repairs" ) ) )
+                path.append( _T( "repairs" ) );
+            else if ( name.Contains( sep + _T( "buyparts" ) ) )
+                path.append( _T( "buyparts" ) );
+
+            if ( !name.Contains( _T( "Help" ) ) )
+            {
+                path.append( sep );
+                if ( !wxFileName::DirExists( path ) )
+                    wxMkdir( path );
+            }
+            else
+                path = help+sep;
+
+            path.append( fn );
+
+            wxFileOutputStream out( path );
+            if ( zip.OpenEntry( *entry ) != true )
+            {
+                out.Close();
+                ret = false;
+                break;
+            }
+            zip.Read( out );
+            out.Close();
+        }
+        if ( m_plogbook_window != NULL )
+        {
+            m_plogbook_window->loadLayoutChoice( LogbookDialog::LOGBOOK,
+                                                 m_plogbook_window->logbook->layout_locn,m_plogbook_window->logbookChoice,opt->layoutPrefix[LogbookDialog::LOGBOOK] );
+            m_plogbook_window->loadLayoutChoice( LogbookDialog::CREW,
+                                                 m_plogbook_window->crewList->layout_locn,m_plogbook_window->crewChoice,opt->layoutPrefix[LogbookDialog::CREW] );
+            m_plogbook_window->loadLayoutChoice( LogbookDialog::BOAT,
+                                                 m_plogbook_window->boat->layout_locn,m_plogbook_window->boatChoice,opt->layoutPrefix[LogbookDialog::BOAT] );
+            m_plogbook_window->loadLayoutChoice( LogbookDialog::OVERVIEW,
+                                                 m_plogbook_window->logbook->layout_locn,m_plogbook_window->overviewChoice,opt->layoutPrefix[LogbookDialog::OVERVIEW] );
+            m_plogbook_window->loadLayoutChoice( LogbookDialog::GSERVICE,
+                                                 m_plogbook_window->maintenance->layout_locnService,m_plogbook_window->m_choiceSelectLayoutService,opt->layoutPrefix[LogbookDialog::GSERVICE] );
+            m_plogbook_window->loadLayoutChoice( LogbookDialog::GREPAIRS,
+                                                 m_plogbook_window->maintenance->layout_locnRepairs,m_plogbook_window->m_choiceSelectLayoutRepairs,opt->layoutPrefix[LogbookDialog::GREPAIRS] );
+            m_plogbook_window->loadLayoutChoice( LogbookDialog::GBUYPARTS,
+                                                 m_plogbook_window->maintenance->layout_locnBuyParts,m_plogbook_window->m_choiceSelectLayoutBuyParts,opt->layoutPrefix[LogbookDialog::GBUYPARTS] );
+        }
+        wxString ok = wxString::Format( _( "Layouts %sinstalled at\n\n%s\n%s\n%s\n%s" ),
+                                        ( !ret )?n.c_str():wxEmptyString,data.c_str(),data1.c_str(),data2.c_str(),data3.c_str() );
+        wxMessageBox( ok );
+    }
 }
 
 ////////////////////////////////////////////////////////
-void LogbookTimer::OnTimer(wxTimerEvent& ev)
+void LogbookTimer::OnTimer( wxTimerEvent& ev )
 {
-	timerEvent();
+    timerEvent();
 }
 
 void LogbookTimer::timerEvent()
 {
-	if(popUp())
-		plogbook_pi->m_plogbook_window->logbook->appendRow(true, true);
+    if ( popUp() )
+        plogbook_pi->m_plogbook_window->logbook->appendRow( true, true );
 }
 
 bool LogbookTimer::popUp()
 {
-	if(plogbook_pi->eventsEnabled || NULL == plogbook_pi->m_plogbook_window) return false;
+    if ( plogbook_pi->eventsEnabled || NULL == plogbook_pi->m_plogbook_window ) return false;
 
-	wxFrame *frame = (wxFrame*)plogbook_pi->m_parent_window->GetParent();
-	if((frame->IsIconized() || plogbook_pi->m_plogbook_window->IsIconized()) && plogbook_pi->opt->popup)
-	{
-        if(frame->IsIconized())
-            frame->Iconize(false);
+    wxFrame *frame = ( wxFrame* )plogbook_pi->m_parent_window->GetParent();
+    if ( ( frame->IsIconized() || plogbook_pi->m_plogbook_window->IsIconized() ) && plogbook_pi->opt->popup )
+    {
+        if ( frame->IsIconized() )
+            frame->Iconize( false );
 
-        plogbook_pi->m_plogbook_window->Iconize(false);
+        plogbook_pi->m_plogbook_window->Iconize( false );
         plogbook_pi->m_parent_window->SetFocus();
         return true;
-	}
+    }
 
-	if(!plogbook_pi->m_plogbook_window->IsShown() && plogbook_pi->opt->popup)
-	{
-		plogbook_pi->m_plogbook_window->Show();
-        plogbook_pi->SendLogbookMessage(_T("LOGBOOK_WINDOW_SHOWN"), wxEmptyString);
-		plogbook_pi->dlgShow = true;
-	}
+    if ( !plogbook_pi->m_plogbook_window->IsShown() && plogbook_pi->opt->popup )
+    {
+        plogbook_pi->m_plogbook_window->Show();
+        plogbook_pi->SendLogbookMessage( _T( "LOGBOOK_WINDOW_SHOWN" ), wxEmptyString );
+        plogbook_pi->dlgShow = true;
+    }
 
-	if(plogbook_pi->opt->popup)
-		plogbook_pi->m_plogbook_window->Raise();
+    if ( plogbook_pi->opt->popup )
+        plogbook_pi->m_plogbook_window->Raise();
 
-	return true;
+    return true;
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/logbook_pi.h opencpn-plugin-logbookkonni-1.2024/src/logbook_pi.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/logbook_pi.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/logbook_pi.h	2016-02-25 13:06:29.000000000 +0000
@@ -32,10 +32,10 @@
 #include "wx/wxprec.h"
 
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
-#include "version.h"
+#include "version.h"
 
 #define     MY_API_VERSION_MAJOR    1
 #define     MY_API_VERSION_MINOR    7
@@ -44,7 +44,6 @@
 #include "ocpn_plugin.h"
 #include "Options.h"
 #include "nmea0183/nmea0183.h"
-#include "MessageBoxOSX.h"
 
 #include <wx/aui/aui.h>
 #include <wx/string.h>
@@ -75,7 +74,7 @@
 public:
     enum states {OFF,ONNOEVENTS,ONWITHEVENTS};
 
-    logbookkonni_pi(void *ppimgr);
+    logbookkonni_pi( void *ppimgr );
     ~logbookkonni_pi();
 
     bool				dlgShow;
@@ -95,8 +94,8 @@
     bool				eventsEnabled;
 
     //    The required PlugIn Methods
-    int Init(void);
-    bool DeInit(void);
+    int Init( void );
+    bool DeInit( void );
 
     int GetAPIVersionMajor();
     int GetAPIVersionMinor();
@@ -106,42 +105,43 @@
     wxString GetCommonName();
     wxString GetShortDescription();
     wxString GetLongDescription();
-    void UpdateAuiStatus(void);
-    void SetColorScheme(PI_ColorScheme cs);
+    void UpdateAuiStatus( void );
+    void SetColorScheme( PI_ColorScheme cs );
     void GetOriginalColors();
     void SetOriginalColors();
 
     //    The optional method overrides
 
-    void SetNMEASentence(wxString &sentence);
-    void SetPositionFix(PlugIn_Position_Fix &pfix);
-    void OnContextMenuItemCallback(int id);
+    void SetNMEASentence( wxString &sentence );
+    void SetPositionFix( PlugIn_Position_Fix &pfix );
+    void OnContextMenuItemCallback( int id );
 
     //    The required override PlugIn Methods
     //     bool RenderOverlay(wxMemoryDC *pmdc, PlugIn_ViewPort *vp);
     //      void SetCursorLatLon(double lat, double lon);
 
 
-    void SetDefaults(void);
-    int GetToolbarToolCount(void);
+    void SetDefaults( void );
+    static wxString StandardPath( void );
+    int GetToolbarToolCount( void );
     void ShowPreferencesDialog( wxWindow* parent );
-    void OnToolbarToolCallback(int id);
-    void SetPluginMessage(wxString &message_id, wxString &message_body);
-    void SendLogbookMessage(wxString message_id, wxString message_body);
+    void OnToolbarToolCallback( int id );
+    void SetPluginMessage( wxString &message_id, wxString &message_body );
+    void SendLogbookMessage( wxString message_id, wxString message_body );
     //	  void SendPluginMessage(wxString &message_id, wxString &message_body);
 
-    void loadLayouts(wxWindow * parent);
+    void loadLayouts( wxWindow * parent );
     void startLogbook();
-    void shutdown(bool menu);
+    void shutdown( bool menu );
 
 private:
-    void					OnTimer(wxTimerEvent& ev);
+    void					OnTimer( wxTimerEvent& ev );
     void					SaveConfig();
     void					LoadConfig();
-    ArrayOfGridColWidth	readCols(ArrayOfGridColWidth ar, wxString str);
-    void					writeCols(wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry);
-    ArrayOfGridColWidth	readColsOld(wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry);
-    void					dialogDimmer(PI_ColorScheme cs,wxWindow* ctrl,wxColour col,wxColour col1, wxColour back_color,wxColour text_color, wxColour uitext, wxColour udkrd);
+    ArrayOfGridColWidth	readCols( ArrayOfGridColWidth ar, wxString str );
+    void					writeCols( wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry );
+    ArrayOfGridColWidth	readColsOld( wxFileConfig *pConf, ArrayOfGridColWidth ar, wxString entry );
+    void					dialogDimmer( PI_ColorScheme cs,wxWindow* ctrl,wxColour col,wxColour col1, wxColour back_color,wxColour text_color, wxColour uitext, wxColour udkrd );
     wxAuiManager     *m_pauimgr;
 
     int               m_show_id;
@@ -157,9 +157,12 @@
 {
 
 public:
-    LogbookTimer(logbookkonni_pi* l) : wxWindow() { plogbook_pi = l; }
+    LogbookTimer( logbookkonni_pi* l ) : wxWindow()
+    {
+        plogbook_pi = l;
+    }
 
-    void		OnTimer(wxTimerEvent& ev);
+    void		OnTimer( wxTimerEvent& ev );
     bool		popUp();
     void		timerEvent();
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/logbook_statusbar.fbp opencpn-plugin-logbookkonni-1.2024/src/logbook_statusbar.fbp
--- opencpn-plugin-logbookkonni-1.2018.2/src/logbook_statusbar.fbp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/logbook_statusbar.fbp	2016-02-25 13:06:29.000000000 +0000
@@ -6115,7 +6115,7 @@
                                                             <property name="minimize_button">0</property>
                                                             <property name="minimum_size"></property>
                                                             <property name="moveable">1</property>
-                                                            <property name="name">m_radioBtnActuellLogbook</property>
+                                                            <property name="name">m_radioBtnActualLogbook</property>
                                                             <property name="pane_border">1</property>
                                                             <property name="pane_position"></property>
                                                             <property name="pane_size"></property>
@@ -6154,7 +6154,7 @@
                                                             <event name="OnMouseEvents"></event>
                                                             <event name="OnMouseWheel"></event>
                                                             <event name="OnPaint"></event>
-                                                            <event name="OnRadioButton">OnRadioButtonActuellLogbook</event>
+                                                            <event name="OnRadioButton">OnRadioButtonActualLogbook</event>
                                                             <event name="OnRightDClick"></event>
                                                             <event name="OnRightDown"></event>
                                                             <event name="OnRightUp"></event>
@@ -41844,7 +41844,7 @@
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">Actuell Logbook</property>
+                                <property name="label">Actual Logbook</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -41852,7 +41852,7 @@
                                 <property name="minimize_button">0</property>
                                 <property name="minimum_size"></property>
                                 <property name="moveable">1</property>
-                                <property name="name">m_radioBtnActuell</property>
+                                <property name="name">m_radioBtnActual</property>
                                 <property name="pane_border">1</property>
                                 <property name="pane_position"></property>
                                 <property name="pane_size"></property>
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Maintenance.cpp opencpn-plugin-logbookkonni-1.2024/src/Maintenance.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/Maintenance.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Maintenance.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -1,5 +1,5 @@
 #ifndef WX_PRECOMP
-     # include <wx/wx.h>
+# include <wx/wx.h>
 #endif
 
 #include "Maintenance.h"
@@ -11,1713 +11,1730 @@
 #include "CrewList.h"
 
 #include <wx/tokenzr.h>
-#include <wx/filename.h> 
+#include <wx/filename.h>
 #include <wx/mimetype.h>
-#include <wx/wfstream.h> 
-#include <wx/txtstrm.h> 
-#include <wx/zipstrm.h> 
+#include <wx/wfstream.h>
+#include <wx/txtstrm.h>
+#include <wx/zipstrm.h>
 #include <wx/generic/gridctrl.h>
 #include <wx/datetime.h>
 
 
-Maintenance::Maintenance(LogbookDialog* d, wxString data, wxString layout, wxString layoutODT)
-	: Export(d)
+Maintenance::Maintenance( LogbookDialog* d, wxString data, wxString layout, wxString layoutODT )
+    : Export( d )
 {
-	dialog = d;
-	opt = dialog->logbookPlugIn->opt;
-	this->layout_locn = layout;
-	this->ODTLayout = layoutODT;
-	grid = d->m_gridMaintanence;
-	repairs = d->m_gridMaintanenceRepairs;
-	buyparts = d->m_gridMaintenanceBuyParts;
-	selectedCol = 0;
-	selectedRow = 0;
-	modified = false;
-	modifiedR = false;
-	modifiedB = false;
-
-	green = wxColour(0,255,0);
-	red = wxColour(255,0,0);
-	redlight = wxColour(255,128,128);
-	yellow = wxColour(255,255,0);
-	yellowlight = wxColour(255,255,155);
-	white = wxColour(255,255,255);
-
-	wxString serviceData = data;
-	wxTextFile *serviceFile;
-	serviceData.Append(_T("service.txt"));
-	wxFileName wxHomeFiledir = serviceData ;
-	if(!wxHomeFiledir.FileExists())
-	{
-		serviceFile = new wxTextFile(serviceData);	
-		serviceFile->Create();
-	}
-	else
-		serviceFile = new wxTextFile(serviceData);
-
-	serviceFile->Close();
-	data_locn = serviceData;
-
-	wxString buyPartsData = data;
-	wxTextFile *buyPartsFile;
-	buyPartsData.Append(_T("buyparts.txt"));
-	wxHomeFiledir = buyPartsData ;
-	if(!wxHomeFiledir.FileExists())
-	{
-		buyPartsFile = new wxTextFile(buyPartsData);	
-		buyPartsFile->Create();
-	}
-	else
-		buyPartsFile = new wxTextFile(buyPartsData);
-
-	buyPartsFile->Close();
-	data_locnBuyParts = buyPartsData;
-
-	wxString repairsData = data;
-	wxTextFile *repairsFile;
-	repairsData.Append(_T("repairs.txt"));
-	wxHomeFiledir = repairsData ;
-	if(!wxHomeFiledir.FileExists())
-	{
-		repairsFile = new wxTextFile(repairsData);	
-		repairsFile->Create();
-	}
-	else
-		repairsFile = new wxTextFile(repairsData);
-
-	repairsFile->Close();
-	data_locnRepairs = repairsData;
-
-	m_choices[0] = dialog->m_gridGlobal->GetColLabelValue(6)+_T(" +");								// Distance/T
-	m_choices[1] = wxString(_("Engine "))+dialog->m_gridMotorSails->GetColLabelValue(1)+_T(" +");	// Motor1/h
-	m_choices[2] = wxString(_("Engine "))+dialog->m_gridMotorSails->GetColLabelValue(4)+_T(" +");	// Motor2/h
-	m_choices[3] = dialog->m_gridMotorSails->GetColLabelValue(11)+_T(" +");							// Generator/h
-	m_choices[4] = dialog->m_gridMotorSails->GetColLabelValue(13)+_T(" <=");						// Bank1/AH
-	m_choices[5] = dialog->m_gridMotorSails->GetColLabelValue(15)+_T(" <=");						// Bank2/AH
-	m_choices[6] = dialog->m_gridMotorSails->GetColLabelValue(17)+_T(" +");							// Watermaker/h
-	m_choices[7] = dialog->m_gridGlobal->GetColLabelValue(3);										// Status
-	m_choices[8]  = _("Fix Date");
-	m_choices[9]  = _("Date + Days");
-	m_choices[10] = _("Date + Weeks");
-	m_choices[11] = _("Date + Months");
-	m_choicesCount = 12;
-
-	m_YesNo[0] = _("Yes"); 
-	m_YesNo[1] = _("No"); 
-
-	m_Priority[0] = _T("0"); 
-	m_Priority[1] = _T("1"); 
-	m_Priority[2] = _T("2"); 
-	m_Priority[3] = _T("3"); 
-	m_Priority[4] = _T("4"); 
-	m_Priority[5] = _T("5"); 
-}
-
-Maintenance::~Maintenance(void)
-{
-	update();
-	updateRepairs();
-	updateBuyParts();
+    dialog = d;
+    opt = dialog->logbookPlugIn->opt;
+    this->layout_locn = layout;
+    this->ODTLayout = layoutODT;
+    grid = d->m_gridMaintanence;
+    repairs = d->m_gridMaintanenceRepairs;
+    buyparts = d->m_gridMaintenanceBuyParts;
+    selectedCol = 0;
+    selectedRow = 0;
+    modified = false;
+    modifiedR = false;
+    modifiedB = false;
+
+    green = wxColour( 0,255,0 );
+    red = wxColour( 255,0,0 );
+    redlight = wxColour( 255,128,128 );
+    yellow = wxColour( 255,255,0 );
+    yellowlight = wxColour( 255,255,155 );
+    white = wxColour( 255,255,255 );
+
+    wxString serviceData = data;
+    wxTextFile *serviceFile;
+    serviceData.Append( _T( "service.txt" ) );
+    wxFileName wxHomeFiledir = serviceData ;
+    if ( !wxHomeFiledir.FileExists() )
+    {
+        serviceFile = new wxTextFile( serviceData );
+        serviceFile->Create();
+    }
+    else
+        serviceFile = new wxTextFile( serviceData );
+
+    serviceFile->Close();
+    data_locn = serviceData;
+
+    wxString buyPartsData = data;
+    wxTextFile *buyPartsFile;
+    buyPartsData.Append( _T( "buyparts.txt" ) );
+    wxHomeFiledir = buyPartsData ;
+    if ( !wxHomeFiledir.FileExists() )
+    {
+        buyPartsFile = new wxTextFile( buyPartsData );
+        buyPartsFile->Create();
+    }
+    else
+        buyPartsFile = new wxTextFile( buyPartsData );
+
+    buyPartsFile->Close();
+    data_locnBuyParts = buyPartsData;
+
+    wxString repairsData = data;
+    wxTextFile *repairsFile;
+    repairsData.Append( _T( "repairs.txt" ) );
+    wxHomeFiledir = repairsData ;
+    if ( !wxHomeFiledir.FileExists() )
+    {
+        repairsFile = new wxTextFile( repairsData );
+        repairsFile->Create();
+    }
+    else
+        repairsFile = new wxTextFile( repairsData );
+
+    repairsFile->Close();
+    data_locnRepairs = repairsData;
+
+    m_choices[0] = dialog->m_gridGlobal->GetColLabelValue( 6 )+_T( " +" );								// Distance/T
+    m_choices[1] = wxString( _( "Engine " ) )+dialog->m_gridMotorSails->GetColLabelValue( 1 )+_T( " +" );	// Motor1/h
+    m_choices[2] = wxString( _( "Engine " ) )+dialog->m_gridMotorSails->GetColLabelValue( 4 )+_T( " +" );	// Motor2/h
+    m_choices[3] = dialog->m_gridMotorSails->GetColLabelValue( 11 )+_T( " +" );							// Generator/h
+    m_choices[4] = dialog->m_gridMotorSails->GetColLabelValue( 13 )+_T( " <=" );						// Bank1/AH
+    m_choices[5] = dialog->m_gridMotorSails->GetColLabelValue( 15 )+_T( " <=" );						// Bank2/AH
+    m_choices[6] = dialog->m_gridMotorSails->GetColLabelValue( 17 )+_T( " +" );							// Watermaker/h
+    m_choices[7] = dialog->m_gridGlobal->GetColLabelValue( 3 );										// Status
+    m_choices[8]  = _( "Fix Date" );
+    m_choices[9]  = _( "Date + Days" );
+    m_choices[10] = _( "Date + Weeks" );
+    m_choices[11] = _( "Date + Months" );
+    m_choicesCount = 12;
+
+    m_YesNo[0] = _( "Yes" );
+    m_YesNo[1] = _( "No" );
+
+    m_Priority[0] = _T( "0" );
+    m_Priority[1] = _T( "1" );
+    m_Priority[2] = _T( "2" );
+    m_Priority[3] = _T( "3" );
+    m_Priority[4] = _T( "4" );
+    m_Priority[5] = _T( "5" );
+}
+
+Maintenance::~Maintenance( void )
+{
+    update();
+    updateRepairs();
+    updateBuyParts();
 }
 
 void Maintenance::setLayoutLocation()
 {
-	wxString layout_locn;
-	bool radio = dialog->m_radioBtnHTMLBuyParts->GetValue();
+    wxString layout_locn;
+    bool radio = dialog->m_radioBtnHTMLBuyParts->GetValue();
 
-	if(radio)
-		layout_locnBuyParts = this->layout_locn;
-	else
-		layout_locnBuyParts = ODTLayout;
-
-	wxString buypartsLay = layout_locnBuyParts;
-
-	buypartsLay.Append(_T("buyparts"));
-	dialog->appendOSDirSlash(&buypartsLay);
-	layout_locnBuyParts = buypartsLay;
-	dialog->loadLayoutChoice(LogbookDialog::GBUYPARTS,buypartsLay,dialog->m_choiceSelectLayoutBuyParts,opt->layoutPrefix[LogbookDialog::GBUYPARTS]);
-	if(radio)
-		dialog->m_choiceSelectLayoutBuyParts->SetSelection(dialog->logbookPlugIn->opt->buypartsGridLayoutChoice);
-	else
-		dialog->m_choiceSelectLayoutBuyParts->SetSelection(dialog->logbookPlugIn->opt->buypartsGridLayoutChoiceODT);
-
-	radio = dialog->m_radioBtnHTMLService->GetValue();
-	if(radio)
-		layout_locnService = this->layout_locn;
-	else
-		layout_locnService = ODTLayout;
-
-	wxString serviceLay = layout_locnService;
-
-	serviceLay.Append(_T("service"));
-	dialog->appendOSDirSlash(&serviceLay);
-	layout_locnService = serviceLay;
-	dialog->loadLayoutChoice(LogbookDialog::GSERVICE,serviceLay,dialog->m_choiceSelectLayoutService,opt->layoutPrefix[LogbookDialog::GSERVICE]);
-	if(radio)
-		dialog->m_choiceSelectLayoutService->SetSelection(dialog->logbookPlugIn->opt->serviceGridLayoutChoice);
-	else
-		dialog->m_choiceSelectLayoutService->SetSelection(dialog->logbookPlugIn->opt->serviceGridLayoutChoiceODT);
-
-	radio = dialog->m_radioBtnHTMLRepairs->GetValue();
-	if(radio)
-		layout_locnRepairs = this->layout_locn;
-	else
-		layout_locnRepairs = ODTLayout;
-
-	wxString repairsLay = layout_locnRepairs;
-
-	repairsLay.Append(_T("repairs"));
-	dialog->appendOSDirSlash(&repairsLay);
-	layout_locnRepairs = repairsLay;
-	dialog->loadLayoutChoice(LogbookDialog::GREPAIRS,repairsLay,dialog->m_choiceSelectLayoutRepairs,opt->layoutPrefix[LogbookDialog::GREPAIRS]);
-	if(radio)
-		dialog->m_choiceSelectLayoutRepairs->SetSelection(dialog->logbookPlugIn->opt->repairsGridLayoutChoice);
-	else
-		dialog->m_choiceSelectLayoutRepairs->SetSelection(dialog->logbookPlugIn->opt->repairsGridLayoutChoiceODT);
+    if ( radio )
+        layout_locnBuyParts = this->layout_locn;
+    else
+        layout_locnBuyParts = ODTLayout;
+
+    wxString buypartsLay = layout_locnBuyParts;
+
+    buypartsLay.Append( _T( "buyparts" ) );
+    dialog->appendOSDirSlash( &buypartsLay );
+    layout_locnBuyParts = buypartsLay;
+    dialog->loadLayoutChoice( LogbookDialog::GBUYPARTS,buypartsLay,dialog->m_choiceSelectLayoutBuyParts,opt->layoutPrefix[LogbookDialog::GBUYPARTS] );
+    if ( radio )
+        dialog->m_choiceSelectLayoutBuyParts->SetSelection( dialog->logbookPlugIn->opt->buypartsGridLayoutChoice );
+    else
+        dialog->m_choiceSelectLayoutBuyParts->SetSelection( dialog->logbookPlugIn->opt->buypartsGridLayoutChoiceODT );
+
+    radio = dialog->m_radioBtnHTMLService->GetValue();
+    if ( radio )
+        layout_locnService = this->layout_locn;
+    else
+        layout_locnService = ODTLayout;
+
+    wxString serviceLay = layout_locnService;
+
+    serviceLay.Append( _T( "service" ) );
+    dialog->appendOSDirSlash( &serviceLay );
+    layout_locnService = serviceLay;
+    dialog->loadLayoutChoice( LogbookDialog::GSERVICE,serviceLay,dialog->m_choiceSelectLayoutService,opt->layoutPrefix[LogbookDialog::GSERVICE] );
+    if ( radio )
+        dialog->m_choiceSelectLayoutService->SetSelection( dialog->logbookPlugIn->opt->serviceGridLayoutChoice );
+    else
+        dialog->m_choiceSelectLayoutService->SetSelection( dialog->logbookPlugIn->opt->serviceGridLayoutChoiceODT );
+
+    radio = dialog->m_radioBtnHTMLRepairs->GetValue();
+    if ( radio )
+        layout_locnRepairs = this->layout_locn;
+    else
+        layout_locnRepairs = ODTLayout;
+
+    wxString repairsLay = layout_locnRepairs;
+
+    repairsLay.Append( _T( "repairs" ) );
+    dialog->appendOSDirSlash( &repairsLay );
+    layout_locnRepairs = repairsLay;
+    dialog->loadLayoutChoice( LogbookDialog::GREPAIRS,repairsLay,dialog->m_choiceSelectLayoutRepairs,opt->layoutPrefix[LogbookDialog::GREPAIRS] );
+    if ( radio )
+        dialog->m_choiceSelectLayoutRepairs->SetSelection( dialog->logbookPlugIn->opt->repairsGridLayoutChoice );
+    else
+        dialog->m_choiceSelectLayoutRepairs->SetSelection( dialog->logbookPlugIn->opt->repairsGridLayoutChoiceODT );
 }
 
 void Maintenance::setAlignmentService()
 {
-	grid->SetReadOnly(lastRow,START);
-	grid->SetReadOnly(lastRow,PRIORITY);
-	grid->SetCellAlignment( lastRow,PRIORITY,wxALIGN_CENTER, wxALIGN_TOP );
-	grid->SetCellAlignment( lastRow,TEXT,wxALIGN_LEFT, wxALIGN_TOP );
-	grid->SetCellAlignment( lastRow,IF,wxALIGN_CENTER, wxALIGN_TOP );
-	grid->SetCellAlignment( lastRow,ACTIVE,wxALIGN_CENTER, wxALIGN_TOP );
+    grid->SetReadOnly( lastRow,START );
+    grid->SetReadOnly( lastRow,PRIORITY );
+    grid->SetCellAlignment( lastRow,PRIORITY,wxALIGN_CENTER, wxALIGN_TOP );
+    grid->SetCellAlignment( lastRow,TEXT,wxALIGN_LEFT, wxALIGN_TOP );
+    grid->SetCellAlignment( lastRow,IF,wxALIGN_CENTER, wxALIGN_TOP );
+    grid->SetCellAlignment( lastRow,ACTIVE,wxALIGN_CENTER, wxALIGN_TOP );
 }
 
 void Maintenance::addLine()
 {
-	modified = true;
-	grid->AppendRows();
+    modified = true;
+    grid->AppendRows();
 
-	lastRow = grid->GetNumberRows()-1;
-	selectedRow = lastRow;
-	setAlignmentService();
-
-
-	grid->SetCellEditor(lastRow,IF,(new myGridCellChoiceEditor(12,m_choices,false)));
-
-	myGridCellBoolEditor* boolEditor = new myGridCellBoolEditor();
-	boolEditor->UseStringValues(_("Yes"),_("No"));
-	grid->SetCellEditor(lastRow,ACTIVE,boolEditor);
-
-	grid->SetCellValue(lastRow,PRIORITY,_T("5"));
-	grid->SetCellValue(lastRow,IF,m_choices[0]);
-	grid->SetCellValue(lastRow,WARN,_T("1"));
-	grid->SetCellValue(lastRow,URGENT,_T("2"));
-	cellCollChanged(IF, lastRow);
-	cellCollChanged(WARN, lastRow);
-	checkService(dialog->m_gridGlobal->GetNumberRows()-1);
-	grid->SetCellBackgroundColour(lastRow,START,wxColour( 240, 240, 240 ));
+    lastRow = grid->GetNumberRows()-1;
+    selectedRow = lastRow;
+    setAlignmentService();
+
+
+    grid->SetCellEditor( lastRow,IF,( new myGridCellChoiceEditor( 12,m_choices,false ) ) );
+
+    myGridCellBoolEditor* boolEditor = new myGridCellBoolEditor();
+    boolEditor->UseStringValues( _( "Yes" ),_( "No" ) );
+    grid->SetCellEditor( lastRow,ACTIVE,boolEditor );
+
+    grid->SetCellValue( lastRow,PRIORITY,_T( "5" ) );
+    grid->SetCellValue( lastRow,IF,m_choices[0] );
+    grid->SetCellValue( lastRow,WARN,_T( "1" ) );
+    grid->SetCellValue( lastRow,URGENT,_T( "2" ) );
+    cellCollChanged( IF, lastRow );
+    cellCollChanged( WARN, lastRow );
+    checkService( dialog->m_gridGlobal->GetNumberRows()-1 );
+    grid->SetCellBackgroundColour( lastRow,START,wxColour( 240, 240, 240 ) );
 
-	grid->SetCellValue(lastRow,ACTIVE,_("Yes"));
+    grid->SetCellValue( lastRow,ACTIVE,_( "Yes" ) );
 }
 
 void Maintenance::addLineRepairs()
 {
-	modified = true;
-	repairs->AppendRows();
+    modified = true;
+    repairs->AppendRows();
 
-	lastRowRepairs = repairs->GetNumberRows()-1;
-	selectedRowRepairs = lastRowRepairs;
-	setAlignmentRepairs();
+    lastRowRepairs = repairs->GetNumberRows()-1;
+    selectedRowRepairs = lastRowRepairs;
+    setAlignmentRepairs();
 
-	repairs->SetCellValue(lastRowRepairs,RPRIORITY,_T("0"));
-	checkRepairs();
+    repairs->SetCellValue( lastRowRepairs,RPRIORITY,_T( "0" ) );
+    checkRepairs();
 }
 
 void Maintenance::addLineBuyParts()
 {
-	modified = true;
-	buyparts->AppendRows();
+    modified = true;
+    buyparts->AppendRows();
 
-	lastRowBuyParts = buyparts->GetNumberRows()-1;
-	selectedRowBuyParts = lastRowBuyParts;	
-	setAlignmentBuyParts();
+    lastRowBuyParts = buyparts->GetNumberRows()-1;
+    selectedRowBuyParts = lastRowBuyParts;
+    setAlignmentBuyParts();
 
-	buyparts->SetCellValue(lastRowBuyParts,PPRIORITY,_T("0"));
-	checkBuyParts();
+    buyparts->SetCellValue( lastRowBuyParts,PPRIORITY,_T( "0" ) );
+    checkBuyParts();
 }
 
 void Maintenance::setAlignmentRepairs()
 {
-	repairs->SetCellAlignment(lastRowRepairs,RPRIORITY,wxALIGN_CENTER, wxALIGN_TOP);
-	repairs->SetCellAlignment(lastRowRepairs,RTEXT,wxALIGN_LEFT, wxALIGN_TOP);
-	repairs->SetCellEditor(lastRowRepairs,RTEXT,new wxGridCellAutoWrapStringEditor);
-	repairs->SetCellEditor(lastRowRepairs,RPRIORITY,new myGridCellChoiceEditor(6,m_Priority,false));
+    repairs->SetCellAlignment( lastRowRepairs,RPRIORITY,wxALIGN_CENTER, wxALIGN_TOP );
+    repairs->SetCellAlignment( lastRowRepairs,RTEXT,wxALIGN_LEFT, wxALIGN_TOP );
+    repairs->SetCellEditor( lastRowRepairs,RTEXT,new wxGridCellAutoWrapStringEditor );
+    repairs->SetCellEditor( lastRowRepairs,RPRIORITY,new myGridCellChoiceEditor( 6,m_Priority,false ) );
 }
 
 void Maintenance::setAlignmentBuyParts()
 {
-	buyparts->SetCellEditor(lastRowBuyParts,PPRIORITY,new myGridCellChoiceEditor(6,m_Priority,false));
-
-	buyparts->SetCellEditor(lastRowBuyParts,PARTS,new wxGridCellAutoWrapStringEditor);
-	buyparts->SetCellAlignment(lastRowBuyParts,PPRIORITY,wxALIGN_CENTER, wxALIGN_TOP);
-	buyparts->SetCellAlignment(lastRowBuyParts,PCATEGORY,wxALIGN_CENTER, wxALIGN_TOP);
-	buyparts->SetCellAlignment(lastRowBuyParts,TITLE,wxALIGN_LEFT, wxALIGN_TOP);
-	buyparts->SetCellAlignment(lastRowBuyParts,PARTS,wxALIGN_LEFT, wxALIGN_TOP);
-	buyparts->SetCellAlignment(lastRowBuyParts,DATE,wxALIGN_CENTER, wxALIGN_TOP);
-	buyparts->SetCellAlignment(lastRowBuyParts,AT,wxALIGN_LEFT, wxALIGN_TOP);
+    buyparts->SetCellEditor( lastRowBuyParts,PPRIORITY,new myGridCellChoiceEditor( 6,m_Priority,false ) );
+
+    buyparts->SetCellEditor( lastRowBuyParts,PARTS,new wxGridCellAutoWrapStringEditor );
+    buyparts->SetCellAlignment( lastRowBuyParts,PPRIORITY,wxALIGN_CENTER, wxALIGN_TOP );
+    buyparts->SetCellAlignment( lastRowBuyParts,PCATEGORY,wxALIGN_CENTER, wxALIGN_TOP );
+    buyparts->SetCellAlignment( lastRowBuyParts,TITLE,wxALIGN_LEFT, wxALIGN_TOP );
+    buyparts->SetCellAlignment( lastRowBuyParts,PARTS,wxALIGN_LEFT, wxALIGN_TOP );
+    buyparts->SetCellAlignment( lastRowBuyParts,DATE,wxALIGN_CENTER, wxALIGN_TOP );
+    buyparts->SetCellAlignment( lastRowBuyParts,AT,wxALIGN_LEFT, wxALIGN_TOP );
 }
 
 void Maintenance::loadData()
 {
-	wxString t, s;
+    wxString t, s;
 
-	wxFileInputStream input( data_locn );
-	wxTextInputStream* stream = new wxTextInputStream (input,_T("\n"),wxConvUTF8);
+    wxFileInputStream input( data_locn );
+    wxTextInputStream* stream = new wxTextInputStream ( input,_T( "\n" ),wxConvUTF8 );
 
-	int row = 0;
-	int sel = -1;
+    int row = 0;
+    int sel = -1;
 
-	dialog->m_gridMaintanence->BeginBatch();
-	while(!input.Eof())
-   {
-		t = stream->ReadLine();
-		if(input.Eof()) break;
-        if(t.Contains(_T("#1.2#"))){
-			continue;}
-		addLine();
-
-		wxStringTokenizer tkz(t, _T("\t"),wxTOKEN_RET_EMPTY );
-		int c = 0;
-		while ( tkz.HasMoreTokens() )
-		{
-			s = dialog->restoreDangerChar(tkz.GetNextToken());
-			s.RemoveLast();
-
-			switch(c)
-			{
-			case TEXT:      grid->SetCellValue(row,TEXT,s);
-							break;
-			case IF:		sel = getSelection(s); 
-							grid->SetCellValue(row,IF,s); 
-							break;
-			case WARN:		if(sel == 8)							
-								s = getDateString(s);
-							grid->SetCellValue(row,WARN,s); 
-							break;
-			case URGENT:	if(sel == 8)
-								s = getDateString(s);
-							grid->SetCellValue(row,URGENT,s); 
-							break;
-			case START:		if(sel > 8)
-								s = getDateString(s);
-							grid->SetCellValue(row,START,s); 
-							break;
-			case ACTIVE:	grid->SetCellValue(row,ACTIVE,s); 
-							break;
-			}
-			c++;
-		}
-		row++;
-	}
-	dialog->m_gridMaintanence->EndBatch();
-	wxFileInputStream input1( data_locnBuyParts );
-	wxTextInputStream* stream1 = new wxTextInputStream (input1,_T("\n"),wxConvUTF8);
-
-	row = 0;
-
-	while( true )
-	{
-		t = stream1->ReadLine();
-        if(t.Contains(_T("#1.2#"))){
-			continue;}
-		if(input1.Eof()) break;
-		addLineBuyParts();
-
-		wxStringTokenizer tkz(t, _T("\t"),wxTOKEN_RET_EMPTY );
-		int c = 0;
-		while ( tkz.HasMoreTokens() )
-		{
-			s = dialog->restoreDangerChar(tkz.GetNextToken());
-			s.RemoveLast();
-
-			switch(c)
-			{
-			case PPRIORITY:	buyparts->SetCellValue(row,PPRIORITY,s);
-							break;
-			case PCATEGORY:	buyparts->SetCellValue(row,PCATEGORY,s);
-							break;
-			case TITLE:
+    dialog->m_gridMaintanence->BeginBatch();
+    while ( !input.Eof() )
+    {
+        t = stream->ReadLine();
+        if ( input.Eof() ) break;
+        if ( t.Contains( _T( "#1.2#" ) ) )
+        {
+            continue;
+        }
+        addLine();
+
+        wxStringTokenizer tkz( t, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        int c = 0;
+        while ( tkz.HasMoreTokens() )
+        {
+            s = dialog->restoreDangerChar( tkz.GetNextToken() );
+            s.RemoveLast();
+
+            switch ( c )
+            {
+            case TEXT:
+                grid->SetCellValue( row,TEXT,s );
+                break;
+            case IF:
+                sel = getSelection( s );
+                grid->SetCellValue( row,IF,s );
+                break;
+            case WARN:
+                if ( sel == 8 )
+                    s = getDateString( s );
+                grid->SetCellValue( row,WARN,s );
+                break;
+            case URGENT:
+                if ( sel == 8 )
+                    s = getDateString( s );
+                grid->SetCellValue( row,URGENT,s );
+                break;
+            case START:
+                if ( sel > 8 )
+                    s = getDateString( s );
+                grid->SetCellValue( row,START,s );
+                break;
+            case ACTIVE:
+                grid->SetCellValue( row,ACTIVE,s );
+                break;
+            }
+            c++;
+        }
+        row++;
+    }
+    dialog->m_gridMaintanence->EndBatch();
+    wxFileInputStream input1( data_locnBuyParts );
+    wxTextInputStream* stream1 = new wxTextInputStream ( input1,_T( "\n" ),wxConvUTF8 );
+
+    row = 0;
+
+    while ( true )
+    {
+        t = stream1->ReadLine();
+        if ( t.Contains( _T( "#1.2#" ) ) )
+        {
+            continue;
+        }
+        if ( input1.Eof() ) break;
+        addLineBuyParts();
+
+        wxStringTokenizer tkz( t, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        int c = 0;
+        while ( tkz.HasMoreTokens() )
+        {
+            s = dialog->restoreDangerChar( tkz.GetNextToken() );
+            s.RemoveLast();
+
+            switch ( c )
+            {
+            case PPRIORITY:
+                buyparts->SetCellValue( row,PPRIORITY,s );
+                break;
+            case PCATEGORY:
+                buyparts->SetCellValue( row,PCATEGORY,s );
+                break;
+            case TITLE:
 #ifdef __WXOSX__
-                            s = wxString(s.To8BitData(), wxConvUTF8);
+                s = wxString( s.To8BitData(), wxConvUTF8 );
 #endif
-                            buyparts->SetCellValue(row,TITLE,s);
-							break;
-			case PARTS   :
+                buyparts->SetCellValue( row,TITLE,s );
+                break;
+            case PARTS   :
 #ifdef __WXOSX__
-                            s = wxString(s.To8BitData(), wxConvUTF8);
+                s = wxString( s.To8BitData(), wxConvUTF8 );
 #endif
-                            buyparts->SetCellValue(row,PARTS,s);
-							break;
-			case DATE    :	buyparts->SetCellValue(row,DATE,getDateString(s));
-							break;
-			case AT      :	buyparts->SetCellValue(row,AT,s);
-							break;
-			}
-			c++;
-		}
-		buyparts->AutoSizeRow(row,false);
-		row++;
-	}
-
-	wxFileInputStream input2( data_locnRepairs );
-	wxTextInputStream* stream2 = new wxTextInputStream (input2,_T("\n"),wxConvUTF8);
-
-	row = 0;
-	while( true )
-	{
-		t = stream2->ReadLine();
-		if(input2.Eof()) break;
-        if(t.Contains(_T("#1.2#"))){
-			continue;}
-
-		addLineRepairs();
-
-		wxStringTokenizer tkz(t, _T("\t"),wxTOKEN_RET_EMPTY );
-		int c = 0;
-		while ( tkz.HasMoreTokens() )
-		{
-			s = dialog->restoreDangerChar(tkz.GetNextToken());
-			s.RemoveLast();
-
-			switch(c)
-			{
-			case RPRIORITY:	repairs->SetCellValue(row,RPRIORITY,s);
-							break;
-			case RTEXT:
+                buyparts->SetCellValue( row,PARTS,s );
+                break;
+            case DATE    :
+                buyparts->SetCellValue( row,DATE,getDateString( s ) );
+                break;
+            case AT      :
+                buyparts->SetCellValue( row,AT,s );
+                break;
+            }
+            c++;
+        }
+        buyparts->AutoSizeRow( row,false );
+        row++;
+    }
+
+    wxFileInputStream input2( data_locnRepairs );
+    wxTextInputStream* stream2 = new wxTextInputStream ( input2,_T( "\n" ),wxConvUTF8 );
+
+    row = 0;
+    while ( true )
+    {
+        t = stream2->ReadLine();
+        if ( input2.Eof() ) break;
+        if ( t.Contains( _T( "#1.2#" ) ) )
+        {
+            continue;
+        }
+
+        addLineRepairs();
+
+        wxStringTokenizer tkz( t, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        int c = 0;
+        while ( tkz.HasMoreTokens() )
+        {
+            s = dialog->restoreDangerChar( tkz.GetNextToken() );
+            s.RemoveLast();
+
+            switch ( c )
+            {
+            case RPRIORITY:
+                repairs->SetCellValue( row,RPRIORITY,s );
+                break;
+            case RTEXT:
 #ifdef __WXOSX__
-                    s = wxString(s.To8BitData(), wxConvUTF8);
+                s = wxString( s.To8BitData(), wxConvUTF8 );
 #endif
-                    repairs->SetCellValue(row,RTEXT,s);
-							break;
-			}
-			c++;
-		}
-		repairs->AutoSizeRow(row,false);
-		row++;
-	}
+                repairs->SetCellValue( row,RTEXT,s );
+                break;
+            }
+            c++;
+        }
+        repairs->AutoSizeRow( row,false );
+        row++;
+    }
 
-	checkService(dialog->m_gridGlobal->GetNumberRows()-1);
-	checkRepairs();
+    checkService( dialog->m_gridGlobal->GetNumberRows()-1 );
+    checkRepairs();
 //	checkBuyParts();
-	modified = false;
+    modified = false;
 }
 
-int Maintenance::getSelection(wxString s)
+int Maintenance::getSelection( wxString s )
 {
-		for(int i = 0; i < dialog->maintenance->m_choicesCount; i++)
-		{
-			if(s == dialog->maintenance->m_choices[i])
-				return i;
-		}
-		return -1;
+    for ( int i = 0; i < dialog->maintenance->m_choicesCount; i++ )
+    {
+        if ( s == dialog->maintenance->m_choices[i] )
+            return i;
+    }
+    return -1;
 }
 
-wxString Maintenance::getDateString(wxString s)
+wxString Maintenance::getDateString( wxString s )
 {
-	if(s.IsEmpty() || s.GetChar(0) == ' ') return _T("");
+    if ( s.IsEmpty() || s.GetChar( 0 ) == ' ' ) return _T( "" );
 
-	wxStringTokenizer tkz(s,_T("/"));
-	int month = wxAtoi(tkz.GetNextToken());
-	int day = wxAtoi(tkz.GetNextToken());
-	int year = wxAtoi(tkz.GetNextToken());
-	wxDateTime dt;
-	dt.Set(day, (wxDateTime::Month) month,year);
+    wxStringTokenizer tkz( s,_T( "/" ) );
+    int month = wxAtoi( tkz.GetNextToken() );
+    int day = wxAtoi( tkz.GetNextToken() );
+    int year = wxAtoi( tkz.GetNextToken() );
+    wxDateTime dt;
+    dt.Set( day, ( wxDateTime::Month ) month,year );
 
-	return wxString::Format(_T("%s"),dt.Format(opt->sdateformat).c_str());
+    return wxString::Format( _T( "%s" ),dt.Format( opt->sdateformat ).c_str() );
 }
 
-void Maintenance::buyParts(int i)
+void Maintenance::buyParts( int i )
 {
-	wxString s;
-	wxGrid *grid;
-	int text, selectedRow;
+    wxString s;
+    wxGrid *grid;
+    int text, selectedRow;
 
-	if(i == 0)
-	{
-		s = _("Service");
-		grid = this->grid;
-		text = TEXT;
-		selectedRow = this->selectedRow;
-	}
-	else
-	{
-		s = _("Repairs");
-		grid = repairs;
-		text = RTEXT;
-		selectedRow = selectedRowRepairs;
-	}
+    if ( i == 0 )
+    {
+        s = _( "Service" );
+        grid = this->grid;
+        text = TEXT;
+        selectedRow = this->selectedRow;
+    }
+    else
+    {
+        s = _( "Repairs" );
+        grid = repairs;
+        text = RTEXT;
+        selectedRow = selectedRowRepairs;
+    }
 
-	addLineBuyParts();
+    addLineBuyParts();
 
-	dialog->m_gridMaintenanceBuyParts->SetCellValue(lastRowBuyParts,PPRIORITY,
-		grid->GetCellValue(selectedRow,PRIORITY));
-	dialog->m_gridMaintenanceBuyParts->SetCellValue(lastRowBuyParts,PCATEGORY,s);
-	dialog->m_gridMaintenanceBuyParts->SetCellValue(lastRowBuyParts,TITLE,
-		grid->GetCellValue(selectedRow,text).Trim());
-	checkBuyParts();
+    dialog->m_gridMaintenanceBuyParts->SetCellValue( lastRowBuyParts,PPRIORITY,
+            grid->GetCellValue( selectedRow,PRIORITY ) );
+    dialog->m_gridMaintenanceBuyParts->SetCellValue( lastRowBuyParts,PCATEGORY,s );
+    dialog->m_gridMaintenanceBuyParts->SetCellValue( lastRowBuyParts,TITLE,
+            grid->GetCellValue( selectedRow,text ).Trim() );
+    checkBuyParts();
 
-	dialog->m_notebook6->SetSelection(2);
+    dialog->m_notebook6->SetSelection( 2 );
 }
 
-void Maintenance::setRowBackground(int row, wxColour &c)
+void Maintenance::setRowBackground( int row, wxColour &c )
 {
-	for(int i= 0; i < grid->GetNumberCols(); i++)
-		grid->SetCellBackgroundColour(row,i,c);
+    for ( int i= 0; i < grid->GetNumberCols(); i++ )
+        grid->SetCellBackgroundColour( row,i,c );
 
-	if(c == wxColour(255,0,0))
-		grid->SetCellValue(row,PRIORITY,_T("1"));
-	else if(c == wxColour(255,255,0))
-		grid->SetCellValue(row,PRIORITY,_T("3"));
-	else if(c == wxColour(0,255,0))
-		grid->SetCellValue(row,PRIORITY,_T("5"));
-	else if(c == wxColour(255,255,255))
-		grid->SetCellValue(row,PRIORITY,_T("0"));
+    if ( c == wxColour( 255,0,0 ) )
+        grid->SetCellValue( row,PRIORITY,_T( "1" ) );
+    else if ( c == wxColour( 255,255,0 ) )
+        grid->SetCellValue( row,PRIORITY,_T( "3" ) );
+    else if ( c == wxColour( 0,255,0 ) )
+        grid->SetCellValue( row,PRIORITY,_T( "5" ) );
+    else if ( c == wxColour( 255,255,255 ) )
+        grid->SetCellValue( row,PRIORITY,_T( "0" ) );
 }
 
-void Maintenance::checkService(int row)
+void Maintenance::checkService( int row )
 {
 
-	if(dialog->m_gridGlobal->GetNumberRows() == 0) return;
+    if ( dialog->m_gridGlobal->GetNumberRows() == 0 ) return;
 
-	wxString date;
-	wxDateTime dtstart, dturgent, dtwarn;
-	wxDateSpan spanu,spanw;
-	wxString g, yesno;
-	int choice = -1;
-	int col = 0;
-	double startValue, warnValue, urgentValue;
-	double distanceTotal, motorTotal, motorTotal2, generator, watermaker, bank1, bank2;
-	wxString sign, cell;
-	int border = 0;
-	wxColour rowBack;
+    wxString date;
+    wxDateTime dtstart, dturgent, dtwarn;
+    wxDateSpan spanu,spanw;
+    wxString g, yesno;
+    int choice = -1;
+    int col = 0;
+    double startValue, warnValue, urgentValue;
+    double distanceTotal, motorTotal, motorTotal2, generator, watermaker, bank1, bank2;
+    wxString sign, cell;
+    int border = 0;
+    wxColour rowBack;
 //	int sailscol = dialog->logbook->sailsCol;
 
-	for(int r = 0; r < grid->GetNumberRows(); r++)
-	{
-		g = grid->GetCellValue(r,IF);
-
-		yesno = grid->GetCellValue(r,ACTIVE);
-		if(g.IsEmpty()) continue;
-
-		cell = grid->GetCellValue(r,START);
-		cell.ToDouble(&startValue);
-		cell = grid->GetCellValue(r,WARN);
-		cell.ToDouble(&warnValue);
-		cell = grid->GetCellValue(r,URGENT);
-		cell.ToDouble(&urgentValue);
-
-		cell = dialog->m_gridGlobal->GetCellValue(row,6);
-		cell.ToDouble(&distanceTotal);
-		cell = dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::MOTORT);
-		cell.ToDouble(&motorTotal);
-		cell = dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::MOTOR1T);
-		cell.ToDouble(&motorTotal2);
-		cell = dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::GENET);
-		cell.ToDouble(&generator);
-		cell = dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::WATERMT);
-		cell.ToDouble(&watermaker);
-		cell = dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::BANK1T);
-		cell.ToDouble(&bank1);
-		cell = dialog->m_gridMotorSails->GetCellValue(row,LogbookHTML::BANK2T);
-		cell.ToDouble(&bank2);
-
-		if(g == m_choices[0])
-		{
-			choice = 0;
-			col = LogbookHTML::DTOTAL;
-		}
-		else if (g == m_choices[1])
-		{
-			choice = 1;
-			col = LogbookHTML::MOTORT;
-		}
-		else if (g == m_choices[2])
-		{
-			choice = 2;
-			col = LogbookHTML::MOTOR1T;
-		}
-		else if (g == m_choices[3])
-		{
-			choice = 3;
-			col = LogbookHTML::GENET;
-		}
-		else if (g == m_choices[4])
-		{
-			choice = 4;
-			col = LogbookHTML::BANK1T;
-		}
-		else if (g == m_choices[5])
-		{
-			choice = 5;
-			col = LogbookHTML::BANK2T;
-		}
-		else if (g == m_choices[6])
-		{
-			choice = 6;
-			col = LogbookHTML::WATERMT;
-		}
-		else if (g == m_choices[7])
-		{
-			choice = 7;
-			col = LogbookHTML::STATUS;
-		}
-		else if (g == m_choices[8])
-			choice = 8;
-		else if (g == m_choices[9])
-			choice = 9;
-		else if (g == m_choices[10])
-			choice = 10;
-		else if (g == m_choices[11])
-			choice = 11;
-
-		if(yesno == _("Yes")) // Active set to 'yes'
-		{
-			switch(choice)
-			{
-			case 0: //Distance
-				if(distanceTotal >= startValue+urgentValue)
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				else if(distanceTotal >= startValue+warnValue)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(yellow,row,col);
-					break;
-				}
-				else
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridGlobal->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 1: // Engine #1
-				if(motorTotal >= startValue+urgentValue)
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				else if(motorTotal >= startValue+warnValue)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(yellow,row,col);
-					break;
-				}
-				else
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 2: // Engine #2
-				if(motorTotal2 >= startValue+urgentValue)
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				else if(motorTotal2 >= startValue+warnValue)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(yellow,row,col);
-					break;
-				}
-				else
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 3: // Generator
-				if(generator >= startValue+urgentValue)
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				else if(generator >= startValue+warnValue)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(yellow,row,col);
-					break;
-				}
-				else
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 4: // Bank #1
-				if(bank1 <= urgentValue)
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				else if(bank1 <= warnValue)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(yellow,row,col);
-					break;
-				}
-				else
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 5: // Bank #2
-				if(bank2 <= urgentValue)
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				else if(bank2 <= warnValue)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(yellow,row,col);
-					break;
-				}
-				else
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 6: // WaterMaker
-				if(watermaker >= startValue+urgentValue)
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				else if(watermaker >= startValue+warnValue)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(yellow,row,col);
-					break;
-				}
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 7: //Status
-				if(grid->GetCellValue(r,URGENT) == dialog->m_gridGlobal->GetCellValue(row,LogbookHTML::STATUS))
-				{
-					border = 2;
-					rowBack = red;
-					dialog->m_gridMotorSails->SetCellBackgroundColour(red,row,col);
-					break;
-				}
-				{
-					rowBack = green;
-					for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-				}
-				break;
-			case 8:	
-				{
-				date = grid->GetCellValue(r,URGENT);
-				dialog->myParseDate(date, dturgent);
-				date = grid->GetCellValue(r,WARN);
-				dialog->myParseDate(date, dtwarn);
-				dtstart = wxDateTime::Now();
-
-				if(dtstart >= dturgent)
-				{
-					border = 2;
-					rowBack = red;
-					break;
-				}
-				else if(dtstart >= dtwarn)
-				{
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					break;
-				}
-				else
-					rowBack = green;
-				}
-				break;
-			case 9:
-				{
-				long days;
-				date = dialog->m_gridMaintanence->GetCellValue(r,START);
-				dialog->myParseDate(date, dtstart);
-
-				grid->GetCellValue(r,WARN).ToLong(&days);
-				spanw.SetDays((int)days);
-				dtwarn = dtstart;
-				dtwarn += spanw;
-				grid->GetCellValue(r,URGENT).ToLong(&days);
-				spanu.SetDays((int)days);
-				dturgent = dtstart;
-				dturgent += spanu;
-				dtstart = wxDateTime::Now();
-
-				if(dtstart >= dturgent )
-				{
-					border = 2;
-					rowBack = red; 
-					break;
-				}
-				else if(dtstart >= dtwarn )
-				{	
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					break;
-				}
-				else
-					rowBack = green;
-				}
-				break;
-			case 10:
-				{
-				long weeks;
-				date = dialog->m_gridMaintanence->GetCellValue(r,START);
-				dialog->myParseDate(date, dtstart);
-
-				grid->GetCellValue(r,WARN).ToLong(&weeks);
-				spanw.SetWeeks((int)weeks);
-				dtwarn = dtstart;
-				dtwarn += spanw;
-				grid->GetCellValue(r,URGENT).ToLong(&weeks);
-				spanu.SetWeeks((int)weeks);
-				dturgent = dtstart;
-				dturgent += spanu;
-				dtstart = wxDateTime::Now();
-
-				if(dtstart >= dturgent )
-				{
-					border = 2;
-					rowBack = red; 
-					break;
-				}
-				else if(dtstart >= dtwarn )
-				{	
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					break;
-				}
-				else
-					rowBack = green;
-				}
-				break;
-			case 11:
-				{
-				long month;
-				date = dialog->m_gridMaintanence->GetCellValue(r,START);
-				dialog->myParseDate(date, dtstart);
-
-				grid->GetCellValue(r,WARN).ToLong(&month);
-				spanw.SetMonths((int)month);
-				dtwarn = dtstart;
-				dtwarn += spanw;
-				grid->GetCellValue(r,URGENT).ToLong(&month);
-				spanu.SetMonths((int)month);
-				dturgent = dtstart;
-				dturgent += spanu;
-				dtstart = wxDateTime::Now();
-
-				if(dtstart >= dturgent )
-				{
-					border = 2;
-					rowBack = red; 
-					break;
-				}
-				else if(dtstart >= dtwarn )
-				{	
-					if(border != 2)
-						border = 1;
-					rowBack = yellow;
-					break;
-				}
-				else
-					rowBack = green;
-				}
-				break;
-			}
-		    setRowBackground(r,rowBack);
-		}
-		else
-		{
-			setRowBackground(r,white);
-			for(int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++)
-						dialog->m_gridMotorSails->SetCellBackgroundColour(white,i,col);
-		}
-		setBuyPartsPriority(grid,r,PRIORITY,TEXT);
-	}
-
-	checkBuyParts();
-
-	switch(border)
-	{
-		case 0:
-			dialog->SetBackgroundColour(dialog->defaultBackground);
-			break;
-		case 1:
-			dialog->SetBackgroundColour(yellow);
-			break;
-		case 2:
-			dialog->SetBackgroundColour(red);
-			break;
-	}
-	dialog->Refresh();
+    for ( int r = 0; r < grid->GetNumberRows(); r++ )
+    {
+        g = grid->GetCellValue( r,IF );
+
+        yesno = grid->GetCellValue( r,ACTIVE );
+        if ( g.IsEmpty() ) continue;
+
+        cell = grid->GetCellValue( r,START );
+        cell.ToDouble( &startValue );
+        cell = grid->GetCellValue( r,WARN );
+        cell.ToDouble( &warnValue );
+        cell = grid->GetCellValue( r,URGENT );
+        cell.ToDouble( &urgentValue );
+
+        cell = dialog->m_gridGlobal->GetCellValue( row,6 );
+        cell.ToDouble( &distanceTotal );
+        cell = dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::MOTORT );
+        cell.ToDouble( &motorTotal );
+        cell = dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::MOTOR1T );
+        cell.ToDouble( &motorTotal2 );
+        cell = dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::GENET );
+        cell.ToDouble( &generator );
+        cell = dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::WATERMT );
+        cell.ToDouble( &watermaker );
+        cell = dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::BANK1T );
+        cell.ToDouble( &bank1 );
+        cell = dialog->m_gridMotorSails->GetCellValue( row,LogbookHTML::BANK2T );
+        cell.ToDouble( &bank2 );
+
+        if ( g == m_choices[0] )
+        {
+            choice = 0;
+            col = LogbookHTML::DTOTAL;
+        }
+        else if ( g == m_choices[1] )
+        {
+            choice = 1;
+            col = LogbookHTML::MOTORT;
+        }
+        else if ( g == m_choices[2] )
+        {
+            choice = 2;
+            col = LogbookHTML::MOTOR1T;
+        }
+        else if ( g == m_choices[3] )
+        {
+            choice = 3;
+            col = LogbookHTML::GENET;
+        }
+        else if ( g == m_choices[4] )
+        {
+            choice = 4;
+            col = LogbookHTML::BANK1T;
+        }
+        else if ( g == m_choices[5] )
+        {
+            choice = 5;
+            col = LogbookHTML::BANK2T;
+        }
+        else if ( g == m_choices[6] )
+        {
+            choice = 6;
+            col = LogbookHTML::WATERMT;
+        }
+        else if ( g == m_choices[7] )
+        {
+            choice = 7;
+            col = LogbookHTML::STATUS;
+        }
+        else if ( g == m_choices[8] )
+            choice = 8;
+        else if ( g == m_choices[9] )
+            choice = 9;
+        else if ( g == m_choices[10] )
+            choice = 10;
+        else if ( g == m_choices[11] )
+            choice = 11;
+
+        if ( yesno == _( "Yes" ) ) // Active set to 'yes'
+        {
+            switch ( choice )
+            {
+            case 0: //Distance
+                if ( distanceTotal >= startValue+urgentValue )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                else if ( distanceTotal >= startValue+warnValue )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( yellow,row,col );
+                    break;
+                }
+                else
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridGlobal->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 1: // Engine #1
+                if ( motorTotal >= startValue+urgentValue )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                else if ( motorTotal >= startValue+warnValue )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( yellow,row,col );
+                    break;
+                }
+                else
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 2: // Engine #2
+                if ( motorTotal2 >= startValue+urgentValue )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                else if ( motorTotal2 >= startValue+warnValue )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( yellow,row,col );
+                    break;
+                }
+                else
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 3: // Generator
+                if ( generator >= startValue+urgentValue )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                else if ( generator >= startValue+warnValue )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( yellow,row,col );
+                    break;
+                }
+                else
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 4: // Bank #1
+                if ( bank1 <= urgentValue )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                else if ( bank1 <= warnValue )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( yellow,row,col );
+                    break;
+                }
+                else
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 5: // Bank #2
+                if ( bank2 <= urgentValue )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                else if ( bank2 <= warnValue )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( yellow,row,col );
+                    break;
+                }
+                else
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 6: // WaterMaker
+                if ( watermaker >= startValue+urgentValue )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                else if ( watermaker >= startValue+warnValue )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( yellow,row,col );
+                    break;
+                }
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 7: //Status
+                if ( grid->GetCellValue( r,URGENT ) == dialog->m_gridGlobal->GetCellValue( row,LogbookHTML::STATUS ) )
+                {
+                    border = 2;
+                    rowBack = red;
+                    dialog->m_gridMotorSails->SetCellBackgroundColour( red,row,col );
+                    break;
+                }
+                {
+                    rowBack = green;
+                    for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                        dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+                }
+                break;
+            case 8:
+            {
+                date = grid->GetCellValue( r,URGENT );
+                dialog->myParseDate( date, dturgent );
+                date = grid->GetCellValue( r,WARN );
+                dialog->myParseDate( date, dtwarn );
+                dtstart = wxDateTime::Now();
+
+                if ( dtstart >= dturgent )
+                {
+                    border = 2;
+                    rowBack = red;
+                    break;
+                }
+                else if ( dtstart >= dtwarn )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    break;
+                }
+                else
+                    rowBack = green;
+            }
+            break;
+            case 9:
+            {
+                long days;
+                date = dialog->m_gridMaintanence->GetCellValue( r,START );
+                dialog->myParseDate( date, dtstart );
+
+                grid->GetCellValue( r,WARN ).ToLong( &days );
+                spanw.SetDays( ( int )days );
+                dtwarn = dtstart;
+                dtwarn += spanw;
+                grid->GetCellValue( r,URGENT ).ToLong( &days );
+                spanu.SetDays( ( int )days );
+                dturgent = dtstart;
+                dturgent += spanu;
+                dtstart = wxDateTime::Now();
+
+                if ( dtstart >= dturgent )
+                {
+                    border = 2;
+                    rowBack = red;
+                    break;
+                }
+                else if ( dtstart >= dtwarn )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    break;
+                }
+                else
+                    rowBack = green;
+            }
+            break;
+            case 10:
+            {
+                long weeks;
+                date = dialog->m_gridMaintanence->GetCellValue( r,START );
+                dialog->myParseDate( date, dtstart );
+
+                grid->GetCellValue( r,WARN ).ToLong( &weeks );
+                spanw.SetWeeks( ( int )weeks );
+                dtwarn = dtstart;
+                dtwarn += spanw;
+                grid->GetCellValue( r,URGENT ).ToLong( &weeks );
+                spanu.SetWeeks( ( int )weeks );
+                dturgent = dtstart;
+                dturgent += spanu;
+                dtstart = wxDateTime::Now();
+
+                if ( dtstart >= dturgent )
+                {
+                    border = 2;
+                    rowBack = red;
+                    break;
+                }
+                else if ( dtstart >= dtwarn )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    break;
+                }
+                else
+                    rowBack = green;
+            }
+            break;
+            case 11:
+            {
+                long month;
+                date = dialog->m_gridMaintanence->GetCellValue( r,START );
+                dialog->myParseDate( date, dtstart );
+
+                grid->GetCellValue( r,WARN ).ToLong( &month );
+                spanw.SetMonths( ( int )month );
+                dtwarn = dtstart;
+                dtwarn += spanw;
+                grid->GetCellValue( r,URGENT ).ToLong( &month );
+                spanu.SetMonths( ( int )month );
+                dturgent = dtstart;
+                dturgent += spanu;
+                dtstart = wxDateTime::Now();
+
+                if ( dtstart >= dturgent )
+                {
+                    border = 2;
+                    rowBack = red;
+                    break;
+                }
+                else if ( dtstart >= dtwarn )
+                {
+                    if ( border != 2 )
+                        border = 1;
+                    rowBack = yellow;
+                    break;
+                }
+                else
+                    rowBack = green;
+            }
+            break;
+            }
+            setRowBackground( r,rowBack );
+        }
+        else
+        {
+            setRowBackground( r,white );
+            for ( int i = 0; i < dialog->m_gridMotorSails->GetNumberRows(); i++ )
+                dialog->m_gridMotorSails->SetCellBackgroundColour( white,i,col );
+        }
+        setBuyPartsPriority( grid,r,PRIORITY,TEXT );
+    }
+
+    checkBuyParts();
+
+    switch ( border )
+    {
+    case 0:
+        dialog->SetBackgroundColour( dialog->defaultBackground );
+        break;
+    case 1:
+        dialog->SetBackgroundColour( yellow );
+        break;
+    case 2:
+        dialog->SetBackgroundColour( red );
+        break;
+    }
+    dialog->Refresh();
 }
 
 void Maintenance::checkRepairs()
 {
-	for(int row = 0; row < repairs->GetNumberRows(); row++)
-	{
-		long i;
-		repairs->GetCellValue(row,RPRIORITY).ToLong(&i);
-		switch(i)
-		{
-		case 0:
-			setRowBackgroundRepairs(row,white);
-			break;
-		case 1:
-			setRowBackgroundRepairs(row,red);
-			break;
-		case 2:
-			setRowBackgroundRepairs(row,redlight);
-			break;
-		case 3:
-			setRowBackgroundRepairs(row,yellow);
-			break;
-		case 4:
-			setRowBackgroundRepairs(row,yellowlight);
-			break;
-		case 5:
-			setRowBackgroundRepairs(row,green);
-			break;
-		}
-		setBuyPartsPriority(repairs,row,RPRIORITY,RTEXT);
-	}
-	repairs->Refresh();
-	checkBuyParts();
+    for ( int row = 0; row < repairs->GetNumberRows(); row++ )
+    {
+        long i;
+        repairs->GetCellValue( row,RPRIORITY ).ToLong( &i );
+        switch ( i )
+        {
+        case 0:
+            setRowBackgroundRepairs( row,white );
+            break;
+        case 1:
+            setRowBackgroundRepairs( row,red );
+            break;
+        case 2:
+            setRowBackgroundRepairs( row,redlight );
+            break;
+        case 3:
+            setRowBackgroundRepairs( row,yellow );
+            break;
+        case 4:
+            setRowBackgroundRepairs( row,yellowlight );
+            break;
+        case 5:
+            setRowBackgroundRepairs( row,green );
+            break;
+        }
+        setBuyPartsPriority( repairs,row,RPRIORITY,RTEXT );
+    }
+    repairs->Refresh();
+    checkBuyParts();
 }
 
 void Maintenance::checkBuyParts()
 {
-	for(int row = 0; row < buyparts->GetNumberRows(); row++)
-	{
-		long i;
-		buyparts->GetCellValue(row,PPRIORITY).ToLong(&i);
-		switch(i)
-		{
-		case 0:
-			setRowBackgroundBuyParts(row,white);
-			break;
-		case 1:
-			setRowBackgroundBuyParts(row,red);
-			break;
-		case 2:
-			setRowBackgroundBuyParts(row,redlight);
-			break;
-		case 3:
-			setRowBackgroundBuyParts(row,yellow);
-			break;
-		case 4:
-			setRowBackgroundBuyParts(row,yellowlight);
-			break;
-		case 5:
-			setRowBackgroundBuyParts(row,green);
-			break;
-		}
-	}
-	buyparts->Refresh();
-}
-
-void Maintenance::setBuyPartsPriority(wxGrid *grid ,int row, int p, int t)
-{
-	wxString priority = grid->GetCellValue(row,p);
-	for(int i = 0; i < buyparts->GetNumberRows(); i++)
-	{
-		if(buyparts->GetCellValue(i,TITLE).Trim() == grid->GetCellValue(row,t).Trim())
-			buyparts->SetCellValue(i,PRIORITY,grid->GetCellValue(row,p));
-	}
+    for ( int row = 0; row < buyparts->GetNumberRows(); row++ )
+    {
+        long i;
+        buyparts->GetCellValue( row,PPRIORITY ).ToLong( &i );
+        switch ( i )
+        {
+        case 0:
+            setRowBackgroundBuyParts( row,white );
+            break;
+        case 1:
+            setRowBackgroundBuyParts( row,red );
+            break;
+        case 2:
+            setRowBackgroundBuyParts( row,redlight );
+            break;
+        case 3:
+            setRowBackgroundBuyParts( row,yellow );
+            break;
+        case 4:
+            setRowBackgroundBuyParts( row,yellowlight );
+            break;
+        case 5:
+            setRowBackgroundBuyParts( row,green );
+            break;
+        }
+    }
+    buyparts->Refresh();
+}
+
+void Maintenance::setBuyPartsPriority( wxGrid *grid ,int row, int p, int t )
+{
+    wxString priority = grid->GetCellValue( row,p );
+    for ( int i = 0; i < buyparts->GetNumberRows(); i++ )
+    {
+        if ( buyparts->GetCellValue( i,TITLE ).Trim() == grid->GetCellValue( row,t ).Trim() )
+            buyparts->SetCellValue( i,PRIORITY,grid->GetCellValue( row,p ) );
+    }
 }
 
-void Maintenance::setRowDone(int row)
+void Maintenance::setRowDone( int row )
 {
 //	int sailscol = dialog->logbook->sailsCol;
-	wxString g = grid->GetCellValue(selectedRow,IF);
-	int choice = -1;
+    wxString g = grid->GetCellValue( selectedRow,IF );
+    int choice = -1;
 
-	if(g == m_choices[0])
-			choice = 0;
-	else if (g == m_choices[1])
-			choice = 1;
-	else if (g == m_choices[2])
-			choice = 2;
-	else if (g == m_choices[3])
-			choice = 3;
-	else if (g == m_choices[4])
-			choice = 4;
-	else if (g == m_choices[5])
-			choice = 5;
-	else if (g == m_choices[6])
-			choice = 6;
-	else if (g == m_choices[7])
-			choice = 7;
-	else if (g == m_choices[8])
-			choice = 8;
-	else if (g == m_choices[9])
-			choice = 9;
-	else if (g == m_choices[10])
-			choice = 10;
-	else if (g == m_choices[11])
-			choice = 11;
-
-	switch(choice)
-	{
-	case 0:
-		grid->SetCellValue(selectedRow,START,
-		  			   dialog->m_gridGlobal->GetCellValue(
-					   dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::DTOTAL));
-		break;
-	case 1:
-		grid->SetCellValue(selectedRow,START,
-			dialog->m_gridMotorSails->GetCellValue(
-			dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::MOTORT));
-		break;
-	case 2:
-		grid->SetCellValue(selectedRow,START,
-			dialog->m_gridMotorSails->GetCellValue(
-			dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::MOTOR1T));
-		break;
-	case 3:
-		grid->SetCellValue(selectedRow,START,
-			dialog->m_gridMotorSails->GetCellValue(
-			dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::GENET));
-		break;
-	case 4:
-		grid->SetCellValue(selectedRow,START,
-			dialog->m_gridMotorSails->GetCellValue(
-			dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::BANK1T));
-		break;
-	case 5:
-		grid->SetCellValue(selectedRow,START,
-			dialog->m_gridMotorSails->GetCellValue(
-			dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::BANK2T));
-		break;
-	case 6:
-		grid->SetCellValue(selectedRow,START,
-			dialog->m_gridMotorSails->GetCellValue(
-			dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::WATERMT));
-		break;
-	case 7:
-		grid->SetCellValue(selectedRow,ACTIVE,_("No"));
-		checkService(dialog->m_gridGlobal->GetNumberRows()-1);
-		break;
-	case 8:
-		grid->SetCellValue(selectedRow,ACTIVE,_("No"));
-		grid->SetCellValue(selectedRow,WARN,wxDateTime::Now().Format(opt->sdateformat));
-		grid->SetCellValue(selectedRow,URGENT,wxDateTime::Now().Format(opt->sdateformat));
-	case 9:
-	case 10:
-	case 11:
-		grid->SetCellValue(selectedRow,START,wxDateTime::Now().Format(opt->sdateformat));
-		break;
-	}
-
-	if(grid->GetCellValue(row,ACTIVE) == m_YesNo[0])
-		setRowBackground(row,green);
-	else
-		setRowBackground(selectedRow,white);
-	grid->Refresh();
-}
-
-void Maintenance::setRepairDone(int row)
-{
-	repairs->SetCellValue(row,RPRIORITY,_T("0"));
-	setRowBackgroundRepairs(row, white);
-	checkBuyParts();
-
-	modified = true;
-}
-
-void Maintenance::setRowBackgroundRepairs(int row, wxColour &c)
-{
-	for(int i = 0; i < repairs->GetNumberCols(); i++)
-		repairs->SetCellBackgroundColour(row,i,c);
+    if ( g == m_choices[0] )
+        choice = 0;
+    else if ( g == m_choices[1] )
+        choice = 1;
+    else if ( g == m_choices[2] )
+        choice = 2;
+    else if ( g == m_choices[3] )
+        choice = 3;
+    else if ( g == m_choices[4] )
+        choice = 4;
+    else if ( g == m_choices[5] )
+        choice = 5;
+    else if ( g == m_choices[6] )
+        choice = 6;
+    else if ( g == m_choices[7] )
+        choice = 7;
+    else if ( g == m_choices[8] )
+        choice = 8;
+    else if ( g == m_choices[9] )
+        choice = 9;
+    else if ( g == m_choices[10] )
+        choice = 10;
+    else if ( g == m_choices[11] )
+        choice = 11;
+
+    switch ( choice )
+    {
+    case 0:
+        grid->SetCellValue( selectedRow,START,
+                            dialog->m_gridGlobal->GetCellValue(
+                                dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::DTOTAL ) );
+        break;
+    case 1:
+        grid->SetCellValue( selectedRow,START,
+                            dialog->m_gridMotorSails->GetCellValue(
+                                dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::MOTORT ) );
+        break;
+    case 2:
+        grid->SetCellValue( selectedRow,START,
+                            dialog->m_gridMotorSails->GetCellValue(
+                                dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::MOTOR1T ) );
+        break;
+    case 3:
+        grid->SetCellValue( selectedRow,START,
+                            dialog->m_gridMotorSails->GetCellValue(
+                                dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::GENET ) );
+        break;
+    case 4:
+        grid->SetCellValue( selectedRow,START,
+                            dialog->m_gridMotorSails->GetCellValue(
+                                dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::BANK1T ) );
+        break;
+    case 5:
+        grid->SetCellValue( selectedRow,START,
+                            dialog->m_gridMotorSails->GetCellValue(
+                                dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::BANK2T ) );
+        break;
+    case 6:
+        grid->SetCellValue( selectedRow,START,
+                            dialog->m_gridMotorSails->GetCellValue(
+                                dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::WATERMT ) );
+        break;
+    case 7:
+        grid->SetCellValue( selectedRow,ACTIVE,_( "No" ) );
+        checkService( dialog->m_gridGlobal->GetNumberRows()-1 );
+        break;
+    case 8:
+        grid->SetCellValue( selectedRow,ACTIVE,_( "No" ) );
+        grid->SetCellValue( selectedRow,WARN,wxDateTime::Now().Format( opt->sdateformat ) );
+        grid->SetCellValue( selectedRow,URGENT,wxDateTime::Now().Format( opt->sdateformat ) );
+    case 9:
+    case 10:
+    case 11:
+        grid->SetCellValue( selectedRow,START,wxDateTime::Now().Format( opt->sdateformat ) );
+        break;
+    }
+
+    if ( grid->GetCellValue( row,ACTIVE ) == m_YesNo[0] )
+        setRowBackground( row,green );
+    else
+        setRowBackground( selectedRow,white );
+    grid->Refresh();
+}
+
+void Maintenance::setRepairDone( int row )
+{
+    repairs->SetCellValue( row,RPRIORITY,_T( "0" ) );
+    setRowBackgroundRepairs( row, white );
+    checkBuyParts();
+
+    modified = true;
+}
+
+void Maintenance::setRowBackgroundRepairs( int row, wxColour &c )
+{
+    for ( int i = 0; i < repairs->GetNumberCols(); i++ )
+        repairs->SetCellBackgroundColour( row,i,c );
 }
 
-void Maintenance::setRowBackgroundBuyParts(int row, wxColour &c)
+void Maintenance::setRowBackgroundBuyParts( int row, wxColour &c )
 {
-	for(int i = 0; i < buyparts->GetNumberCols(); i++)
-		buyparts->SetCellBackgroundColour(row,i,c);
+    for ( int i = 0; i < buyparts->GetNumberCols(); i++ )
+        buyparts->SetCellBackgroundColour( row,i,c );
 }
 
-void Maintenance::cellCollChanged(int col, int row)
+void Maintenance::cellCollChanged( int col, int row )
 {
 //	int sailscol = dialog->logbook->sailsCol;
-	
-	if(dialog->m_gridGlobal->GetNumberRows() == 0) return;
 
-	if(col == IF)
-	{
-		wxString g = grid->GetCellValue(selectedRow,IF);
-
-		if(g == m_choices[0]) // Distance
-		{
-					grid->SetCellValue(selectedRow,START,
-							dialog->m_gridGlobal->GetCellValue(
-							dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::DTOTAL));
-						grid->SetCellValue(selectedRow,WARN,_T("1"));
-						grid->SetCellValue(selectedRow,URGENT,_T("2"));
-		}
-		else if (g == m_choices[1]) //Engine #1
-		{
-						grid->SetCellValue(selectedRow,START,
-							dialog->m_gridMotorSails->GetCellValue(
-							dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::MOTORT));
-						grid->SetCellValue(selectedRow,WARN,_T("1"));
-						grid->SetCellValue(selectedRow,URGENT,_T("2"));
-		}
-		else if (g == m_choices[2]) //Engine #2
-		{
-						grid->SetCellValue(selectedRow,START,
-							dialog->m_gridMotorSails->GetCellValue(
-							dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::MOTOR1T));
-						grid->SetCellValue(selectedRow,WARN,_T("1"));
-						grid->SetCellValue(selectedRow,URGENT,_T("2"));
-		}
-		else if (g == m_choices[3]) //Generator
-		{
-						grid->SetCellValue(selectedRow,START,
-							dialog->m_gridMotorSails->GetCellValue(
-							dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::GENET));
-						grid->SetCellValue(selectedRow,WARN,_T("1"));
-						grid->SetCellValue(selectedRow,URGENT,_T("2"));
-		}
-		else if (g == m_choices[4]) //Bank #1
-		{
-						grid->SetCellValue(selectedRow,START,wxString::Format(_T("%s %s"),opt->bank1.c_str(),opt->ampereh.c_str()));
-						grid->SetCellValue(selectedRow,WARN,wxString::Format(_T("%i"),(int)(wxAtoi(opt->bank1)/100*25)));
-						grid->SetCellValue(selectedRow,URGENT,wxString::Format(_T("%i"),(int)(wxAtoi(opt->bank1)/100*15)));
-		}
-		else if (g == m_choices[5]) //Bank #2
-		{
-						grid->SetCellValue(selectedRow,START,wxString::Format(_T("%s %s"),opt->bank2.c_str(),opt->ampereh.c_str()));
-						grid->SetCellValue(selectedRow,WARN,wxString::Format(_T("%i"),(int)(wxAtoi(opt->bank2)/100*25)));
-						grid->SetCellValue(selectedRow,URGENT,wxString::Format(_T("%i"),(int)(wxAtoi(opt->bank2)/100*15)));
-		}
-		else if (g == m_choices[6]) //Watermaker
-		{
-						grid->SetCellValue(selectedRow,START,
-							dialog->m_gridMotorSails->GetCellValue(
-							dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::WATERMT));
-						grid->SetCellValue(selectedRow,WARN,_T("1"));
-						grid->SetCellValue(selectedRow,URGENT,_T("2"));
-		}
-		else if (g == m_choices[7]) //Status
-		{
-						grid->BeginBatch();
-						grid->SetCellValue(selectedRow,WARN,_T(""));
-						grid->EndBatch();
-		}
-		else if (g == m_choices[8])
-		{
-						grid->SetCellValue(selectedRow,START,_T(""));
-						grid->SetCellValue(selectedRow,WARN,  (wxDateTime::Now().Add(wxDateSpan(0,0,0,1))).Format(opt->sdateformat));
-						grid->SetCellValue(selectedRow,URGENT,(wxDateTime::Now().Add(wxDateSpan(0,0,0,1))).Format(opt->sdateformat));
-		}
-		else if (g == m_choices[9] || g == m_choices[10] || g == m_choices[11])
-		{
-						grid->SetCellValue(selectedRow,START,wxDateTime::Now().Format(opt->sdateformat));
-						grid->SetCellValue(selectedRow,WARN,_T("1"));
-						grid->SetCellValue(selectedRow,URGENT,_T("2"));
-		}
-		col = WARN;
-	}
-
-	if(col == WARN || col == URGENT)
-	{
-		wxString ss;
-
-		wxString g = grid->GetCellValue(row,IF);
-
-		if(g == m_choices[0] || g == m_choices[1] || // Distance || Engine #1
-		   g == m_choices[2] || g == m_choices[3] || // Engine #2 || Generator
-		   g == m_choices[4] || g == m_choices[5] || // Bank 1 || Bank2
-		   g == m_choices[6] )                       // Watermaker
-		{
-			wxString s = grid->GetCellValue(row,START);
-			s = s.substr(s.find_last_of(' '));
-			wxDouble d; 
-			grid->GetCellValue(row,col).ToDouble(&d);
-			ss = wxString::Format(_T("%5.0f %s"),d,s.c_str());
-		}
-		else if(g == m_choices[9] || g == m_choices[10] || g == m_choices[11])
-		{
-			wxString s;
-			if(g == m_choices[4])
-				s = dialog->logbookPlugIn->opt->days;
-			else if(g == m_choices[5])
-				s = dialog->logbookPlugIn->opt->weeks;
-			else if(g == m_choices[6])
-				s = dialog->logbookPlugIn->opt->month;
-			wxDouble d; 
-			grid->GetCellValue(row,col).ToDouble(&d);
-			ss = wxString::Format(_T("%5.0f %s"),d,s.c_str());
-		}
-		else 
-		{
-			ss = grid->GetCellValue(row,col).Upper();
-		}
-
-		if(col == WARN)
-		{
-			grid->SetCellValue(row,WARN,ss);
-			grid->SetCellValue(row,URGENT,ss);
-		}
-		else
-			grid->SetCellValue(row,URGENT,ss);
-	}
-
-	if(col == ACTIVE)
-	{
-		if(grid->GetCellValue(row,ACTIVE) == m_YesNo[0] && grid->GetCellValue(row,PRIORITY) == _T("0"))
-			grid->SetCellValue(row,PRIORITY,_T("5"));
-		else if(grid->GetCellValue(row,ACTIVE) == m_YesNo[1])
-			grid->SetCellValue(row,PRIORITY,_T("0"));
+    if ( dialog->m_gridGlobal->GetNumberRows() == 0 ) return;
+
+    if ( col == IF )
+    {
+        wxString g = grid->GetCellValue( selectedRow,IF );
+
+        if ( g == m_choices[0] ) // Distance
+        {
+            grid->SetCellValue( selectedRow,START,
+                                dialog->m_gridGlobal->GetCellValue(
+                                    dialog->m_gridGlobal->GetNumberRows()-1,LogbookHTML::DTOTAL ) );
+            grid->SetCellValue( selectedRow,WARN,_T( "1" ) );
+            grid->SetCellValue( selectedRow,URGENT,_T( "2" ) );
+        }
+        else if ( g == m_choices[1] ) //Engine #1
+        {
+            grid->SetCellValue( selectedRow,START,
+                                dialog->m_gridMotorSails->GetCellValue(
+                                    dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::MOTORT ) );
+            grid->SetCellValue( selectedRow,WARN,_T( "1" ) );
+            grid->SetCellValue( selectedRow,URGENT,_T( "2" ) );
+        }
+        else if ( g == m_choices[2] ) //Engine #2
+        {
+            grid->SetCellValue( selectedRow,START,
+                                dialog->m_gridMotorSails->GetCellValue(
+                                    dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::MOTOR1T ) );
+            grid->SetCellValue( selectedRow,WARN,_T( "1" ) );
+            grid->SetCellValue( selectedRow,URGENT,_T( "2" ) );
+        }
+        else if ( g == m_choices[3] ) //Generator
+        {
+            grid->SetCellValue( selectedRow,START,
+                                dialog->m_gridMotorSails->GetCellValue(
+                                    dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::GENET ) );
+            grid->SetCellValue( selectedRow,WARN,_T( "1" ) );
+            grid->SetCellValue( selectedRow,URGENT,_T( "2" ) );
+        }
+        else if ( g == m_choices[4] ) //Bank #1
+        {
+            grid->SetCellValue( selectedRow,START,wxString::Format( _T( "%s %s" ),opt->bank1.c_str(),opt->ampereh.c_str() ) );
+            grid->SetCellValue( selectedRow,WARN,wxString::Format( _T( "%i" ),( int )( wxAtoi( opt->bank1 )/100*25 ) ) );
+            grid->SetCellValue( selectedRow,URGENT,wxString::Format( _T( "%i" ),( int )( wxAtoi( opt->bank1 )/100*15 ) ) );
+        }
+        else if ( g == m_choices[5] ) //Bank #2
+        {
+            grid->SetCellValue( selectedRow,START,wxString::Format( _T( "%s %s" ),opt->bank2.c_str(),opt->ampereh.c_str() ) );
+            grid->SetCellValue( selectedRow,WARN,wxString::Format( _T( "%i" ),( int )( wxAtoi( opt->bank2 )/100*25 ) ) );
+            grid->SetCellValue( selectedRow,URGENT,wxString::Format( _T( "%i" ),( int )( wxAtoi( opt->bank2 )/100*15 ) ) );
+        }
+        else if ( g == m_choices[6] ) //Watermaker
+        {
+            grid->SetCellValue( selectedRow,START,
+                                dialog->m_gridMotorSails->GetCellValue(
+                                    dialog->m_gridMotorSails->GetNumberRows()-1,LogbookHTML::WATERMT ) );
+            grid->SetCellValue( selectedRow,WARN,_T( "1" ) );
+            grid->SetCellValue( selectedRow,URGENT,_T( "2" ) );
+        }
+        else if ( g == m_choices[7] ) //Status
+        {
+            grid->BeginBatch();
+            grid->SetCellValue( selectedRow,WARN,_T( "" ) );
+            grid->EndBatch();
+        }
+        else if ( g == m_choices[8] )
+        {
+            grid->SetCellValue( selectedRow,START,_T( "" ) );
+            grid->SetCellValue( selectedRow,WARN,  ( wxDateTime::Now().Add( wxDateSpan( 0,0,0,1 ) ) ).Format( opt->sdateformat ) );
+            grid->SetCellValue( selectedRow,URGENT,( wxDateTime::Now().Add( wxDateSpan( 0,0,0,1 ) ) ).Format( opt->sdateformat ) );
+        }
+        else if ( g == m_choices[9] || g == m_choices[10] || g == m_choices[11] )
+        {
+            grid->SetCellValue( selectedRow,START,wxDateTime::Now().Format( opt->sdateformat ) );
+            grid->SetCellValue( selectedRow,WARN,_T( "1" ) );
+            grid->SetCellValue( selectedRow,URGENT,_T( "2" ) );
+        }
+        col = WARN;
+    }
+
+    if ( col == WARN || col == URGENT )
+    {
+        wxString ss;
+
+        wxString g = grid->GetCellValue( row,IF );
+
+        if ( g == m_choices[0] || g == m_choices[1] || // Distance || Engine #1
+                g == m_choices[2] || g == m_choices[3] || // Engine #2 || Generator
+                g == m_choices[4] || g == m_choices[5] || // Bank 1 || Bank2
+                g == m_choices[6] )                       // Watermaker
+        {
+            wxString s = grid->GetCellValue( row,START );
+            s = s.substr( s.find_last_of( ' ' ) );
+            wxDouble d;
+            grid->GetCellValue( row,col ).ToDouble( &d );
+            ss = wxString::Format( _T( "%5.0f %s" ),d,s.c_str() );
+        }
+        else if ( g == m_choices[9] || g == m_choices[10] || g == m_choices[11] )
+        {
+            wxString s;
+            if ( g == m_choices[4] )
+                s = dialog->logbookPlugIn->opt->days;
+            else if ( g == m_choices[5] )
+                s = dialog->logbookPlugIn->opt->weeks;
+            else if ( g == m_choices[6] )
+                s = dialog->logbookPlugIn->opt->month;
+            wxDouble d;
+            grid->GetCellValue( row,col ).ToDouble( &d );
+            ss = wxString::Format( _T( "%5.0f %s" ),d,s.c_str() );
+        }
+        else
+        {
+            ss = grid->GetCellValue( row,col ).Upper();
+        }
+
+        if ( col == WARN )
+        {
+            grid->SetCellValue( row,WARN,ss );
+            grid->SetCellValue( row,URGENT,ss );
+        }
+        else
+            grid->SetCellValue( row,URGENT,ss );
+    }
+
+    if ( col == ACTIVE )
+    {
+        if ( grid->GetCellValue( row,ACTIVE ) == m_YesNo[0] && grid->GetCellValue( row,PRIORITY ) == _T( "0" ) )
+            grid->SetCellValue( row,PRIORITY,_T( "5" ) );
+        else if ( grid->GetCellValue( row,ACTIVE ) == m_YesNo[1] )
+            grid->SetCellValue( row,PRIORITY,_T( "0" ) );
 
-		setBuyPartsPriority(grid ,row, PRIORITY, TEXT);
-	}
+        setBuyPartsPriority( grid ,row, PRIORITY, TEXT );
+    }
 }
 
-void Maintenance::cellSelected(int col, int row)
+void Maintenance::cellSelected( int col, int row )
 {
-	selectedCol = col;
-	selectedRow = row;
+    selectedCol = col;
+    selectedRow = row;
 }
 
 void Maintenance::update()
 {
-	if(!modified) return;
+    if ( !modified ) return;
 
-	wxString s = _T("#1.2#\n"), temp;
+    wxString s = _T( "#1.2#\n" ), temp;
 
-	wxString newLocn = data_locn;
-	newLocn.Replace(_T("txt"),_T("Bak"));
-	wxRename(data_locn,newLocn);
-
-	wxFileOutputStream output( data_locn );
-	wxTextOutputStream* stream = new wxTextOutputStream (output,wxEOL_NATIVE,wxConvUTF8);
-
-	stream->WriteString(s);
-	s = wxEmptyString;
-	int count = grid->GetNumberRows();
-	for(int r = 0; r < count; r++)
-	{
-		int sel = -1;
-		for(int c = 0; c < grid->GetNumberCols(); c++)
-		{
-			if(c < 2 || c == 6)
-				temp = grid->GetCellValue(r,c);
-			else if(c == 2)
-			{
-				temp = grid->GetCellValue(r,c);
-				sel = getSelection(grid->GetCellValue(r,c));
-			}
-			else if(c == 3)
-			{
-				if(sel == 8)
-				{
-					wxDateTime dt;
-					temp = grid->GetCellValue(r,c);
-					LogbookDialog::myParseDate(temp,dt);
-					temp = wxString::Format(_T("%i/%i/%i"),dt.GetMonth(), dt.GetDay(), dt.GetYear());
-				}
-				else
-					temp = grid->GetCellValue(r,c);
-			}
-			else if(c == 4)
-			{
-				if(sel == 8)
-				{
-					wxDateTime dt;
-					temp = grid->GetCellValue(r,c);
-					LogbookDialog::myParseDate(temp,dt);
-					temp = wxString::Format(_T("%i/%i/%i"),dt.GetMonth(), dt.GetDay(), dt.GetYear());
-				}
-				else
-					temp = grid->GetCellValue(r,c);
-			}
-			else if(c == 5)
-			{
-				if(sel > 8)
-				{
-					wxDateTime dt;
-					temp = grid->GetCellValue(r,c);
-					LogbookDialog::myParseDate(temp,dt);
-					temp = wxString::Format(_T("%i/%i/%i"),dt.GetMonth(), dt.GetDay(), dt.GetYear());
-				}
-				else
-					temp = grid->GetCellValue(r,c);
-			}
-			s += dialog->replaceDangerChar(temp);
-			s += _T(" \t");
-		}
-		s.RemoveLast();
-		stream->WriteString(s+_T("\n"));
-		s = _T("");
-	}
-	output.Close();
+    wxString newLocn = data_locn;
+    newLocn.Replace( _T( "txt" ),_T( "Bak" ) );
+    wxRename( data_locn,newLocn );
+
+    wxFileOutputStream output( data_locn );
+    wxTextOutputStream* stream = new wxTextOutputStream ( output,wxEOL_NATIVE,wxConvUTF8 );
+
+    stream->WriteString( s );
+    s = wxEmptyString;
+    int count = grid->GetNumberRows();
+    for ( int r = 0; r < count; r++ )
+    {
+        int sel = -1;
+        for ( int c = 0; c < grid->GetNumberCols(); c++ )
+        {
+            if ( c < 2 || c == 6 )
+                temp = grid->GetCellValue( r,c );
+            else if ( c == 2 )
+            {
+                temp = grid->GetCellValue( r,c );
+                sel = getSelection( grid->GetCellValue( r,c ) );
+            }
+            else if ( c == 3 )
+            {
+                if ( sel == 8 )
+                {
+                    wxDateTime dt;
+                    temp = grid->GetCellValue( r,c );
+                    LogbookDialog::myParseDate( temp,dt );
+                    temp = wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(), dt.GetDay(), dt.GetYear() );
+                }
+                else
+                    temp = grid->GetCellValue( r,c );
+            }
+            else if ( c == 4 )
+            {
+                if ( sel == 8 )
+                {
+                    wxDateTime dt;
+                    temp = grid->GetCellValue( r,c );
+                    LogbookDialog::myParseDate( temp,dt );
+                    temp = wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(), dt.GetDay(), dt.GetYear() );
+                }
+                else
+                    temp = grid->GetCellValue( r,c );
+            }
+            else if ( c == 5 )
+            {
+                if ( sel > 8 )
+                {
+                    wxDateTime dt;
+                    temp = grid->GetCellValue( r,c );
+                    LogbookDialog::myParseDate( temp,dt );
+                    temp = wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(), dt.GetDay(), dt.GetYear() );
+                }
+                else
+                    temp = grid->GetCellValue( r,c );
+            }
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+        s.RemoveLast();
+        stream->WriteString( s+_T( "\n" ) );
+        s = _T( "" );
+    }
+    output.Close();
 //	modified = false;
 }
 
 void Maintenance::updateRepairs()
 {
-	if(!modifiedR) return;
-	wxString s = _T(""), temp;
+    if ( !modifiedR ) return;
+    wxString s = _T( "" ), temp;
 
-	wxString newLocn = data_locnRepairs;
-	newLocn.Replace(_T("txt"),_T("Bak"));
-	wxRename(data_locnRepairs,newLocn);
-
-	wxFileOutputStream output( data_locnRepairs );
-	wxTextOutputStream* stream = new wxTextOutputStream (output,wxEOL_NATIVE,wxConvUTF8);
-
-	int count = dialog->m_gridMaintanenceRepairs->GetNumberRows();
-	for(int r = 0; r < count; r++)
-	{
-		for(int c = 0; c < dialog->m_gridMaintanenceRepairs->GetNumberCols(); c++)
-			{
-				temp = dialog->m_gridMaintanenceRepairs->GetCellValue(r,c);
-				s += dialog->replaceDangerChar(temp);
-				s += _T(" \t");
-			}
-		s.RemoveLast();
-		stream->WriteString(s+_T("\n"));
-		s = _T("");
-	}
-	output.Close();
+    wxString newLocn = data_locnRepairs;
+    newLocn.Replace( _T( "txt" ),_T( "Bak" ) );
+    wxRename( data_locnRepairs,newLocn );
+
+    wxFileOutputStream output( data_locnRepairs );
+    wxTextOutputStream* stream = new wxTextOutputStream ( output,wxEOL_NATIVE,wxConvUTF8 );
+
+    int count = dialog->m_gridMaintanenceRepairs->GetNumberRows();
+    for ( int r = 0; r < count; r++ )
+    {
+        for ( int c = 0; c < dialog->m_gridMaintanenceRepairs->GetNumberCols(); c++ )
+        {
+            temp = dialog->m_gridMaintanenceRepairs->GetCellValue( r,c );
+            s += dialog->replaceDangerChar( temp );
+            s += _T( " \t" );
+        }
+        s.RemoveLast();
+        stream->WriteString( s+_T( "\n" ) );
+        s = _T( "" );
+    }
+    output.Close();
 //	modified = false;
 }
 
 void Maintenance::updateBuyParts()
 {
-	if(!modifiedB) return;
-	wxString s = _T(""), temp;
+    if ( !modifiedB ) return;
+    wxString s = _T( "" ), temp;
 
-	wxString newLocn = data_locnBuyParts;
-	newLocn.Replace(_T("txt"),_T("Bak"));
-	wxRename(data_locnBuyParts,newLocn);
-
-	wxFileOutputStream output( data_locnBuyParts );
-	wxTextOutputStream* stream = new wxTextOutputStream (output,wxEOL_NATIVE,wxConvUTF8);
-
-	int count = dialog->m_gridMaintenanceBuyParts->GetNumberRows();
-	for(int r = 0; r < count; r++)
-	{
-		for(int c = 0; c < dialog->m_gridMaintenanceBuyParts->GetNumberCols(); c++)
-			{
-				temp = dialog->m_gridMaintenanceBuyParts->GetCellValue(r,c);
-				s += dialog->replaceDangerChar(temp);
-				if(c == DATE && (!temp.IsEmpty() && temp.GetChar(0) != ' '))
-				{
-					wxDateTime dt;
-					dialog->myParseDate(temp.RemoveLast(),dt);
-					s.Replace(temp,wxString::Format(_T("%i/%i/%i"),dt.GetMonth(), dt.GetDay(), dt.GetYear()));
-				}
-
-				s += _T(" \t");
-			}
-		s.RemoveLast();
-		stream->WriteString(s+_T("\n"));
-		s = _T("");
-	}
-	output.Close();
-	modified = false;
-}
-
-void Maintenance::viewODT(int tab,wxString path,wxString layout,int mode)
-{
-	wxString locn, fn;
-
-	if(tab == dialog->SERVICE)
-	  {
-	    locn = layout_locnService;
-	    fn = data_locn;
-        if(opt->filterLayout[LogbookDialog::GSERVICE])
-            layout.Prepend(opt->layoutPrefix[LogbookDialog::GSERVICE]);
-	  }
-	else if(tab == dialog->REPAIRS)
-	{
-	    locn = layout_locnRepairs;
-	    fn = data_locnRepairs;
-        if(opt->filterLayout[LogbookDialog::GREPAIRS])
-            layout.Prepend(opt->layoutPrefix[LogbookDialog::GREPAIRS]);
-	}
-	else if(tab == dialog->BUYPARTS)
-	{
-	    locn = this->layout_locnBuyParts;
-	    fn = data_locnBuyParts;
-        if(opt->filterLayout[LogbookDialog::GBUYPARTS])
-            layout.Prepend(opt->layoutPrefix[LogbookDialog::GBUYPARTS]);
-	}
-
-	toODT(tab,locn, layout, mode);
-
-	if(layout != _T(""))
-	{
-	    fn.Replace(_T("txt"),_T("odt"));
-		dialog->startApplication(fn,_T(".odt"));
-	}
-}
-
-void Maintenance::viewHTML(int tab,wxString path,wxString layout,int mode)
-{
-	wxString locn, fn;
-
-	if(tab == dialog->SERVICE)
-	  {
-	    locn = layout_locnService;
-	    fn = data_locn;
-          if(opt->filterLayout[LogbookDialog::GSERVICE])
-              layout.Prepend(opt->layoutPrefix[LogbookDialog::GSERVICE]);
-	  }
-	else if(tab == dialog->REPAIRS)
-	{
-	    locn = layout_locnRepairs;
-	    fn = data_locnRepairs;
-        if(opt->filterLayout[LogbookDialog::GREPAIRS])
-            layout.Prepend(opt->layoutPrefix[LogbookDialog::GREPAIRS]);
-	}
-	else if(tab == dialog->BUYPARTS)
-	{
-	    locn = this->layout_locnBuyParts;
-	    fn = data_locnBuyParts;
-        if(opt->filterLayout[LogbookDialog::GBUYPARTS])
-            layout.Prepend(opt->layoutPrefix[LogbookDialog::GBUYPARTS]);
-	}
-
-	toHTML(tab,locn, layout, mode);
-
-	if(layout != _T(""))
-	{
-	    fn.Replace(_T("txt"),_T("html"));
-		dialog->startBrowser(fn);
-	}
-}
-
-wxString Maintenance::toHTML(int tab,wxString path,wxString layout,int mode)
-{
-	wxString top;
-	wxString header;
-	wxString middle;
-	wxString bottom;
-
-	wxString layout_loc;
-	wxGrid * grid = NULL;
-
-	wxString savePath = path;
-
-	if(tab == dialog->SERVICE)
-	{
-		path = data_locn;
-		layout_loc = layout_locnService;
-		grid = this->grid;
-	}
-	else if(tab == dialog->REPAIRS)
-	{
-
-		path = data_locnRepairs;
-		layout_loc = layout_locnRepairs;
-		grid = repairs;
-	}
-	else if(tab == dialog->BUYPARTS)
-	{
-		path = this->data_locnBuyParts;
-		layout_loc = layout_locnBuyParts;
-		grid = buyparts;
-	}
-
-	wxString tempPath = path;
-
-	wxString html = readLayoutHTML(layout_loc,layout);
-	html = replaceLabels(html,grid);
-
-	if(!cutInPartsHTML( html, &top, &header, &middle, &bottom))
-		return _T("");
-
-	wxTextFile* text = setFiles(savePath, &tempPath, mode);
-
-	writeToHTML(text,grid,tempPath,layout_loc+layout+_T(".html"), top,header,middle,bottom,mode);
-
-	return tempPath;
-}
-
-wxString Maintenance::replaceLabels(wxString s, wxGrid *grid)
-{
-	if(grid == this->grid)
-	{
-		s.Replace(_T("#LSERVICE#"),		dialog->m_notebook6->GetPageText(0));
-		s.Replace(_T("#LPRIORITY#"),	grid->GetColLabelValue(0));
-		s.Replace(_T("#LTEXT#"),		grid->GetColLabelValue(1));
-		s.Replace(_T("#LIF#"),			grid->GetColLabelValue(2));
-		s.Replace(_T("#LWARN#"),		grid->GetColLabelValue(3));
-		s.Replace(_T("#LURGENT#"),		grid->GetColLabelValue(4));
-		s.Replace(_T("#LSTART#"),		grid->GetColLabelValue(5));
-		s.Replace(_T("#LACTIVE#"),		grid->GetColLabelValue(6));
-	}
-	else if(grid == repairs)
-	{
-		s.Replace(_T("#LREPAIRS#"),		dialog->m_notebook6->GetPageText(1));
-		s.Replace(_T("#LPRIORITY#"),	grid->GetColLabelValue(0));
-		s.Replace(_T("#LTEXT#"),		grid->GetColLabelValue(1));
-	}
-	else if(grid == buyparts)
-	{
-		s.Replace(_T("#LBUYPARTS#"),	dialog->m_notebook6->GetPageText(2));
-		s.Replace(_T("#LPRIORITY#"),	grid->GetColLabelValue(0));
-		s.Replace(_T("#LCATEGORY#"),	grid->GetColLabelValue(1));
-		s.Replace(_T("#LTITLE#"),		grid->GetColLabelValue(2));
-		s.Replace(_T("#LBUYPARTS#"),	grid->GetColLabelValue(3));
-		s.Replace(_T("#LDATE#"),		grid->GetColLabelValue(4));
-		s.Replace(_T("#LAT#"),			grid->GetColLabelValue(5));
-	}
-
-	return s;
-}
-
-wxString Maintenance::toODT(int tab,wxString path,wxString layout,int mode)
-{
-	wxString top;
-	wxString header;
-	wxString middle;
-	wxString bottom;
-
-	wxString layout_loc;
-	wxGrid * grid = NULL;
-
-	wxString savePath = path;
-
-	if(tab == dialog->SERVICE)
-	{
-		path = data_locn;
-		layout_loc = layout_locnService;
-		grid = this->grid;
-	}
-	else if(tab == dialog->REPAIRS)
-	{
-
-		path = data_locnRepairs;
-		layout_loc = layout_locnRepairs;
-		grid = repairs;
-	}
-	else if(tab == dialog->BUYPARTS)
-	{
-		path = this->data_locnBuyParts;
-		layout_loc = layout_locnBuyParts;
-		grid = buyparts;
-	}
-
-	wxString tempPath = path;
-
-	wxString odt = readLayoutODT(layout_loc,layout);
-	odt = replaceLabels(odt,grid);
-
-	if(!cutInPartsODT( odt, &top, &header,	&middle, &bottom))
-		return _T("");
-
-	wxTextFile* text = setFiles(savePath, &tempPath, mode);
-	writeToODT(text,grid,tempPath,layout_loc+layout+_T(".odt"), top,header,middle,bottom,mode);
-
-	return tempPath;
-}
-
-wxString Maintenance::setPlaceHolders(int mode, wxGrid *grid, int row, wxString middleODT)
-{
-	wxString s;
-
-	if(grid == this->grid)
-			s = setPlaceHoldersService(mode, grid, row, middleODT);		
-	else if(grid == repairs)
-			s = setPlaceHoldersRepairs(mode, grid, row, middleODT);	
-	else if(grid == buyparts)
-			s = setPlaceHoldersBuyParts(mode, grid, row, middleODT);
-
-	return s;
-}
-
-wxString Maintenance::setPlaceHoldersService(int mode, wxGrid *grid, int row, wxString middleODT)
-{
-	wxString newMiddleODT;
-
-	newMiddleODT = middleODT;
-	newMiddleODT.Replace(wxT("#PRIORITY#"),replaceNewLine(mode,grid->GetCellValue(row,PRIORITY)));
-	newMiddleODT.Replace(wxT("#TEXT#"),replaceNewLine(mode,grid->GetCellValue(row,TEXT)));
-	newMiddleODT.Replace(wxT("#IF#"),replaceNewLine(mode,grid->GetCellValue(row,IF)));
-	newMiddleODT.Replace(wxT("#WARN#"),replaceNewLine(mode,grid->GetCellValue(row,WARN)));
-	newMiddleODT.Replace(wxT("#URGENT#"),replaceNewLine(mode,grid->GetCellValue(row,URGENT)));
-	newMiddleODT.Replace(wxT("#START#"),replaceNewLine(mode,grid->GetCellValue(row,START)));
-	newMiddleODT.Replace(wxT("#ACTIVE#"),replaceNewLine(mode,grid->GetCellValue(row,ACTIVE)));
-
-	return newMiddleODT;
-}
-
-wxString Maintenance::setPlaceHoldersRepairs(int mode, wxGrid *grid, int row, wxString middleODT)
-{
-	wxString newMiddleODT;
-
-	newMiddleODT = middleODT;
-	newMiddleODT.Replace(wxT("#PRIORITY#"),replaceNewLine(mode,grid->GetCellValue(row,RPRIORITY)));
-	newMiddleODT.Replace(wxT("#REPAIRSTEXT#"),replaceNewLine(mode,grid->GetCellValue(row,RTEXT)));
-
-	return newMiddleODT;
-}
-
-wxString Maintenance::setPlaceHoldersBuyParts(int mode, wxGrid *grid, int row, wxString middleODT)
-{
-	wxString newMiddleODT;
-	newMiddleODT = middleODT;
-
-	newMiddleODT.Replace(wxT("#PRIORITY#"),replaceNewLine(mode,grid->GetCellValue(row,PPRIORITY)));
-	newMiddleODT.Replace(wxT("#CATEGORY#"),replaceNewLine(mode,grid->GetCellValue(row,PCATEGORY)));
-	newMiddleODT.Replace(wxT("#TITLE#"),replaceNewLine(mode,grid->GetCellValue(row,TITLE)));
-	newMiddleODT.Replace(wxT("#BUYPARTS#"),replaceNewLine(mode,grid->GetCellValue(row,PARTS)));
-	newMiddleODT.Replace(wxT("#DATE#"),replaceNewLine(mode,grid->GetCellValue(row,DATE)));
-	newMiddleODT.Replace(wxT("#AT#"),replaceNewLine(mode,grid->GetCellValue(row,AT)));
-
-	return newMiddleODT;
-}
-
-wxString Maintenance::replaceNewLine(int mode, wxString str)
-{
-	switch(mode)
-	{
-	case 0:
-		 // HTML
-		 str.Replace(wxT("\n"),wxT("<br>"));
-		 break;
-	case 1: // ODT
-		 str.Replace(wxT("\n"),wxT("<text:line-break/>"));		 
-		 break;
-	}
-
-	return str;
-}
-
-wxString Maintenance::readLayoutHTML(wxString path1,wxString layoutFileName)
-{
-	wxString html, path;
-
-	path = path1 + layoutFileName + wxT(".html");;
-	wxTextFile layout(path);
-	
-	layout.Open();
-
-	for(unsigned int i = 0; i < layout.GetLineCount(); i++)
-	{
-		html += layout.GetLine(i)+_T("\n");
-	}
-
-	layout.Close();
-
-	return html;
-}
-
-void Maintenance::deleteFindItRow(wxString category, wxString plugin)
-{
-	int row = 0;
-	while(row < buyparts->GetNumberRows())
-	{
-		if(buyparts->GetCellValue(row,PCATEGORY).Contains(category) && 
-			buyparts->GetCellValue(row,TITLE).Contains(plugin))
-				buyparts->DeleteRows(row);
-		else
-			row++;
-
-	}
-
-}
-
-void Maintenance::showDateDialog(int row, int col, wxGrid* grid)
-{
-	DateDialog* d = new DateDialog(grid);
-	if(d->ShowModal()== wxID_OK)
-	{
-		wxDateTime date = d->m_calendar2->GetDate();
-		grid->SetCellValue(row,col,date.Format(opt->sdateformat));
-	}
+    wxString newLocn = data_locnBuyParts;
+    newLocn.Replace( _T( "txt" ),_T( "Bak" ) );
+    wxRename( data_locnBuyParts,newLocn );
+
+    wxFileOutputStream output( data_locnBuyParts );
+    wxTextOutputStream* stream = new wxTextOutputStream ( output,wxEOL_NATIVE,wxConvUTF8 );
+
+    int count = dialog->m_gridMaintenanceBuyParts->GetNumberRows();
+    for ( int r = 0; r < count; r++ )
+    {
+        for ( int c = 0; c < dialog->m_gridMaintenanceBuyParts->GetNumberCols(); c++ )
+        {
+            temp = dialog->m_gridMaintenanceBuyParts->GetCellValue( r,c );
+            s += dialog->replaceDangerChar( temp );
+            if ( c == DATE && ( !temp.IsEmpty() && temp.GetChar( 0 ) != ' ' ) )
+            {
+                wxDateTime dt;
+                dialog->myParseDate( temp.RemoveLast(),dt );
+                s.Replace( temp,wxString::Format( _T( "%i/%i/%i" ),dt.GetMonth(), dt.GetDay(), dt.GetYear() ) );
+            }
+
+            s += _T( " \t" );
+        }
+        s.RemoveLast();
+        stream->WriteString( s+_T( "\n" ) );
+        s = _T( "" );
+    }
+    output.Close();
+    modified = false;
+}
+
+void Maintenance::viewODT( int tab,wxString path,wxString layout,int mode )
+{
+    wxString locn, fn;
+
+    if ( tab == dialog->SERVICE )
+    {
+        locn = layout_locnService;
+        fn = data_locn;
+        if ( opt->filterLayout[LogbookDialog::GSERVICE] )
+            layout.Prepend( opt->layoutPrefix[LogbookDialog::GSERVICE] );
+    }
+    else if ( tab == dialog->REPAIRS )
+    {
+        locn = layout_locnRepairs;
+        fn = data_locnRepairs;
+        if ( opt->filterLayout[LogbookDialog::GREPAIRS] )
+            layout.Prepend( opt->layoutPrefix[LogbookDialog::GREPAIRS] );
+    }
+    else if ( tab == dialog->BUYPARTS )
+    {
+        locn = this->layout_locnBuyParts;
+        fn = data_locnBuyParts;
+        if ( opt->filterLayout[LogbookDialog::GBUYPARTS] )
+            layout.Prepend( opt->layoutPrefix[LogbookDialog::GBUYPARTS] );
+    }
+
+    toODT( tab,locn, layout, mode );
+
+    if ( layout != _T( "" ) )
+    {
+        fn.Replace( _T( "txt" ),_T( "odt" ) );
+        dialog->startApplication( fn,_T( ".odt" ) );
+    }
+}
+
+void Maintenance::viewHTML( int tab,wxString path,wxString layout,int mode )
+{
+    wxString locn, fn;
+
+    if ( tab == dialog->SERVICE )
+    {
+        locn = layout_locnService;
+        fn = data_locn;
+        if ( opt->filterLayout[LogbookDialog::GSERVICE] )
+            layout.Prepend( opt->layoutPrefix[LogbookDialog::GSERVICE] );
+    }
+    else if ( tab == dialog->REPAIRS )
+    {
+        locn = layout_locnRepairs;
+        fn = data_locnRepairs;
+        if ( opt->filterLayout[LogbookDialog::GREPAIRS] )
+            layout.Prepend( opt->layoutPrefix[LogbookDialog::GREPAIRS] );
+    }
+    else if ( tab == dialog->BUYPARTS )
+    {
+        locn = this->layout_locnBuyParts;
+        fn = data_locnBuyParts;
+        if ( opt->filterLayout[LogbookDialog::GBUYPARTS] )
+            layout.Prepend( opt->layoutPrefix[LogbookDialog::GBUYPARTS] );
+    }
+
+    toHTML( tab,locn, layout, mode );
+
+    if ( layout != _T( "" ) )
+    {
+        fn.Replace( _T( "txt" ),_T( "html" ) );
+        dialog->startBrowser( fn );
+    }
+}
+
+wxString Maintenance::toHTML( int tab,wxString path,wxString layout,int mode )
+{
+    wxString top;
+    wxString header;
+    wxString middle;
+    wxString bottom;
+
+    wxString layout_loc;
+    wxGrid * grid = NULL;
+
+    wxString savePath = path;
+
+    if ( tab == dialog->SERVICE )
+    {
+        path = data_locn;
+        layout_loc = layout_locnService;
+        grid = this->grid;
+    }
+    else if ( tab == dialog->REPAIRS )
+    {
+
+        path = data_locnRepairs;
+        layout_loc = layout_locnRepairs;
+        grid = repairs;
+    }
+    else if ( tab == dialog->BUYPARTS )
+    {
+        path = this->data_locnBuyParts;
+        layout_loc = layout_locnBuyParts;
+        grid = buyparts;
+    }
+
+    wxString tempPath = path;
+
+    wxString html = readLayoutHTML( layout_loc,layout );
+    html = replaceLabels( html,grid );
+
+    if ( !cutInPartsHTML( html, &top, &header, &middle, &bottom ) )
+        return _T( "" );
+
+    wxTextFile* text = setFiles( savePath, &tempPath, mode );
+
+    writeToHTML( text,grid,tempPath,layout_loc+layout+_T( ".html" ), top,header,middle,bottom,mode );
+
+    return tempPath;
+}
+
+wxString Maintenance::replaceLabels( wxString s, wxGrid *grid )
+{
+    if ( grid == this->grid )
+    {
+        s.Replace( _T( "#LSERVICE#" ),		dialog->m_notebook6->GetPageText( 0 ) );
+        s.Replace( _T( "#LPRIORITY#" ),	grid->GetColLabelValue( 0 ) );
+        s.Replace( _T( "#LTEXT#" ),		grid->GetColLabelValue( 1 ) );
+        s.Replace( _T( "#LIF#" ),			grid->GetColLabelValue( 2 ) );
+        s.Replace( _T( "#LWARN#" ),		grid->GetColLabelValue( 3 ) );
+        s.Replace( _T( "#LURGENT#" ),		grid->GetColLabelValue( 4 ) );
+        s.Replace( _T( "#LSTART#" ),		grid->GetColLabelValue( 5 ) );
+        s.Replace( _T( "#LACTIVE#" ),		grid->GetColLabelValue( 6 ) );
+    }
+    else if ( grid == repairs )
+    {
+        s.Replace( _T( "#LREPAIRS#" ),		dialog->m_notebook6->GetPageText( 1 ) );
+        s.Replace( _T( "#LPRIORITY#" ),	grid->GetColLabelValue( 0 ) );
+        s.Replace( _T( "#LTEXT#" ),		grid->GetColLabelValue( 1 ) );
+    }
+    else if ( grid == buyparts )
+    {
+        s.Replace( _T( "#LBUYPARTS#" ),	dialog->m_notebook6->GetPageText( 2 ) );
+        s.Replace( _T( "#LPRIORITY#" ),	grid->GetColLabelValue( 0 ) );
+        s.Replace( _T( "#LCATEGORY#" ),	grid->GetColLabelValue( 1 ) );
+        s.Replace( _T( "#LTITLE#" ),		grid->GetColLabelValue( 2 ) );
+        s.Replace( _T( "#LBUYPARTS#" ),	grid->GetColLabelValue( 3 ) );
+        s.Replace( _T( "#LDATE#" ),		grid->GetColLabelValue( 4 ) );
+        s.Replace( _T( "#LAT#" ),			grid->GetColLabelValue( 5 ) );
+    }
+
+    return s;
+}
+
+wxString Maintenance::toODT( int tab,wxString path,wxString layout,int mode )
+{
+    wxString top;
+    wxString header;
+    wxString middle;
+    wxString bottom;
+
+    wxString layout_loc;
+    wxGrid * grid = NULL;
+
+    wxString savePath = path;
+
+    if ( tab == dialog->SERVICE )
+    {
+        path = data_locn;
+        layout_loc = layout_locnService;
+        grid = this->grid;
+    }
+    else if ( tab == dialog->REPAIRS )
+    {
+
+        path = data_locnRepairs;
+        layout_loc = layout_locnRepairs;
+        grid = repairs;
+    }
+    else if ( tab == dialog->BUYPARTS )
+    {
+        path = this->data_locnBuyParts;
+        layout_loc = layout_locnBuyParts;
+        grid = buyparts;
+    }
+
+    wxString tempPath = path;
+
+    wxString odt = readLayoutODT( layout_loc,layout );
+    odt = replaceLabels( odt,grid );
+
+    if ( !cutInPartsODT( odt, &top, &header,	&middle, &bottom ) )
+        return _T( "" );
+
+    wxTextFile* text = setFiles( savePath, &tempPath, mode );
+    writeToODT( text,grid,tempPath,layout_loc+layout+_T( ".odt" ), top,header,middle,bottom,mode );
+
+    return tempPath;
+}
+
+wxString Maintenance::setPlaceHolders( int mode, wxGrid *grid, int row, wxString middleODT )
+{
+    wxString s;
+
+    if ( grid == this->grid )
+        s = setPlaceHoldersService( mode, grid, row, middleODT );
+    else if ( grid == repairs )
+        s = setPlaceHoldersRepairs( mode, grid, row, middleODT );
+    else if ( grid == buyparts )
+        s = setPlaceHoldersBuyParts( mode, grid, row, middleODT );
+
+    return s;
+}
+
+wxString Maintenance::setPlaceHoldersService( int mode, wxGrid *grid, int row, wxString middleODT )
+{
+    wxString newMiddleODT;
+
+    newMiddleODT = middleODT;
+    newMiddleODT.Replace( wxT( "#PRIORITY#" ),replaceNewLine( mode,grid->GetCellValue( row,PRIORITY ) ) );
+    newMiddleODT.Replace( wxT( "#TEXT#" ),replaceNewLine( mode,grid->GetCellValue( row,TEXT ) ) );
+    newMiddleODT.Replace( wxT( "#IF#" ),replaceNewLine( mode,grid->GetCellValue( row,IF ) ) );
+    newMiddleODT.Replace( wxT( "#WARN#" ),replaceNewLine( mode,grid->GetCellValue( row,WARN ) ) );
+    newMiddleODT.Replace( wxT( "#URGENT#" ),replaceNewLine( mode,grid->GetCellValue( row,URGENT ) ) );
+    newMiddleODT.Replace( wxT( "#START#" ),replaceNewLine( mode,grid->GetCellValue( row,START ) ) );
+    newMiddleODT.Replace( wxT( "#ACTIVE#" ),replaceNewLine( mode,grid->GetCellValue( row,ACTIVE ) ) );
+
+    return newMiddleODT;
+}
+
+wxString Maintenance::setPlaceHoldersRepairs( int mode, wxGrid *grid, int row, wxString middleODT )
+{
+    wxString newMiddleODT;
+
+    newMiddleODT = middleODT;
+    newMiddleODT.Replace( wxT( "#PRIORITY#" ),replaceNewLine( mode,grid->GetCellValue( row,RPRIORITY ) ) );
+    newMiddleODT.Replace( wxT( "#REPAIRSTEXT#" ),replaceNewLine( mode,grid->GetCellValue( row,RTEXT ) ) );
+
+    return newMiddleODT;
+}
+
+wxString Maintenance::setPlaceHoldersBuyParts( int mode, wxGrid *grid, int row, wxString middleODT )
+{
+    wxString newMiddleODT;
+    newMiddleODT = middleODT;
+
+    newMiddleODT.Replace( wxT( "#PRIORITY#" ),replaceNewLine( mode,grid->GetCellValue( row,PPRIORITY ) ) );
+    newMiddleODT.Replace( wxT( "#CATEGORY#" ),replaceNewLine( mode,grid->GetCellValue( row,PCATEGORY ) ) );
+    newMiddleODT.Replace( wxT( "#TITLE#" ),replaceNewLine( mode,grid->GetCellValue( row,TITLE ) ) );
+    newMiddleODT.Replace( wxT( "#BUYPARTS#" ),replaceNewLine( mode,grid->GetCellValue( row,PARTS ) ) );
+    newMiddleODT.Replace( wxT( "#DATE#" ),replaceNewLine( mode,grid->GetCellValue( row,DATE ) ) );
+    newMiddleODT.Replace( wxT( "#AT#" ),replaceNewLine( mode,grid->GetCellValue( row,AT ) ) );
+
+    return newMiddleODT;
+}
+
+wxString Maintenance::replaceNewLine( int mode, wxString str )
+{
+    switch ( mode )
+    {
+    case 0:
+        // HTML
+        str.Replace( wxT( "\n" ),wxT( "<br>" ) );
+        break;
+    case 1: // ODT
+        str.Replace( wxT( "\n" ),wxT( "<text:line-break/>" ) );
+        break;
+    }
+
+    return str;
+}
+
+wxString Maintenance::readLayoutHTML( wxString path1,wxString layoutFileName )
+{
+    wxString html, path;
+
+    path = path1 + layoutFileName + wxT( ".html" );;
+    wxTextFile layout( path );
+
+    layout.Open();
+
+    for ( unsigned int i = 0; i < layout.GetLineCount(); i++ )
+    {
+        html += layout.GetLine( i )+_T( "\n" );
+    }
+
+    layout.Close();
+
+    return html;
+}
+
+void Maintenance::deleteFindItRow( wxString category, wxString plugin )
+{
+    int row = 0;
+    while ( row < buyparts->GetNumberRows() )
+    {
+        if ( buyparts->GetCellValue( row,PCATEGORY ).Contains( category ) &&
+                buyparts->GetCellValue( row,TITLE ).Contains( plugin ) )
+            buyparts->DeleteRows( row );
+        else
+            row++;
+
+    }
+
+}
+
+void Maintenance::showDateDialog( int row, int col, wxGrid* grid )
+{
+    DateDialog* d = new DateDialog( grid );
+    if ( d->ShowModal()== wxID_OK )
+    {
+        wxDateTime date = d->m_calendar2->GetDate();
+        grid->SetCellValue( row,col,date.Format( opt->sdateformat ) );
+    }
 }
 /////////////////////////////////////
 // DateDialog
 /////////////////////////////////////
 DateDialog::DateDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer21;
-	bSizer21 = new wxBoxSizer( wxVERTICAL );
-	
-	m_calendar2 = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
-	bSizer21->Add( m_calendar2, 1, wxALL|wxEXPAND, 5 );
-	
-	m_sdbSizer6 = new wxStdDialogButtonSizer();
-	m_sdbSizer6OK = new wxButton( this, wxID_OK );
-	m_sdbSizer6->AddButton( m_sdbSizer6OK );
-	m_sdbSizer6Cancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizer6->AddButton( m_sdbSizer6Cancel );
-	m_sdbSizer6->Realize();
-	bSizer21->Add( m_sdbSizer6, 0, wxALIGN_CENTER, 5 );
-	
-	this->SetSizer( bSizer21 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	m_calendar2->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( DateDialog::OnCalenderSelChanged ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer21;
+    bSizer21 = new wxBoxSizer( wxVERTICAL );
+
+    m_calendar2 = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
+    bSizer21->Add( m_calendar2, 1, wxALL|wxEXPAND, 5 );
+
+    m_sdbSizer6 = new wxStdDialogButtonSizer();
+    m_sdbSizer6OK = new wxButton( this, wxID_OK );
+    m_sdbSizer6->AddButton( m_sdbSizer6OK );
+    m_sdbSizer6Cancel = new wxButton( this, wxID_CANCEL );
+    m_sdbSizer6->AddButton( m_sdbSizer6Cancel );
+    m_sdbSizer6->Realize();
+    bSizer21->Add( m_sdbSizer6, 0, wxALIGN_CENTER, 5 );
+
+    this->SetSizer( bSizer21 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    m_calendar2->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( DateDialog::OnCalenderSelChanged ), NULL, this );
 }
 
 DateDialog::~DateDialog()
 {
-	// Disconnect Events
-	m_calendar2->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( DateDialog::OnCalenderSelChanged ), NULL, this );
-	
+    // Disconnect Events
+    m_calendar2->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( DateDialog::OnCalenderSelChanged ), NULL, this );
+
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Maintenance.h opencpn-plugin-logbookkonni-1.2024/src/Maintenance.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/Maintenance.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Maintenance.h	2016-02-25 13:06:29.000000000 +0000
@@ -1,9 +1,9 @@
 #pragma once
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
-#include <wx/textfile.h> 
+#include <wx/textfile.h>
 #include <wx/grid.h>
 #include <wx/arrstr.h>
 #include <wx/calctrl.h>
@@ -24,142 +24,145 @@
 class Maintenance : public Export
 {
 public:
-	enum fieldsRepairs{RPRIORITY,RTEXT};
-	enum fieldsBuyParts{PPRIORITY,PCATEGORY,TITLE,PARTS,DATE,AT};
-	enum fieldsService{PRIORITY,TEXT,IF,WARN,URGENT,START,ACTIVE};
+    enum fieldsRepairs {RPRIORITY,RTEXT};
+    enum fieldsBuyParts {PPRIORITY,PCATEGORY,TITLE,PARTS,DATE,AT};
+    enum fieldsService {PRIORITY,TEXT,IF,WARN,URGENT,START,ACTIVE};
 public:
-	Maintenance(LogbookDialog* d, wxString data, wxString lay, wxString layoutODT);
+    Maintenance( LogbookDialog* d, wxString data, wxString lay, wxString layoutODT );
 #ifdef __WXOSX__
-	virtual ~Maintenance(void);
+    virtual ~Maintenance( void );
 #else
-	~Maintenance(void);
+    ~Maintenance( void );
 #endif
-	void addLine();
-	void addLineRepairs();
-	void addLineBuyParts();
-	void setRowDone(int row);
-	void setRepairDone(int row);
-	void cellCollChanged(int col, int row);
-    void cellSelected(int col, int row);
-    void checkService(int row);
+    void addLine();
+    void addLineRepairs();
+    void addLineBuyParts();
+    void setRowDone( int row );
+    void setRepairDone( int row );
+    void cellCollChanged( int col, int row );
+    void cellSelected( int col, int row );
+    void checkService( int row );
     void checkRepairs();
     void checkBuyParts();
-	void loadData();
-	void update();
-	void updateRepairs();
-	void updateBuyParts();
-	void buyParts(int i);
-	void setLayoutLocation();
-	wxString toODT(int tab,wxString path,wxString layout,int mode);
-	void viewODT(int tab,wxString path,wxString layout,int mode);
-	void viewHTML(int tab,wxString path,wxString layout,int mode);
-	wxString toHTML(int tab,wxString path,wxString layout,int mode);
-	void showDateDialog( int row, int col, wxGrid* grid);
-	void deleteFindItRow(wxString category,wxString plugin);
-	wxString getDateString(wxString s);
-
-	wxGrid*		grid;
-	wxGrid*		buyparts;
-	wxGrid*		repairs;
-	int			lastRow;
-	int			lastRowBuyParts;
-	int			lastRowRepairs;
-	int			selectedCol;
-	int			selectedRow;
-	int			selectedRowRepairs;
-	int			selectedColRepairs;
-	int			selectedRowBuyParts;
-	int			selectedColBuyParts;
-	wxString	layout_locn;
-	wxString	layout_locnService;
-	wxString	layout_locnRepairs;
-	wxString	layout_locnBuyParts;
-
-	wxString		m_choices[12];
-	int				m_choicesCount;
-	wxString		m_YesNo[2];
-	bool			modified;
-	bool			modifiedR;	
-	bool			modifiedB;
+    void loadData();
+    void update();
+    void updateRepairs();
+    void updateBuyParts();
+    void buyParts( int i );
+    void setLayoutLocation();
+    wxString toODT( int tab,wxString path,wxString layout,int mode );
+    void viewODT( int tab,wxString path,wxString layout,int mode );
+    void viewHTML( int tab,wxString path,wxString layout,int mode );
+    wxString toHTML( int tab,wxString path,wxString layout,int mode );
+    void showDateDialog( int row, int col, wxGrid* grid );
+    void deleteFindItRow( wxString category,wxString plugin );
+    wxString getDateString( wxString s );
+
+    wxGrid*		grid;
+    wxGrid*		buyparts;
+    wxGrid*		repairs;
+    int			lastRow;
+    int			lastRowBuyParts;
+    int			lastRowRepairs;
+    int			selectedCol;
+    int			selectedRow;
+    int			selectedRowRepairs;
+    int			selectedColRepairs;
+    int			selectedRowBuyParts;
+    int			selectedColBuyParts;
+    wxString	layout_locn;
+    wxString	layout_locnService;
+    wxString	layout_locnRepairs;
+    wxString	layout_locnBuyParts;
+
+    wxString		m_choices[12];
+    int				m_choicesCount;
+    wxString		m_YesNo[2];
+    bool			modified;
+    bool			modifiedR;
+    bool			modifiedB;
 private:
-	LogbookDialog*	dialog;
-	Options*		opt;
+    LogbookDialog*	dialog;
+    Options*		opt;
 
-	void setRowBackground(int row, wxColour &c);
-	void setRowBackgroundRepairs(int row, wxColour &c);
-	void setRowBackgroundBuyParts(int row, wxColour &c);
-	void setAlignmentService();
-	void setAlignmentRepairs();
-	void setAlignmentBuyParts();
-	void setBuyPartsPriority(wxGrid *grid ,int row, int col, int text);
-	wxString readLayoutHTML(wxString path,wxString layout);
-	wxString setPlaceHolders(int mode, wxGrid *grid, int row, wxString middleODT);
-	wxString setPlaceHoldersService(int mode, wxGrid *grid, int row, wxString middleODT);
-	wxString setPlaceHoldersRepairs(int mode, wxGrid *grid, int row, wxString middleODT);
-	wxString setPlaceHoldersBuyParts(int mode, wxGrid *grid, int row, wxString middleODT);
-	wxString replaceLabels(wxString s, wxGrid* grid);
-	wxString replaceNewLine(int mode, wxString str);
-	int		 getSelection(wxString s);
-
-	wxColour green;
-	wxColour red;
-	wxColour redlight;
-	wxColour yellow;
-	wxColour yellowlight;
-	wxColour white;
-	
-	wxString		layout;
-	wxString		ODTLayout;
-
-	wxString		m_Priority[6];
-
-	wxString		data_locn;
-	wxString		data_locnRepairs;
-	wxString		data_locnBuyParts;
+    void setRowBackground( int row, wxColour &c );
+    void setRowBackgroundRepairs( int row, wxColour &c );
+    void setRowBackgroundBuyParts( int row, wxColour &c );
+    void setAlignmentService();
+    void setAlignmentRepairs();
+    void setAlignmentBuyParts();
+    void setBuyPartsPriority( wxGrid *grid ,int row, int col, int text );
+    wxString readLayoutHTML( wxString path,wxString layout );
+    wxString setPlaceHolders( int mode, wxGrid *grid, int row, wxString middleODT );
+    wxString setPlaceHoldersService( int mode, wxGrid *grid, int row, wxString middleODT );
+    wxString setPlaceHoldersRepairs( int mode, wxGrid *grid, int row, wxString middleODT );
+    wxString setPlaceHoldersBuyParts( int mode, wxGrid *grid, int row, wxString middleODT );
+    wxString replaceLabels( wxString s, wxGrid* grid );
+    wxString replaceNewLine( int mode, wxString str );
+    int		 getSelection( wxString s );
+
+    wxColour green;
+    wxColour red;
+    wxColour redlight;
+    wxColour yellow;
+    wxColour yellowlight;
+    wxColour white;
+
+    wxString		layout;
+    wxString		ODTLayout;
+
+    wxString		m_Priority[6];
+
+    wxString		data_locn;
+    wxString		data_locnRepairs;
+    wxString		data_locnBuyParts;
 #ifdef __WXOSX__
 //
 #else
-	bool			format; // 0 = ODT 1 = HTML
+    bool			format; // 0 = ODT 1 = HTML
 #endif
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DateDialog
 ///////////////////////////////////////////////////////////////////////////////
-class DateDialog : public wxDialog 
+class DateDialog : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStdDialogButtonSizer* m_sdbSizer6;
-		wxButton* m_sdbSizer6OK;
-		wxButton* m_sdbSizer6Cancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		void OnCalenderSelChanged( wxCalendarEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxCalendarCtrl* m_calendar2;
-		
-		DateDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a date"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 221,198 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DateDialog();
-	
+private:
+
+protected:
+    wxStdDialogButtonSizer* m_sdbSizer6;
+    wxButton* m_sdbSizer6OK;
+    wxButton* m_sdbSizer6Cancel;
+
+    // Virtual event handlers, overide them in your derived class
+    void OnCalenderSelChanged( wxCalendarEvent& event )
+    {
+        event.Skip();
+    }
+
+
+public:
+    wxCalendarCtrl* m_calendar2;
+
+    DateDialog( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _( "Select a date" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 221,198 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~DateDialog();
+
 };
 
 class myGridCellChoiceEditor : public wxGridCellChoiceEditor
 {
 public:
-	myGridCellChoiceEditor(int i, wxString s[], bool mode):wxGridCellChoiceEditor(i,s,mode){}
-	~myGridCellChoiceEditor(void){}
+    myGridCellChoiceEditor( int i, wxString s[], bool mode ):wxGridCellChoiceEditor( i,s,mode ) {}
+    ~myGridCellChoiceEditor( void ) {}
 
-	void StartingClick()
-	{
-		this->Combo()->Show(true);
+    void StartingClick()
+    {
+        this->Combo()->Show( true );
 #if wxCHECK_VERSION(2,9,0)
-		this->Combo()->Popup();
+        this->Combo()->Popup();
 #else
-		
+
 #endif
-	}
+    }
 };
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/MessageBoxOSX.cpp opencpn-plugin-logbookkonni-1.2024/src/MessageBoxOSX.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/MessageBoxOSX.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/MessageBoxOSX.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-//#pragma once
-#ifndef WX_PRECOMP
-      #include <wx/wx.h>
-#endif
-#include "MessageBoxOSX.h"
-
-MessageBoxOSX_::MessageBoxOSX_( wxWindow* parent, wxString str,  const wxString& title, int buttons, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
-	m_sdbSizerOK = NULL;
-	m_sdbSizerNo = NULL;
-	m_sdbSizerCancel = NULL;
-
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-	
-	wxBoxSizer* mainSizer;
-	mainSizer = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText1 = new wxStaticText( this, wxID_ANY, _T("\n")+str+_T("\n"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1->Wrap( -1 );
-	mainSizer->Add( m_staticText1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_sdbSizer = new wxStdDialogButtonSizer();
-	if((buttons & wxID_OK) == wxID_OK)
-	{
-		m_sdbSizerOK = new wxButton( this, wxID_OK );
-		m_sdbSizer->AddButton( m_sdbSizerOK );
-		m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageBoxOSX_::OnOKClick ), NULL, this );
-	}
-	if((buttons & wxID_NO) == wxID_NO)
-	{
-		m_sdbSizerNo = new wxButton( this, wxID_NO );
-		m_sdbSizer->AddButton( m_sdbSizerNo );
-		m_sdbSizerNo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageBoxOSX_::OnNoClick ), NULL, this );
-	}
-	if((buttons & wxID_CANCEL) == wxID_CANCEL)
-	{
-		m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
-		m_sdbSizer->AddButton( m_sdbSizerCancel );
-		m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageBoxOSX_::OnCancelClick ), NULL, this );
-	}
-
-	m_sdbSizer->Realize();
-	mainSizer->Add( m_sdbSizer, 0, wxBOTTOM|wxRIGHT|wxALIGN_CENTER_HORIZONTAL, 0 );
-	
-	this->SetSizer( mainSizer );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MessageBoxOSX_::OnCloseDialog ) );
-	Fit();
-}
-
-MessageBoxOSX_::~MessageBoxOSX_()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MessageBoxOSX_::OnCloseDialog ) );
-	if(m_sdbSizerCancel)
-		m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageBoxOSX_::OnCancelClick ), NULL, this );
-	if(m_sdbSizerOK)
-		m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageBoxOSX_::OnOKClick ), NULL, this );
-	if(m_sdbSizerNo)
-		m_sdbSizerNo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageBoxOSX_::OnNoClick ), NULL, this );
-		
-}
-void MessageBoxOSX_::OnCloseDialog(wxCloseEvent& event)
-{
-	event.Skip();
-}
-
-void MessageBoxOSX_::OnOKClick(wxCommandEvent& event)
-{
-	returnint = wxID_OK;
-	Close();
-	event.Skip();
-}
-
-void MessageBoxOSX_::OnCancelClick(wxCommandEvent& event)
-{
-	returnint = wxID_CANCEL;
-	Close();
-	event.Skip();
-}
-
-void MessageBoxOSX_::OnNoClick(wxCommandEvent& event)
-{
-	returnint = wxID_NO;
-	Close();
-	event.Skip();
-}
-
-int MessageBoxOSX_::ShowModal_()
-{
-	this->ShowModal();
-	return returnint;
-}
-
-////////////// global Function ////////////
-int MessageBoxOSX(wxWindow* parent, wxString str, wxString title, int buttons)
-{
-	MessageBoxOSX_ x(parent,str,title,buttons);
-	int i = x.ShowModal_();
-	return i;
-}
\ No newline at end of file
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/MessageBoxOSX.h opencpn-plugin-logbookkonni-1.2024/src/MessageBoxOSX.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/MessageBoxOSX.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/MessageBoxOSX.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-#pragma once
-#ifndef  WX_PRECOMP
-  #include "wx/wx.h"
-#endif //precompiled headers
-
-int MessageBoxOSX(wxWindow* parent, wxString str,  wxString title = _(""), int buttons = wxID_NO|wxID_CANCEL|wxID_OK);
-class MessageBoxOSX_ : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxStaticText* m_staticText1;
-		wxStdDialogButtonSizer* m_sdbSizer;
-		wxButton* m_sdbSizerOK;
-		wxButton* m_sdbSizerNo;
-		wxButton* m_sdbSizerCancel;
-		int returnint;
-		
-		// Virtual event handlers, overide them in your derived class
-		void OnCloseDialog( wxCloseEvent& event );
-		void OnCancelClick( wxCommandEvent& event );
-		void OnOKClick( wxCommandEvent& event );
-		void OnNoClick( wxCommandEvent& event );
-		
-	
-	public:
-		MessageBoxOSX_( wxWindow* parent, wxString str,  const wxString& title = _(""), int buttons = wxID_OK, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 286,108 ), long style = wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE);
-		~MessageBoxOSX_();
-		int ShowModal_();
-	
-};
\ No newline at end of file
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dbt.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dbt.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dbt.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dbt.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,92 +43,92 @@
 
 DBT::DBT()
 {
-   Mnemonic = _T("DBT");
-   Empty();
+    Mnemonic = _T( "DBT" );
+    Empty();
 }
 
 DBT::~DBT()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void DBT::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   DepthFeet    = 0.0;
-   DepthMeters  = 0.0;
-   DepthFathoms = 0.0;
+    DepthFeet    = 0.0;
+    DepthMeters  = 0.0;
+    DepthFathoms = 0.0;
 }
 
 bool DBT::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** DBT - Depth below transducer
-   **
-   **        1   2 3   4 5   6 7
-   **        |   | |   | |   | |
-   ** $--DBT,x.x,f,x.x,M,x.x,F*hh<CR><LF>
-   **
-   ** Field Number: 
-   **  1) Depth, feet
-   **  2) f = feet
-   **  3) Depth, meters
-   **  4) M = meters
-   **  5) Depth, Fathoms
-   **  6) F = Fathoms
-   **  7) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 7 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
-
-   DepthFeet    = sentence.Double( 1 );
-   DepthMeters  = sentence.Double( 3 );
-   DepthFathoms = sentence.Double( 5 );
+    /*
+    ** DBT - Depth below transducer
+    **
+    **        1   2 3   4 5   6 7
+    **        |   | |   | |   | |
+    ** $--DBT,x.x,f,x.x,M,x.x,F*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Depth, feet
+    **  2) f = feet
+    **  3) Depth, meters
+    **  4) M = meters
+    **  5) Depth, Fathoms
+    **  6) F = Fathoms
+    **  7) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 7 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    DepthFeet    = sentence.Double( 1 );
+    DepthMeters  = sentence.Double( 3 );
+    DepthFathoms = sentence.Double( 5 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool DBT::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
-
-   sentence += DepthFeet;
-   sentence += _T("f");
-   sentence += DepthMeters;
-   sentence += _T("M");
-   sentence += DepthFathoms;
-   sentence += _T("F");
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += DepthFeet;
+    sentence += _T( "f" );
+    sentence += DepthMeters;
+    sentence += _T( "M" );
+    sentence += DepthFathoms;
+    sentence += _T( "F" );
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const DBT& DBT::operator = ( const DBT& source )
 {
-   //ASSERT_VALID( this );
+    //ASSERT_VALID( this );
 
-   DepthFeet    = source.DepthFeet;
-   DepthMeters  = source.DepthMeters;
-   DepthFathoms = source.DepthFathoms;
+    DepthFeet    = source.DepthFeet;
+    DepthMeters  = source.DepthMeters;
+    DepthFathoms = source.DepthFathoms;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dbt.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dbt.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dbt.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dbt.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -42,34 +42,34 @@
 
 class DBT : public RESPONSE
 {
-   //DECLARE_DYNAMIC( DBT )
+    //DECLARE_DYNAMIC( DBT )
 
-   public:
+public:
 
-      DBT();
-     ~DBT();
+    DBT();
+    ~DBT();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double DepthFeet;
-      double DepthMeters;
-      double DepthFathoms;
+    double DepthFeet;
+    double DepthMeters;
+    double DepthFathoms;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      const DBT& operator = ( const DBT& source );
+    const DBT& operator = ( const DBT& source );
 };
 
 #endif // DBT_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dpt.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dpt.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dpt.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dpt.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,83 +43,83 @@
 
 DPT::DPT()
 {
-   Mnemonic = _T("DPT");
-   Empty();
+    Mnemonic = _T( "DPT" );
+    Empty();
 }
 
 DPT::~DPT()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void DPT::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   DepthMeters                = 0.0;
-   OffsetFromTransducerMeters = 0.0;
+    DepthMeters                = 0.0;
+    OffsetFromTransducerMeters = 0.0;
 }
 
 bool DPT::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** DPT - Heading - Deviation & Variation
-   **
-   **        1   2   3
-   **        |   |   |
-   ** $--DPT,x.x,x.x*hh<CR><LF>
-   **
-   ** Field Number: 
-   **  1) Depth, meters
-   **  2) Offset from transducer, 
-   **     positive means distance from transducer to water line
-   **     negative means distance from transducer to keel
-   **  3) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 3 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
+    /*
+    ** DPT - Heading - Deviation & Variation
+    **
+    **        1   2   3
+    **        |   |   |
+    ** $--DPT,x.x,x.x*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Depth, meters
+    **  2) Offset from transducer,
+    **     positive means distance from transducer to water line
+    **     negative means distance from transducer to keel
+    **  3) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 3 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
 
-   DepthMeters                = sentence.Double( 1 );
-   OffsetFromTransducerMeters = sentence.Double( 2 );
+    DepthMeters                = sentence.Double( 1 );
+    OffsetFromTransducerMeters = sentence.Double( 2 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool DPT::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
+    /*
+    ** Let the parent do its thing
+    */
 
-   sentence += DepthMeters;
-   sentence += OffsetFromTransducerMeters;
+    RESPONSE::Write( sentence );
 
-   sentence.Finish();
+    sentence += DepthMeters;
+    sentence += OffsetFromTransducerMeters;
 
-   return( TRUE );
+    sentence.Finish();
+
+    return ( TRUE );
 }
 
 const DPT& DPT::operator = ( const DPT& source )
 {
 //   ASSERT_VALID( this );
 
-   DepthMeters                = source.DepthMeters;
-   OffsetFromTransducerMeters = source.OffsetFromTransducerMeters;
+    DepthMeters                = source.DepthMeters;
+    OffsetFromTransducerMeters = source.OffsetFromTransducerMeters;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dpt.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dpt.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/dpt.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/dpt.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -42,33 +42,33 @@
 
 class DPT : public RESPONSE
 {
-   //DECLARE_DYNAMIC( DPT )
+    //DECLARE_DYNAMIC( DPT )
 
-   public:
+public:
 
-      DPT();
-     ~DPT();
+    DPT();
+    ~DPT();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double DepthMeters;
-      double OffsetFromTransducerMeters;
+    double DepthMeters;
+    double OffsetFromTransducerMeters;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const DPT& operator = ( const DPT& source );
+    virtual const DPT& operator = ( const DPT& source );
 };
 
 #endif // DPT_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/expid.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/expid.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/expid.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/expid.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -42,388 +42,388 @@
 
 wxString& expand_talker_id( const wxString &identifier )
 {
-   static wxString expanded_identifier;
+    static wxString expanded_identifier;
 
-   char first_character  = 0x00;
-   char second_character = 0x00;
+    char first_character  = 0x00;
+    char second_character = 0x00;
 
-   first_character  = identifier[ 0 ];
-   second_character = identifier[ 1 ];
+    first_character  = identifier[ 0 ];
+    second_character = identifier[ 1 ];
 
-   /*
-   ** Set up our default return value
-   */
+    /*
+    ** Set up our default return value
+    */
 
-   expanded_identifier = _T("Unknown - ");
-   expanded_identifier += identifier;
+    expanded_identifier = _T( "Unknown - " );
+    expanded_identifier += identifier;
 
-   switch( first_character )
-   {
-      case 'A': // AG, AP
+    switch ( first_character )
+    {
+    case 'A': // AG, AP
 
-         switch( second_character )
-         {
-            case 'G': // AG
+        switch ( second_character )
+        {
+        case 'G': // AG
 
-                expanded_identifier = _T("Autopilot - General");
-               break;
+            expanded_identifier = _T( "Autopilot - General" );
+            break;
 
-            case 'P': // AP
+        case 'P': // AP
 
-                expanded_identifier = _T("Autopilot - Magnetic");
-               break;
-         }
+            expanded_identifier = _T( "Autopilot - Magnetic" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'C': // CD, CS, CT, CV, CX and CC,CM
+    case 'C': // CD, CS, CT, CV, CX and CC,CM
 
-         switch( second_character )
-         {
-            case 'C': // CC
+        switch ( second_character )
+        {
+        case 'C': // CC
 
-                expanded_identifier = _T("Commputer - Programmed Calculator (outdated)");
-               break;
+            expanded_identifier = _T( "Commputer - Programmed Calculator (outdated)" );
+            break;
 
-            case 'D': // CD
+        case 'D': // CD
 
-                expanded_identifier = _T("Communications - Digital Selective Calling (DSC)");
-               break;
+            expanded_identifier = _T( "Communications - Digital Selective Calling (DSC)" );
+            break;
 
-            case 'M': // CM
+        case 'M': // CM
 
-                expanded_identifier = _T("Computer - Memory Data (outdated)");
-               break;
+            expanded_identifier = _T( "Computer - Memory Data (outdated)" );
+            break;
 
-            case 'S': // CS
+        case 'S': // CS
 
-                expanded_identifier = _T("Communications - Satellite");
-               break;
+            expanded_identifier = _T( "Communications - Satellite" );
+            break;
 
-            case 'T': // CT
+        case 'T': // CT
 
-                expanded_identifier = _T("Communications - Radio-Telephone (MF/HF)");
-               break;
+            expanded_identifier = _T( "Communications - Radio-Telephone (MF/HF)" );
+            break;
 
-            case 'V': // CV
+        case 'V': // CV
 
-                expanded_identifier = _T("Communications - Radio-Telephone (VHF)");
-               break;
+            expanded_identifier = _T( "Communications - Radio-Telephone (VHF)" );
+            break;
 
-            case 'X': // CX
+        case 'X': // CX
 
-                expanded_identifier = _T("Communications - Scanning Receiver");
-               break;
-         }
+            expanded_identifier = _T( "Communications - Scanning Receiver" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'D': // DE, DF
+    case 'D': // DE, DF
 
-         switch( second_character )
-         {
-            case 'E': // DE
+        switch ( second_character )
+        {
+        case 'E': // DE
 
-                expanded_identifier = _T("DECCA Navigation");
-               break;
+            expanded_identifier = _T( "DECCA Navigation" );
+            break;
 
-            case 'F': // DF
+        case 'F': // DF
 
-                expanded_identifier = _T("Direction Finder");
-               break;
-         }
+            expanded_identifier = _T( "Direction Finder" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'E': // EC, EP, ER
+    case 'E': // EC, EP, ER
 
-         switch( second_character )
-         {
-            case 'C': // EC
+        switch ( second_character )
+        {
+        case 'C': // EC
 
-                expanded_identifier = _T("Electronic Chart Display & Information System (ECDIS)");
-               break;
+            expanded_identifier = _T( "Electronic Chart Display & Information System (ECDIS)" );
+            break;
 
-            case 'P': // EP
+        case 'P': // EP
 
-                expanded_identifier = _T("Emergency Position Indicating Beacon (EPIRB)");
-               break;
+            expanded_identifier = _T( "Emergency Position Indicating Beacon (EPIRB)" );
+            break;
 
-            case 'R': // ER
+        case 'R': // ER
 
-                expanded_identifier = _T("Engine Room Monitoring Systems");
-               break;
-         }
+            expanded_identifier = _T( "Engine Room Monitoring Systems" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'G': // GP
+    case 'G': // GP
 
-         switch( second_character )
-         {
-            case 'P': // GP
+        switch ( second_character )
+        {
+        case 'P': // GP
 
-                expanded_identifier = _T("Global Positioning System (GPS)");
-               break;
-         }
+            expanded_identifier = _T( "Global Positioning System (GPS)" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'H': // HC, HE, HN
+    case 'H': // HC, HE, HN
 
-         switch( second_character )
-         {
-            case 'C': // HC
+        switch ( second_character )
+        {
+        case 'C': // HC
 
-                expanded_identifier = _T("Heading - Magnetic Compass");
-               break;
+            expanded_identifier = _T( "Heading - Magnetic Compass" );
+            break;
 
-            case 'E': // HE
+        case 'E': // HE
 
-                expanded_identifier = _T("Heading - North Seeking Gyro");
-               break;
+            expanded_identifier = _T( "Heading - North Seeking Gyro" );
+            break;
 
-            case 'N': // HN
+        case 'N': // HN
 
-                expanded_identifier = _T("Heading - Non North Seeking Gyro");
-               break;
-         }
+            expanded_identifier = _T( "Heading - Non North Seeking Gyro" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'I': // II, IN
+    case 'I': // II, IN
 
-         switch( second_character )
-         {
-            case 'I': // II
+        switch ( second_character )
+        {
+        case 'I': // II
 
-                expanded_identifier = _T("Integrated Instrumentation");
-               break;
+            expanded_identifier = _T( "Integrated Instrumentation" );
+            break;
 
-            case 'N': // IN
+        case 'N': // IN
 
-                expanded_identifier = _T("Integrated Navigation");
-               break;
-         }
+            expanded_identifier = _T( "Integrated Navigation" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'L': // LA, LC
+    case 'L': // LA, LC
 
-         switch( second_character )
-         {
-            case 'A': // LA
+        switch ( second_character )
+        {
+        case 'A': // LA
 
-                expanded_identifier = _T("Loran A");
-               break;
+            expanded_identifier = _T( "Loran A" );
+            break;
 
-            case 'C': // LC
+        case 'C': // LC
 
-                expanded_identifier = _T("Loran C");
-               break;
-         }
+            expanded_identifier = _T( "Loran C" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'M': // MP
+    case 'M': // MP
 
-         switch( second_character )
-         {
-            case 'P': // MP
+        switch ( second_character )
+        {
+        case 'P': // MP
 
-                expanded_identifier = _T("Microwave Positioning System (outdated)");
-               break;
-         }
+            expanded_identifier = _T( "Microwave Positioning System (outdated)" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'O': // OM, OS
+    case 'O': // OM, OS
 
-         switch( second_character )
-         {
-            case 'M': // OM
+        switch ( second_character )
+        {
+        case 'M': // OM
 
-                expanded_identifier = _T("OMEGA Navigation System");
-               break;
+            expanded_identifier = _T( "OMEGA Navigation System" );
+            break;
 
-            case 'S': // OS
+        case 'S': // OS
 
-                expanded_identifier = _T("Distress Alarm System (outdated)");
-               break;
-         }
+            expanded_identifier = _T( "Distress Alarm System (outdated)" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'P': // P
+    case 'P': // P
 
-         break;
+        break;
 
-      case 'R': // RA
+    case 'R': // RA
 
-         switch( second_character )
-         {
-            case 'A': // RA
+        switch ( second_character )
+        {
+        case 'A': // RA
 
-                expanded_identifier = _T("RADAR and/or ARPA");
-               break;
-         }
+            expanded_identifier = _T( "RADAR and/or ARPA" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'S': // SD, SN, SS
+    case 'S': // SD, SN, SS
 
-         switch( second_character )
-         {
-            case 'D': // SD
+        switch ( second_character )
+        {
+        case 'D': // SD
 
-                expanded_identifier = _T("Sounder, Depth");
-               break;
+            expanded_identifier = _T( "Sounder, Depth" );
+            break;
 
-            case 'N': // SN
+        case 'N': // SN
 
-                expanded_identifier = _T("Electronic Positioning System, other/general");
-               break;
+            expanded_identifier = _T( "Electronic Positioning System, other/general" );
+            break;
 
-            case 'S': // SS
+        case 'S': // SS
 
-                expanded_identifier = _T("Sounder, Scanning");
-               break;
-         }
+            expanded_identifier = _T( "Sounder, Scanning" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'T': // TI, TR
+    case 'T': // TI, TR
 
-         switch( second_character )
-         {
-            case 'I': // TI
+        switch ( second_character )
+        {
+        case 'I': // TI
 
-                expanded_identifier = _T("Turn Rate Indicator");
-               break;
+            expanded_identifier = _T( "Turn Rate Indicator" );
+            break;
 
-            case 'R': // TR
+        case 'R': // TR
 
-                expanded_identifier = _T("TRANSIT Navigation System");
-               break;
-         }
+            expanded_identifier = _T( "TRANSIT Navigation System" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'V': // VD, VM, VW
+    case 'V': // VD, VM, VW
 
-         switch( second_character )
-         {
-            case 'D': // VD
+        switch ( second_character )
+        {
+        case 'D': // VD
 
-                expanded_identifier = _T("Velocity Sensor, Doppler, other/general");
-               break;
+            expanded_identifier = _T( "Velocity Sensor, Doppler, other/general" );
+            break;
 
-            case 'M': // VM
+        case 'M': // VM
 
-                expanded_identifier = _T("Velocity Sensor, Speed Log, Water, Magnetic");
-               break;
+            expanded_identifier = _T( "Velocity Sensor, Speed Log, Water, Magnetic" );
+            break;
 
-            case 'W': // VW
+        case 'W': // VW
 
-                expanded_identifier = _T("Velocity Sensor, Speed Log, Water, Mechanical");
-               break;
-         }
+            expanded_identifier = _T( "Velocity Sensor, Speed Log, Water, Mechanical" );
+            break;
+        }
 
-         break;
+        break;
 
 
-      case 'W': // WI
+    case 'W': // WI
 
-         switch( second_character )
-         {
-            case 'I': // WI
+        switch ( second_character )
+        {
+        case 'I': // WI
 
-                expanded_identifier = _T("Weather Instruments");
-               break;
-         }
+            expanded_identifier = _T( "Weather Instruments" );
+            break;
+        }
 
-         break;
+        break;
 
-      case 'Y': // YC, YD, YF, YL, YP, YR, YT, YV, YX
+    case 'Y': // YC, YD, YF, YL, YP, YR, YT, YV, YX
 
-         switch( second_character )
-         {
-            case 'C': // YC
+        switch ( second_character )
+        {
+        case 'C': // YC
 
-                expanded_identifier = _T("Transducer - Temperature (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Temperature (outdated)" );
+            break;
 
-            case 'D': // YD
+        case 'D': // YD
 
-                expanded_identifier = _T("Transducer - Displacement, Angular or Linear (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Displacement, Angular or Linear (outdated)" );
+            break;
 
-            case 'F': // YF
+        case 'F': // YF
 
-                expanded_identifier = _T("Transducer - Frequency (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Frequency (outdated)" );
+            break;
 
-            case 'L': // YL
+        case 'L': // YL
 
-                expanded_identifier = _T("Transducer - Level (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Level (outdated)" );
+            break;
 
-            case 'P': // YP
+        case 'P': // YP
 
-                expanded_identifier = _T("Transducer - Pressure (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Pressure (outdated)" );
+            break;
 
-            case 'R': // YR
+        case 'R': // YR
 
-                expanded_identifier = _T("Transducer - Flow Rate (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Flow Rate (outdated)" );
+            break;
 
-            case 'T': // YT
+        case 'T': // YT
 
-                expanded_identifier = _T("Transducer - Tachometer (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Tachometer (outdated)" );
+            break;
 
-            case 'V': // YV
+        case 'V': // YV
 
-                expanded_identifier = _T("Transducer - Volume (outdated)");
-               break;
+            expanded_identifier = _T( "Transducer - Volume (outdated)" );
+            break;
 
-            case 'X': // YX
+        case 'X': // YX
 
-                expanded_identifier = _T("Transducer");
-               break;
+            expanded_identifier = _T( "Transducer" );
+            break;
 
-         }
+        }
 
-         break;
+        break;
 
-      case 'Z': // ZA, ZC, ZQ, ZV
+    case 'Z': // ZA, ZC, ZQ, ZV
 
-         switch( second_character )
-         {
-            case 'A': // ZA
+        switch ( second_character )
+        {
+        case 'A': // ZA
 
-                expanded_identifier = _T("Timekeeper - Atomic Clock");
-               break;
+            expanded_identifier = _T( "Timekeeper - Atomic Clock" );
+            break;
 
-            case 'C': // ZC
+        case 'C': // ZC
 
-                expanded_identifier = _T("Timekeeper - Chronometer");
-               break;
+            expanded_identifier = _T( "Timekeeper - Chronometer" );
+            break;
 
-            case 'Q': // ZQ
+        case 'Q': // ZQ
 
-                expanded_identifier = _T("Timekeeper - Quartz");
-               break;
+            expanded_identifier = _T( "Timekeeper - Quartz" );
+            break;
 
-            case 'V': // ZV
+        case 'V': // ZV
 
-                expanded_identifier = _T("Timekeeper - Radio Update, WWV or WWVH");
-               break;
-         }
+            expanded_identifier = _T( "Timekeeper - Radio Update, WWV or WWVH" );
+            break;
+        }
 
-         break;
-   }
+        break;
+    }
 
-   return( expanded_identifier );
+    return ( expanded_identifier );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gga.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gga.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gga.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gga.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -45,131 +45,131 @@
 
 GGA::GGA()
 {
-   Mnemonic = _T("GGA");
-   Empty();
+    Mnemonic = _T( "GGA" );
+    Empty();
 }
 
 GGA::~GGA()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void GGA::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   UTCTime.Empty();
-   Position.Empty();
-   GPSQuality                      = 0;
-   NumberOfSatellitesInUse         = 0;
-   HorizontalDilutionOfPrecision   = 0.0;
-   AntennaAltitudeMeters           = 0.0;
-   GeoidalSeparationMeters         = 0.0;
-   AgeOfDifferentialGPSDataSeconds = 0.0;
-   DifferentialReferenceStationID  = 0;
+    UTCTime.Empty();
+    Position.Empty();
+    GPSQuality                      = 0;
+    NumberOfSatellitesInUse         = 0;
+    HorizontalDilutionOfPrecision   = 0.0;
+    AntennaAltitudeMeters           = 0.0;
+    GeoidalSeparationMeters         = 0.0;
+    AgeOfDifferentialGPSDataSeconds = 0.0;
+    DifferentialReferenceStationID  = 0;
 }
 
 bool GGA::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** GGA - Global Positioning System Fix Data
-   ** Time, Position and fix related data fora GPS receiver.
-   **
-   **                                                      11
-   **        1         2       3 4        5 6 7  8   9  10 |  12 13  14   15
-   **        |         |       | |        | | |  |   |   | |   | |   |    |
-   ** $--GGA,hhmmss.ss,llll.ll,a,yyyyy.yy,a,x,xx,x.x,x.x,M,x.x,M,x.x,xxxx*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Universal Time Coordinated (UTC)
-   **  2) Latitude
-   **  3) N or S (North or South)
-   **  4) Longitude
-   **  5) E or W (East or West)
-   **  6) GPS Quality Indicator,
-   **     0 - fix not available,
-   **     1 - GPS fix,
-   **     2 - Differential GPS fix
-   **  7) Number of satellites in view, 00 - 12
-   **  8) Horizontal Dilution of precision
-   **  9) Antenna Altitude above/below mean-sea-level (geoid)
-   ** 10) Units of antenna altitude, meters
-   ** 11) Geoidal separation, the difference between the WGS-84 earth
-   **     ellipsoid and mean-sea-level (geoid), "-" means mean-sea-level
-   **     below ellipsoid
-   ** 12) Units of geoidal separation, meters
-   ** 13) Age of differential GPS data, time in seconds since last SC104
-   **     type 1 or 9 update, null field when DGPS is not used
-   ** 14) Differential reference station ID, 0000-1023
-   ** 15) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 15 ) ==NTrue )
-   {
-      SetErrorMessage( _T("Invalid Checksum" ));
-      return( FALSE );
-   }
-
-   UTCTime                         = sentence.Field( 1 );
-   Position.Parse( 2, 3, 4, 5, sentence );
-   GPSQuality                      = sentence.Integer( 6 );
-   NumberOfSatellitesInUse         = sentence.Integer( 7 );
-   HorizontalDilutionOfPrecision   = sentence.Double( 8 );
-   AntennaAltitudeMeters           = sentence.Double( 9 );
-   GeoidalSeparationMeters         = sentence.Double( 11 );
-   AgeOfDifferentialGPSDataSeconds = sentence.Double( 13 );
-   DifferentialReferenceStationID  = sentence.Integer( 14 );
+    /*
+    ** GGA - Global Positioning System Fix Data
+    ** Time, Position and fix related data fora GPS receiver.
+    **
+    **                                                      11
+    **        1         2       3 4        5 6 7  8   9  10 |  12 13  14   15
+    **        |         |       | |        | | |  |   |   | |   | |   |    |
+    ** $--GGA,hhmmss.ss,llll.ll,a,yyyyy.yy,a,x,xx,x.x,x.x,M,x.x,M,x.x,xxxx*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Universal Time Coordinated (UTC)
+    **  2) Latitude
+    **  3) N or S (North or South)
+    **  4) Longitude
+    **  5) E or W (East or West)
+    **  6) GPS Quality Indicator,
+    **     0 - fix not available,
+    **     1 - GPS fix,
+    **     2 - Differential GPS fix
+    **  7) Number of satellites in view, 00 - 12
+    **  8) Horizontal Dilution of precision
+    **  9) Antenna Altitude above/below mean-sea-level (geoid)
+    ** 10) Units of antenna altitude, meters
+    ** 11) Geoidal separation, the difference between the WGS-84 earth
+    **     ellipsoid and mean-sea-level (geoid), "-" means mean-sea-level
+    **     below ellipsoid
+    ** 12) Units of geoidal separation, meters
+    ** 13) Age of differential GPS data, time in seconds since last SC104
+    **     type 1 or 9 update, null field when DGPS is not used
+    ** 14) Differential reference station ID, 0000-1023
+    ** 15) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 15 ) ==NTrue )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    UTCTime                         = sentence.Field( 1 );
+    Position.Parse( 2, 3, 4, 5, sentence );
+    GPSQuality                      = sentence.Integer( 6 );
+    NumberOfSatellitesInUse         = sentence.Integer( 7 );
+    HorizontalDilutionOfPrecision   = sentence.Double( 8 );
+    AntennaAltitudeMeters           = sentence.Double( 9 );
+    GeoidalSeparationMeters         = sentence.Double( 11 );
+    AgeOfDifferentialGPSDataSeconds = sentence.Double( 13 );
+    DifferentialReferenceStationID  = sentence.Integer( 14 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool GGA::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-
-   RESPONSE::Write( sentence );
-
-   sentence += UTCTime;
-   sentence += Position;
-   sentence += GPSQuality;
-   sentence += NumberOfSatellitesInUse;
-   sentence += HorizontalDilutionOfPrecision;
-   sentence += AntennaAltitudeMeters;
-   sentence += _T("M");
-   sentence += GeoidalSeparationMeters;
-   sentence += _T("M");
-   sentence += AgeOfDifferentialGPSDataSeconds;
-   sentence += DifferentialReferenceStationID;
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += UTCTime;
+    sentence += Position;
+    sentence += GPSQuality;
+    sentence += NumberOfSatellitesInUse;
+    sentence += HorizontalDilutionOfPrecision;
+    sentence += AntennaAltitudeMeters;
+    sentence += _T( "M" );
+    sentence += GeoidalSeparationMeters;
+    sentence += _T( "M" );
+    sentence += AgeOfDifferentialGPSDataSeconds;
+    sentence += DifferentialReferenceStationID;
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const GGA& GGA::operator = ( const GGA& source )
 {
 //   ASSERT_VALID( this );
 
-   UTCTime                         = source.UTCTime;
-   Position                        = source.Position;
-   GPSQuality                      = source.GPSQuality;
-   NumberOfSatellitesInUse         = source.NumberOfSatellitesInUse;
-   HorizontalDilutionOfPrecision   = source.HorizontalDilutionOfPrecision;
-   AntennaAltitudeMeters           = source.AntennaAltitudeMeters;
-   GeoidalSeparationMeters         = source.GeoidalSeparationMeters;
-   AgeOfDifferentialGPSDataSeconds = source.AgeOfDifferentialGPSDataSeconds;
-   DifferentialReferenceStationID  = source.DifferentialReferenceStationID;
+    UTCTime                         = source.UTCTime;
+    Position                        = source.Position;
+    GPSQuality                      = source.GPSQuality;
+    NumberOfSatellitesInUse         = source.NumberOfSatellitesInUse;
+    HorizontalDilutionOfPrecision   = source.HorizontalDilutionOfPrecision;
+    AntennaAltitudeMeters           = source.AntennaAltitudeMeters;
+    GeoidalSeparationMeters         = source.GeoidalSeparationMeters;
+    AgeOfDifferentialGPSDataSeconds = source.AgeOfDifferentialGPSDataSeconds;
+    DifferentialReferenceStationID  = source.DifferentialReferenceStationID;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gga.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gga.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gga.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gga.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,38 +44,38 @@
 class GGA : public RESPONSE
 {
 
-   public:
+public:
 
-      GGA();
-     ~GGA();
+    GGA();
+    ~GGA();
 
-      /*
-      ** Data
-      */
-
-      wxString         UTCTime;
-      LATLONG          Position;
-      int              GPSQuality;
-      int              NumberOfSatellitesInUse;
-      double           HorizontalDilutionOfPrecision;
-      double           AntennaAltitudeMeters;
-      double           GeoidalSeparationMeters;
-      double           AgeOfDifferentialGPSDataSeconds;
-      int              DifferentialReferenceStationID;
-
-      /*
-      ** Methods
-      */
-
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
-
-      /*
-      ** Operators
-      */
+    /*
+    ** Data
+    */
+
+    wxString         UTCTime;
+    LATLONG          Position;
+    int              GPSQuality;
+    int              NumberOfSatellitesInUse;
+    double           HorizontalDilutionOfPrecision;
+    double           AntennaAltitudeMeters;
+    double           GeoidalSeparationMeters;
+    double           AgeOfDifferentialGPSDataSeconds;
+    int              DifferentialReferenceStationID;
+
+    /*
+    ** Methods
+    */
+
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
+
+    /*
+    ** Operators
+    */
 
-      virtual const GGA& operator = ( const GGA& source );
+    virtual const GGA& operator = ( const GGA& source );
 };
 
 #endif // GGA_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gll.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gll.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gll.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gll.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -45,98 +45,98 @@
 
 GLL::GLL()
 {
-   Mnemonic = _T("GLL");
-   Empty();
+    Mnemonic = _T( "GLL" );
+    Empty();
 }
 
 GLL::~GLL()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void GLL::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   Position.Empty();
-   UTCTime.Empty();
-   IsDataValid = Unknown0183;
+    Position.Empty();
+    UTCTime.Empty();
+    IsDataValid = Unknown0183;
 }
 
 bool GLL::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** GLL - Geographic Position - Latitude/Longitude
-   ** Latitude, N/S, Longitude, E/W, UTC, Status
-   **
-   **        +-------------------------------- 1) Latitude
-   **        |       +------------------------ 2) N or S (North or South)
-   **        |       | +---------------------- 3) Longitude
-   **        |       | |        +------------- 4) E or W (East or West)
-   **        |       | |        | +----------- 5) Universal Time Coordinated (UTC)
-   **        |       | |        | |         +- 6) Status A - Data Valid, V - Data Invalid
-   **        |       | |        | |         | +7) Checksum
-   ** $--GLL,llll.ll,a,yyyyy.yy,a,hhmmss.ss,A*hh<CR><LF>
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-      int target_field_count = 6;
-
-      NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 7 );
-
-      if ( check == NTrue )
-      {
-
-  /*
-            ** This may be an NMEA Version 2.3 sentence, with "Mode" field
-  */
-            wxString checksum_in_sentence = sentence.Field( 7 );
-            if(checksum_in_sentence.StartsWith(_T("*")))       // Field is a valid erroneous checksum
+    /*
+    ** GLL - Geographic Position - Latitude/Longitude
+    ** Latitude, N/S, Longitude, E/W, UTC, Status
+    **
+    **        +-------------------------------- 1) Latitude
+    **        |       +------------------------ 2) N or S (North or South)
+    **        |       | +---------------------- 3) Longitude
+    **        |       | |        +------------- 4) E or W (East or West)
+    **        |       | |        | +----------- 5) Universal Time Coordinated (UTC)
+    **        |       | |        | |         +- 6) Status A - Data Valid, V - Data Invalid
+    **        |       | |        | |         | +7) Checksum
+    ** $--GLL,llll.ll,a,yyyyy.yy,a,hhmmss.ss,A*hh<CR><LF>
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    int target_field_count = 6;
+
+    NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 7 );
+
+    if ( check == NTrue )
+    {
+
+        /*
+                  ** This may be an NMEA Version 2.3 sentence, with "Mode" field
+        */
+        wxString checksum_in_sentence = sentence.Field( 7 );
+        if ( checksum_in_sentence.StartsWith( _T( "*" ) ) ) // Field is a valid erroneous checksum
+        {
+            SetErrorMessage( _T( "Invalid Checksum" ) );
+            return ( FALSE );
+        }
+
+        else
+        {
+            target_field_count = 7;
+            check = sentence.IsChecksumBad( 8 );
+            if ( check == NTrue )
             {
-                  SetErrorMessage( _T("Invalid Checksum") );
-                  return( FALSE );
+                SetErrorMessage( _T( "Invalid Checksum" ) );
+                return ( FALSE );
             }
-
-            else
-            {
-                  target_field_count = 7;
-                  check = sentence.IsChecksumBad( 8 );
-                  if( check == NTrue)
-                  {
-                        SetErrorMessage( _T("Invalid Checksum") );
-                        return( FALSE );
-                  }
-            }
-      }
+        }
+    }
 
 
-      if ( sentence.GetNumberOfDataFields() == target_field_count )
-      {
-            Position.Parse( 1, 2, 3, 4, sentence );
-            UTCTime     = sentence.Field( 5 );
-            IsDataValid = sentence.Boolean( 6 );
-
-            return( TRUE );
-      }
-
-      //    May be old style GLL sentence
-      if ( sentence.GetNumberOfDataFields() == 4 )
-      {
-            Position.Parse( 1, 2, 3, 4, sentence );
-            IsDataValid = NTrue;
-
-            return( TRUE );
-      }
-
-      //    A real error...
-      SetErrorMessage( _T("Invalid FieldCount") );
-      return( FALSE );
+    if ( sentence.GetNumberOfDataFields() == target_field_count )
+    {
+        Position.Parse( 1, 2, 3, 4, sentence );
+        UTCTime     = sentence.Field( 5 );
+        IsDataValid = sentence.Boolean( 6 );
+
+        return ( TRUE );
+    }
+
+    //    May be old style GLL sentence
+    if ( sentence.GetNumberOfDataFields() == 4 )
+    {
+        Position.Parse( 1, 2, 3, 4, sentence );
+        IsDataValid = NTrue;
+
+        return ( TRUE );
+    }
+
+    //    A real error...
+    SetErrorMessage( _T( "Invalid FieldCount" ) );
+    return ( FALSE );
 }
 
 
@@ -144,22 +144,22 @@
 {
 //   ASSERT_VALID( this );
 
-   static wxString return_string;
+    static wxString return_string;
 
-   return_string.Empty();
-/*
-   char temp_string[ 128 ];
-
-   sprintf( temp_string, "At %d, you were at Latitude %ld %s, Longitude %ld %s.",
-            (const char *) UTCTime,
-            Position.Latitude.Latitude,
-            ( Position.Latitude.Northing == North ) ? "North" : "South",
-            Position.Longitude.Longitude,
-            ( Position.Longitude.Easting == East ) ? "East" : "West" );
-
-   return_string = temp_string;
-*/
-   return( return_string );
+    return_string.Empty();
+    /*
+       char temp_string[ 128 ];
+
+       sprintf( temp_string, "At %d, you were at Latitude %ld %s, Longitude %ld %s.",
+                (const char *) UTCTime,
+                Position.Latitude.Latitude,
+                ( Position.Latitude.Northing == North ) ? "North" : "South",
+                Position.Longitude.Longitude,
+                ( Position.Longitude.Easting == East ) ? "East" : "West" );
+
+       return_string = temp_string;
+    */
+    return ( return_string );
 }
 
 
@@ -167,28 +167,28 @@
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
+    /*
+    ** Let the parent do its thing
+    */
 
-   RESPONSE::Write( sentence );
+    RESPONSE::Write( sentence );
 
-   sentence += Position;
-   sentence += UTCTime;
-   sentence += IsDataValid;
+    sentence += Position;
+    sentence += UTCTime;
+    sentence += IsDataValid;
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const GLL& GLL::operator = ( const GLL& source )
 {
 //   ASSERT_VALID( this );
 
-   Position    = source.Position;
-   UTCTime     = source.UTCTime;
-   IsDataValid = source.IsDataValid;
+    Position    = source.Position;
+    UTCTime     = source.UTCTime;
+    IsDataValid = source.IsDataValid;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gll.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gll.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gll.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gll.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,33 +44,33 @@
 class GLL : public RESPONSE
 {
 
-   public:
+public:
 
-      GLL();
-     ~GLL();
+    GLL();
+    ~GLL();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      wxString          UTCTime;
-      NMEA0183L_BOOLEAN IsDataValid;
-      LATLONG          Position;
+    wxString          UTCTime;
+    NMEA0183L_BOOLEAN IsDataValid;
+    LATLONG          Position;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual const wxString& PlainEnglish( void );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual const wxString& PlainEnglish( void );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const GLL& operator = ( const GLL& source );
+    virtual const GLL& operator = ( const GLL& source );
 };
 
 #endif // GLL_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gsv.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gsv.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gsv.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gsv.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,21 +43,21 @@
 
 GSV::GSV()
 {
-   Mnemonic = _T("GSV");
-   Empty();
+    Mnemonic = _T( "GSV" );
+    Empty();
 }
 
 GSV::~GSV()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void GSV::Empty( void )
 {
 //   NumberOfMessages = 0;
 //   MessageNumber = 0;
-   SatsInView = 0;
+    SatsInView = 0;
 //   for (int idx = 0; idx < 4; idx++)
 //   {
 //         SatInfo[idx].SatNumber = 0;
@@ -69,46 +69,46 @@
 
 bool GSV::Parse( const SENTENCE& sentence )
 {
-/*
-  $GPGSV,2,1,08,01,40,083,46,02,17,308,41,12,07,344,39,14,22,228,45*75
+    /*
+      $GPGSV,2,1,08,01,40,083,46,02,17,308,41,12,07,344,39,14,22,228,45*75
 
-Where:
-      GSV          Satellites in view
-      2            Number of sentences for full data
-      1            sentence 1 of 2
-      08           Number of satellites in view
-
-      01           Satellite PRN number
-      40           Elevation, degrees
-      083          Azimuth, degrees
-      46           SNR - higher is better
-           for up to 4 satellites per sentence
-      *75          the checksum data, always begins with *
-*/
-
-
-   /*
-   ** GSV - GPS satellite Status
-   **
-   **        1 2 3 4 5 6 7         n
-   **        | | | | | | |         |
-   ** $--GSV,x,x,x,x,x,x,x.........*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Number of sentences for full data
-   **  2) sentence number
-   **  3) Number of satellites in view
-   **  4) Satellite PRN number
-   **  5) Elevation, degrees
-   **  6) Azimuth, degrees
-   **  7) SNR - higher is better
-   **  Fields 4-7 may repeat up to 4 times per sentence
-   **  n) Checksum
-   */
-
-   /*
-   ** Ignore the checksum...
-   */
+    Where:
+          GSV          Satellites in view
+          2            Number of sentences for full data
+          1            sentence 1 of 2
+          08           Number of satellites in view
+
+          01           Satellite PRN number
+          40           Elevation, degrees
+          083          Azimuth, degrees
+          46           SNR - higher is better
+               for up to 4 satellites per sentence
+          *75          the checksum data, always begins with *
+    */
+
+
+    /*
+    ** GSV - GPS satellite Status
+    **
+    **        1 2 3 4 5 6 7         n
+    **        | | | | | | |         |
+    ** $--GSV,x,x,x,x,x,x,x.........*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Number of sentences for full data
+    **  2) sentence number
+    **  3) Number of satellites in view
+    **  4) Satellite PRN number
+    **  5) Elevation, degrees
+    **  6) Azimuth, degrees
+    **  7) SNR - higher is better
+    **  Fields 4-7 may repeat up to 4 times per sentence
+    **  n) Checksum
+    */
+
+    /*
+    ** Ignore the checksum...
+    */
 
 //   /*
 //   ** First we check the checksum...
@@ -146,7 +146,7 @@
 //
 //   NumberOfMessages = sentence.Integer( 1 );
 //   MessageNumber = sentence.Integer( 2 );
-   SatsInView = sentence.Integer( 3 );
+    SatsInView = sentence.Integer( 3 );
 
 //   for (int idx = 0; idx < satInfoCnt; idx++)
 //   {
@@ -156,23 +156,23 @@
 //         SatInfo[idx].SignalToNoiseRatio = sentence.Integer( idx*4+7 );
 //   }
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool GSV::Write( SENTENCE& sentence )
 {
-   /*
-   ** Let the parent do its thing
-   */
+    /*
+    ** Let the parent do its thing
+    */
 
-   RESPONSE::Write( sentence );
+    RESPONSE::Write( sentence );
 
 //   sentence += NumberOfMessages;
 //   sentence += MessageNumber;
-   sentence += 1;
-   sentence += 1;
-   sentence += SatsInView;
-   
+    sentence += 1;
+    sentence += 1;
+    sentence += SatsInView;
+
 //   for (int idx = 0; idx < 4; idx++)
 //   {
 //         sentence += SatInfo[idx].SatNumber;
@@ -181,16 +181,16 @@
 //         sentence += SatInfo[idx].SignalToNoiseRatio;
 //   }
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const GSV& GSV::operator = ( const GSV& source )
 {
 //   NumberOfMessages = source.NumberOfMessages;
 //   MessageNumber = source.MessageNumber;
-   SatsInView = source.SatsInView;
+    SatsInView = source.SatsInView;
 
 //   for (int idx = 0; idx < 4; idx++)
 //   {
@@ -200,5 +200,5 @@
 //         SatInfo[idx].SignalToNoiseRatio = source.SatInfo[idx].SignalToNoiseRatio;
 //   }
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gsv.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gsv.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/gsv.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/gsv.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,30 +44,30 @@
 class GSV : public RESPONSE
 {
 
-   public:
+public:
 
-      GSV();
-     ~GSV();
+    GSV();
+    ~GSV();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      int   SatsInView;
+    int   SatsInView;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const GSV& operator = ( const GSV& source );
+    virtual const GSV& operator = ( const GSV& source );
 };
 
 #endif // GSV_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdg.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdg.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdg.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdg.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -42,88 +42,88 @@
 
 HDG::HDG()
 {
-   Mnemonic = _T("HDG");
-   Empty();
+    Mnemonic = _T( "HDG" );
+    Empty();
 }
 
 HDG::~HDG()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void HDG::Empty( void )
 {
-   MagneticSensorHeadingDegrees = 0.0;
-   MagneticDeviationDegrees     = 0.0;
-   MagneticDeviationDirection   = EW_Unknown;
-   MagneticVariationDegrees     = 0.0;
-   MagneticVariationDirection   = EW_Unknown;
+    MagneticSensorHeadingDegrees = 0.0;
+    MagneticDeviationDegrees     = 0.0;
+    MagneticDeviationDirection   = EW_Unknown;
+    MagneticVariationDegrees     = 0.0;
+    MagneticVariationDirection   = EW_Unknown;
 }
 
 bool HDG::Parse( const SENTENCE& sentence )
 {
-   /*
-   ** HDG - Heading - Deviation & Variation
-   **
-   **        1   2   3 4   5 6
-   **        |   |   | |   | |
-   ** $--HDG,x.x,x.x,a,x.x,a*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Magnetic Sensor heading in degrees
-   **  2) Magnetic Deviation, degrees
-   **  3) Magnetic Deviation direction, E = Easterly, W = Westerly
-   **  4) Magnetic Variation degrees
-   **  5) Magnetic Variation direction, E = Easterly, W = Westerly
-   **  6) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 6 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   }
-
-   MagneticSensorHeadingDegrees = sentence.Double( 1 );
-   MagneticDeviationDegrees     = sentence.Double( 2 );
-   MagneticDeviationDirection   = sentence.EastOrWest( 3 );
-   MagneticVariationDegrees     = sentence.Double( 4 );
-   MagneticVariationDirection   = sentence.EastOrWest( 5 );
+    /*
+    ** HDG - Heading - Deviation & Variation
+    **
+    **        1   2   3 4   5 6
+    **        |   |   | |   | |
+    ** $--HDG,x.x,x.x,a,x.x,a*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Magnetic Sensor heading in degrees
+    **  2) Magnetic Deviation, degrees
+    **  3) Magnetic Deviation direction, E = Easterly, W = Westerly
+    **  4) Magnetic Variation degrees
+    **  5) Magnetic Variation direction, E = Easterly, W = Westerly
+    **  6) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 6 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    MagneticSensorHeadingDegrees = sentence.Double( 1 );
+    MagneticDeviationDegrees     = sentence.Double( 2 );
+    MagneticDeviationDirection   = sentence.EastOrWest( 3 );
+    MagneticVariationDegrees     = sentence.Double( 4 );
+    MagneticVariationDirection   = sentence.EastOrWest( 5 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool HDG::Write( SENTENCE& sentence )
 {
-   /*
-   ** Let the parent do its thing
-   */
+    /*
+    ** Let the parent do its thing
+    */
 
-   RESPONSE::Write( sentence );
+    RESPONSE::Write( sentence );
 
-   sentence += MagneticSensorHeadingDegrees;
-   sentence += MagneticDeviationDegrees;
-   sentence += MagneticDeviationDirection;
-   sentence += MagneticVariationDegrees;
-   sentence += MagneticVariationDirection;
+    sentence += MagneticSensorHeadingDegrees;
+    sentence += MagneticDeviationDegrees;
+    sentence += MagneticDeviationDirection;
+    sentence += MagneticVariationDegrees;
+    sentence += MagneticVariationDirection;
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const HDG& HDG::operator = ( const HDG& source )
 {
-   MagneticSensorHeadingDegrees = source.MagneticSensorHeadingDegrees;
-   MagneticDeviationDegrees     = source.MagneticDeviationDegrees;
-   MagneticDeviationDirection   = source.MagneticDeviationDirection;
-   MagneticVariationDegrees     = source.MagneticVariationDegrees;
-   MagneticVariationDirection   = source.MagneticVariationDirection;
+    MagneticSensorHeadingDegrees = source.MagneticSensorHeadingDegrees;
+    MagneticDeviationDegrees     = source.MagneticDeviationDegrees;
+    MagneticDeviationDirection   = source.MagneticDeviationDirection;
+    MagneticVariationDegrees     = source.MagneticVariationDegrees;
+    MagneticVariationDirection   = source.MagneticVariationDirection;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdg.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdg.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdg.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdg.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,34 +44,34 @@
 class HDG : public RESPONSE
 {
 
-   public:
+public:
 
-      HDG();
-     ~HDG();
+    HDG();
+    ~HDG();
 
-      /*
-      ** Data
-      */
-
-      double   MagneticSensorHeadingDegrees;
-      double   MagneticDeviationDegrees;
-      EASTWEST MagneticDeviationDirection;
-      double   MagneticVariationDegrees;
-      EASTWEST MagneticVariationDirection;
-
-      /*
-      ** Methods
-      */
-
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
-
-      /*
-      ** Operators
-      */
+    /*
+    ** Data
+    */
+
+    double   MagneticSensorHeadingDegrees;
+    double   MagneticDeviationDegrees;
+    EASTWEST MagneticDeviationDirection;
+    double   MagneticVariationDegrees;
+    EASTWEST MagneticVariationDirection;
+
+    /*
+    ** Methods
+    */
+
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
+
+    /*
+    ** Operators
+    */
 
-      virtual const HDG& operator = ( const HDG& source );
+    virtual const HDG& operator = ( const HDG& source );
 };
 
 #endif // HDG_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdm.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdm.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdm.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdm.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,71 +43,71 @@
 
 HDM::HDM()
 {
-   Mnemonic = _T("HDM");
-   Empty();
+    Mnemonic = _T( "HDM" );
+    Empty();
 }
 
 HDM::~HDM()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void HDM::Empty( void )
 {
-   DegreesMagnetic = 0.0;
+    DegreesMagnetic = 0.0;
 }
 
 bool HDM::Parse( const SENTENCE& sentence )
 {
 
-   /*
-   ** HDM - Heading - Magnetic
-   **
-   **        1   2 3
-   **        |   | |
-   ** $--HDM,x.x,M*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Heading Degrees, Magnetic
-   **  2) M = Magnetic
-   **  3) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 3 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   }
+    /*
+    ** HDM - Heading - Magnetic
+    **
+    **        1   2 3
+    **        |   | |
+    ** $--HDM,x.x,M*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Heading Degrees, Magnetic
+    **  2) M = Magnetic
+    **  3) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 3 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
 
-   DegreesMagnetic = sentence.Double( 1 );
+    DegreesMagnetic = sentence.Double( 1 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool HDM::Write( SENTENCE& sentence )
 {
-   /*
-   ** Let the parent do its thing
-   */
+    /*
+    ** Let the parent do its thing
+    */
 
-   RESPONSE::Write( sentence );
+    RESPONSE::Write( sentence );
 
-   sentence += DegreesMagnetic;
-   sentence += _T("M");
+    sentence += DegreesMagnetic;
+    sentence += _T( "M" );
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const HDM& HDM::operator = ( const HDM& source )
 {
-      DegreesMagnetic = source.DegreesMagnetic;
+    DegreesMagnetic = source.DegreesMagnetic;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdm.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdm.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdm.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdm.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,30 +44,30 @@
 class HDM : public RESPONSE
 {
 
-   public:
+public:
 
-      HDM();
-     ~HDM();
+    HDM();
+    ~HDM();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-     double DegreesMagnetic;
+    double DegreesMagnetic;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const HDM& operator = ( const HDM& source );
+    virtual const HDM& operator = ( const HDM& source );
 };
 
 #endif // HDM_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdt.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdt.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdt.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdt.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,71 +43,71 @@
 
 HDT::HDT()
 {
-   Mnemonic = _T("HDT");
-   Empty();
+    Mnemonic = _T( "HDT" );
+    Empty();
 }
 
 HDT::~HDT()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void HDT::Empty( void )
 {
-   DegreesTrue = 0.0;
+    DegreesTrue = 0.0;
 }
 
 bool HDT::Parse( const SENTENCE& sentence )
 {
 
-   /*
-   ** HDT - Heading - True
-   **
-   **        1   2 3
-   **        |   | |
-   ** $--HDT,x.x,T*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Heading Degrees, TRUE
-   **  2) T = True
-   **  3) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 3 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   }
+    /*
+    ** HDT - Heading - True
+    **
+    **        1   2 3
+    **        |   | |
+    ** $--HDT,x.x,T*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Heading Degrees, TRUE
+    **  2) T = True
+    **  3) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 3 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
 
-   DegreesTrue = sentence.Double( 1 );
+    DegreesTrue = sentence.Double( 1 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool HDT::Write( SENTENCE& sentence )
 {
-   /*
-   ** Let the parent do its thing
-   */
+    /*
+    ** Let the parent do its thing
+    */
 
-   RESPONSE::Write( sentence );
+    RESPONSE::Write( sentence );
 
-   sentence += DegreesTrue;
-   sentence += _T("T");
+    sentence += DegreesTrue;
+    sentence += _T( "T" );
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const HDT& HDT::operator = ( const HDT& source )
 {
-   DegreesTrue = source.DegreesTrue;
+    DegreesTrue = source.DegreesTrue;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdt.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdt.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hdt.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hdt.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -12,30 +12,30 @@
 class HDT : public RESPONSE
 {
 
-   public:
+public:
 
-      HDT();
-     ~HDT();
+    HDT();
+    ~HDT();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double DegreesTrue;
+    double DegreesTrue;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const HDT& operator = ( const HDT& source );
+    virtual const HDT& operator = ( const HDT& source );
 };
 
 #endif // HDT_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hexvalue.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hexvalue.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/hexvalue.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/hexvalue.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -42,16 +42,16 @@
 
 int HexValue( const wxString& hex_string )
 {
-   int return_value = 0;
+    int return_value = 0;
 
-   long scan_value = 0;
+    long scan_value = 0;
 
-   wxCharBuffer abuf = hex_string.ToUTF8();
-   if( !abuf.data() )                            // badly formed sentence?
+    wxCharBuffer abuf = hex_string.ToUTF8();
+    if ( !abuf.data() )                           // badly formed sentence?
         return 0;
 
-   sscanf( abuf.data(), "%lx",  &scan_value );
+    sscanf( abuf.data(), "%lx",  &scan_value );
 
-   return_value = (int)scan_value;
-   return( return_value );
+    return_value = ( int )scan_value;
+    return ( return_value );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/lat.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/lat.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/lat.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/lat.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,101 +43,102 @@
 
 LATITUDE::LATITUDE()
 {
-   Empty();
+    Empty();
 }
 
 LATITUDE::~LATITUDE()
 {
-   Empty();
+    Empty();
 }
 
 void LATITUDE::Empty( void )
 {
 
-   Latitude = 0.0;
-   Northing = NS_Unknown;
+    Latitude = 0.0;
+    Northing = NS_Unknown;
 }
 
 bool LATITUDE::IsDataValid( void )
 {
-   if ( Northing != North && Northing != South )
-   {
-      return( FALSE );
-   }
+    if ( Northing != North && Northing != South )
+    {
+        return ( FALSE );
+    }
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 void LATITUDE::Parse( int position_field_number, int north_or_south_field_number, const SENTENCE& sentence )
 {
-   wxString n_or_s = sentence.Field( north_or_south_field_number );
-   Set( sentence.Double( position_field_number ), n_or_s );
+    wxString n_or_s = sentence.Field( north_or_south_field_number );
+    Set( sentence.Double( position_field_number ), n_or_s );
 }
 
 void LATITUDE::Set( double position, const wxString& north_or_south )
 {
 //   assert( north_or_south != NULL );
 
-   Latitude = position;
-   wxString ts = north_or_south;
+    Latitude = position;
+    wxString ts = north_or_south;
 
-   if ( ts.Trim(false)[ 0 ] == _T('N') )
-   {
-      Northing = North;
-   }
-   else if (ts.Trim(false)[ 0 ] == _T('S') )
-   {
-      Northing = South;
-   }
-   else
-   {
-      Northing = NS_Unknown;
-   }
+    if ( ts.Trim( false )[ 0 ] == _T( 'N' ) )
+    {
+        Northing = North;
+    }
+    else if ( ts.Trim( false )[ 0 ] == _T( 'S' ) )
+    {
+        Northing = South;
+    }
+    else
+    {
+        Northing = NS_Unknown;
+    }
 }
 
 void LATITUDE::Write( SENTENCE& sentence )
 {
 
-   wxString temp_string;
+    wxString temp_string;
     int neg = 0;
     int d;
     int m;
 
-    if (Latitude < 0.0) {
-            Latitude = -Latitude;
-            neg = 1;
-            }
-    d = (int) Latitude;
-    m = (int) ((Latitude - (double) d) * 60000.0);
-
-    if (neg)
-            d = -d;
-
-    temp_string.Printf(_T("%d%02d.%03d"), d, m / 1000, m % 1000);
-
-   sentence += temp_string;
-
-   if ( Northing == North )
-   {
-       sentence += _T("N");
-   }
-   else if ( Northing == South )
-   {
-       sentence += _T("S");
-   }
-   else
-   {
-      /*
-      ** Add Nothing
-      */
-   }
+    if ( Latitude < 0.0 )
+    {
+        Latitude = -Latitude;
+        neg = 1;
+    }
+    d = ( int ) Latitude;
+    m = ( int ) ( ( Latitude - ( double ) d ) * 60000.0 );
+
+    if ( neg )
+        d = -d;
+
+    temp_string.Printf( _T( "%d%02d.%03d" ), d, m / 1000, m % 1000 );
+
+    sentence += temp_string;
+
+    if ( Northing == North )
+    {
+        sentence += _T( "N" );
+    }
+    else if ( Northing == South )
+    {
+        sentence += _T( "S" );
+    }
+    else
+    {
+        /*
+        ** Add Nothing
+        */
+    }
 }
 
 const LATITUDE& LATITUDE::operator = ( const LATITUDE& source )
 {
 
-   Latitude = source.Latitude;
-   Northing = source.Northing;
+    Latitude = source.Latitude;
+    Northing = source.Northing;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/latlong.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/latlong.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/latlong.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/latlong.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,49 +43,49 @@
 
 LATLONG::LATLONG()
 {
-   Empty();
+    Empty();
 }
 
 LATLONG::~LATLONG()
 {
-   Empty();
+    Empty();
 }
 
 void LATLONG::Empty( void )
 {
 
-   Latitude.Empty();
-   Longitude.Empty();
+    Latitude.Empty();
+    Longitude.Empty();
 }
 
 bool LATLONG::Parse( int LatitudePositionFieldNumber, int NorthingFieldNumber, int LongitudePositionFieldNumber, int EastingFieldNumber, const SENTENCE& LineToParse )
 {
 
-   Latitude.Parse(  LatitudePositionFieldNumber, NorthingFieldNumber, LineToParse );
-   Longitude.Parse( LongitudePositionFieldNumber, EastingFieldNumber, LineToParse );
+    Latitude.Parse(  LatitudePositionFieldNumber, NorthingFieldNumber, LineToParse );
+    Longitude.Parse( LongitudePositionFieldNumber, EastingFieldNumber, LineToParse );
 
-   if ( Latitude.IsDataValid() && Longitude.IsDataValid() )
-   {
-      return( TRUE );
-   }
-   else
-   {
-      return( FALSE );
-   }
+    if ( Latitude.IsDataValid() && Longitude.IsDataValid() )
+    {
+        return ( TRUE );
+    }
+    else
+    {
+        return ( FALSE );
+    }
 }
 
 void LATLONG::Write( SENTENCE& sentence )
 {
 
-   Latitude.Write( sentence );
-   Longitude.Write( sentence );
+    Latitude.Write( sentence );
+    Longitude.Write( sentence );
 }
 
 const LATLONG& LATLONG::operator = ( const LATLONG& source )
 {
 
-   Latitude  = source.Latitude;
-   Longitude = source.Longitude;
+    Latitude  = source.Latitude;
+    Longitude = source.Longitude;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/LatLong.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/LatLong.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/LatLong.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/LatLong.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -46,97 +46,97 @@
 class LATITUDE
 {
 
-   public:
+public:
 
-      LATITUDE();
-      virtual ~LATITUDE();
+    LATITUDE();
+    virtual ~LATITUDE();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double Latitude;
+    double Latitude;
 
-      NORTHSOUTH Northing;
+    NORTHSOUTH Northing;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool IsDataValid( void );
-      virtual void Parse( int PositionFieldNumber, int NorthingFieldNumber, const SENTENCE& LineToParse );
-      virtual void Set( double Position, const wxString& Northing );
-      virtual void Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool IsDataValid( void );
+    virtual void Parse( int PositionFieldNumber, int NorthingFieldNumber, const SENTENCE& LineToParse );
+    virtual void Set( double Position, const wxString& Northing );
+    virtual void Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const LATITUDE& operator = ( const LATITUDE& source );
+    virtual const LATITUDE& operator = ( const LATITUDE& source );
 };
 
 class LONGITUDE
 {
 
-   public:
+public:
 
-      LONGITUDE();
-      virtual ~LONGITUDE();
+    LONGITUDE();
+    virtual ~LONGITUDE();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double Longitude;
+    double Longitude;
 
-      EASTWEST Easting;
+    EASTWEST Easting;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool IsDataValid( void );
-      virtual void Parse( int PositionFieldNumber, int EastingFieldNumber, const SENTENCE& LineToParse );
-      virtual void Set( double Position, const wxString& Easting );
-      virtual void Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool IsDataValid( void );
+    virtual void Parse( int PositionFieldNumber, int EastingFieldNumber, const SENTENCE& LineToParse );
+    virtual void Set( double Position, const wxString& Easting );
+    virtual void Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const LONGITUDE& operator = ( const LONGITUDE& source );
+    virtual const LONGITUDE& operator = ( const LONGITUDE& source );
 };
 
 class LATLONG
 {
 
-   public:
+public:
 
-      LATLONG();
-      virtual ~LATLONG();
+    LATLONG();
+    virtual ~LATLONG();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      LATITUDE  Latitude;
-      LONGITUDE Longitude;
+    LATITUDE  Latitude;
+    LONGITUDE Longitude;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( int LatitudePostionFieldNumber, int NorthingFieldNumber, int LongitudePositionFieldNumber, int EastingFieldNumber, const SENTENCE& LineToParse );
-      virtual void Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( int LatitudePostionFieldNumber, int NorthingFieldNumber, int LongitudePositionFieldNumber, int EastingFieldNumber, const SENTENCE& LineToParse );
+    virtual void Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const LATLONG& operator = ( const LATLONG& source );
+    virtual const LATLONG& operator = ( const LATLONG& source );
 };
 
 #endif // LATLONG_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/long.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/long.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/long.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/long.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,56 +43,56 @@
 
 LONGITUDE::LONGITUDE()
 {
-   Empty();
+    Empty();
 }
 
 LONGITUDE::~LONGITUDE()
 {
-   Empty();
+    Empty();
 }
 
 void LONGITUDE::Empty( void )
 {
 
-   Longitude = 0.0;
-   Easting   = EW_Unknown;
+    Longitude = 0.0;
+    Easting   = EW_Unknown;
 }
 
 bool LONGITUDE::IsDataValid( void )
 {
-   if ( Easting != East && Easting != West )
-   {
-      return( FALSE );
-   }
+    if ( Easting != East && Easting != West )
+    {
+        return ( FALSE );
+    }
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 void LONGITUDE::Parse( int position_field_number, int east_or_west_field_number, const SENTENCE& sentence )
 {
-   wxString w_or_e = sentence.Field( east_or_west_field_number );
-   Set( sentence.Double( position_field_number ), w_or_e );
+    wxString w_or_e = sentence.Field( east_or_west_field_number );
+    Set( sentence.Double( position_field_number ), w_or_e );
 }
 
 void LONGITUDE::Set( double position, const wxString& east_or_west )
 {
 //   assert( east_or_west != NULL );
 
-   Longitude = position;
-   wxString ts = east_or_west;
+    Longitude = position;
+    wxString ts = east_or_west;
 
-   if ( ts.Trim(false)[ 0 ] == 'E' )
-   {
-      Easting = East;
-   }
-   else if ( ts.Trim(false)[ 0 ] == 'W' )
-   {
-      Easting = West;
-   }
-   else
-   {
-      Easting = EW_Unknown;
-   }
+    if ( ts.Trim( false )[ 0 ] == 'E' )
+    {
+        Easting = East;
+    }
+    else if ( ts.Trim( false )[ 0 ] == 'W' )
+    {
+        Easting = West;
+    }
+    else
+    {
+        Easting = EW_Unknown;
+    }
 }
 
 void LONGITUDE::Write( SENTENCE& sentence )
@@ -103,41 +103,42 @@
     int d;
     int m;
 
-    if (Longitude < 0.0) {
-            Longitude = -Longitude;
-            neg = 1;
-            }
-    d = (int) Longitude;
-    m = (int) ((Longitude - (double) d) * 60000.0);
-
-    if (neg)
-            d = -d;
-
-    temp_string.Printf(_T("%03d%02d.%03d"), d, m / 1000, m % 1000);
-
-   sentence += temp_string;
-
-   if ( Easting == East )
-   {
-       sentence += _T("E");
-   }
-   else if ( Easting == West )
-   {
-       sentence += _T("W");
-   }
-   else
-   {
-      /*
-      ** Add Nothing
-      */
-   }
+    if ( Longitude < 0.0 )
+    {
+        Longitude = -Longitude;
+        neg = 1;
+    }
+    d = ( int ) Longitude;
+    m = ( int ) ( ( Longitude - ( double ) d ) * 60000.0 );
+
+    if ( neg )
+        d = -d;
+
+    temp_string.Printf( _T( "%03d%02d.%03d" ), d, m / 1000, m % 1000 );
+
+    sentence += temp_string;
+
+    if ( Easting == East )
+    {
+        sentence += _T( "E" );
+    }
+    else if ( Easting == West )
+    {
+        sentence += _T( "W" );
+    }
+    else
+    {
+        /*
+        ** Add Nothing
+        */
+    }
 }
 
 const LONGITUDE& LONGITUDE::operator = ( const LONGITUDE& source )
 {
 
-   Longitude = source.Longitude;
-   Easting   = source.Easting;
+    Longitude = source.Longitude;
+    Easting   = source.Easting;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mtw.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mtw.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mtw.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mtw.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,81 +43,81 @@
 
 MTW::MTW()
 {
-   Mnemonic = _T("MTW");
-   Empty();
+    Mnemonic = _T( "MTW" );
+    Empty();
 }
 
 MTW::~MTW()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void MTW::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   Temperature = 0.0;
-   UnitOfMeasurement.Empty();
+    Temperature = 0.0;
+    UnitOfMeasurement.Empty();
 }
 
 bool MTW::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** MTW - Water Temperature
-   **
-   **        1   2 3
-   **        |   | | 
-   ** $--MTW,x.x,C*hh<CR><LF>
-   **
-   ** Field Number: 
-   **  1) Degrees
-   **  2) Unit of Measurement, Celcius
-   **  3) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 3 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
+    /*
+    ** MTW - Water Temperature
+    **
+    **        1   2 3
+    **        |   | |
+    ** $--MTW,x.x,C*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Degrees
+    **  2) Unit of Measurement, Celcius
+    **  3) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 3 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
 
-   Temperature       = sentence.Double( 1 );
-   UnitOfMeasurement = sentence.Field( 2 );
+    Temperature       = sentence.Double( 1 );
+    UnitOfMeasurement = sentence.Field( 2 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool MTW::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
+    /*
+    ** Let the parent do its thing
+    */
 
-   sentence += Temperature;
-   sentence += UnitOfMeasurement;
+    RESPONSE::Write( sentence );
 
-   sentence.Finish();
+    sentence += Temperature;
+    sentence += UnitOfMeasurement;
 
-   return( TRUE );
+    sentence.Finish();
+
+    return ( TRUE );
 }
 
 const MTW& MTW::operator = ( const MTW& source )
 {
 //   ASSERT_VALID( this );
 
-   Temperature       = source.Temperature;
-   UnitOfMeasurement = source.UnitOfMeasurement;
+    Temperature       = source.Temperature;
+    UnitOfMeasurement = source.UnitOfMeasurement;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mtw.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mtw.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mtw.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mtw.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,31 +44,31 @@
 {
 //   DECLARE_DYNAMIC( MTW )
 
-   public:
+public:
 
-      MTW();
-     ~MTW();
+    MTW();
+    ~MTW();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double  Temperature;
-      wxString UnitOfMeasurement;
+    double  Temperature;
+    wxString UnitOfMeasurement;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const MTW& operator = ( const MTW& source );
+    virtual const MTW& operator = ( const MTW& source );
 };
 
 #endif // MTW_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mwv.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mwv.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mwv.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mwv.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,96 +43,96 @@
 
 MWV::MWV()
 {
-   Mnemonic = _T("MWV");
-   Empty();
+    Mnemonic = _T( "MWV" );
+    Empty();
 }
 
 MWV::~MWV()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void MWV::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   WindAngle   = 0.0;
-   Reference.Empty();
-   WindSpeed   = 0.0;
-   WindSpeedUnits.Empty();
-   IsDataValid = Unknown0183;
+    WindAngle   = 0.0;
+    Reference.Empty();
+    WindSpeed   = 0.0;
+    WindSpeedUnits.Empty();
+    IsDataValid = Unknown0183;
 }
 
 bool MWV::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** MWV - Wind Speed and Angle
-   **
-   **        1   2 3   4 5
-   **        |   | |   | |
-   ** $--MWV,x.x,a,x.x,a*hh<CR><LF>
-   **
-   ** Field Number: 
-   **  1) Wind Angle, 0 to 360 degrees
-   **  2) Reference, R = Relative, T = True
-   **  3) Wind Speed
-   **  4) Wind Speed Units, K/M/N
-   **  5) Status, A = Data Valid
-   **  6) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 6 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
-
-   WindAngle      = sentence.Double( 1 );
-   Reference      = sentence.Field( 2 );
-   WindSpeed      = sentence.Double( 3 );
-   WindSpeedUnits = sentence.Field( 4 );
-   IsDataValid    = sentence.Boolean( 5 );
+    /*
+    ** MWV - Wind Speed and Angle
+    **
+    **        1   2 3   4 5
+    **        |   | |   | |
+    ** $--MWV,x.x,a,x.x,a*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Wind Angle, 0 to 360 degrees
+    **  2) Reference, R = Relative, T = True
+    **  3) Wind Speed
+    **  4) Wind Speed Units, K/M/N
+    **  5) Status, A = Data Valid
+    **  6) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 6 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    WindAngle      = sentence.Double( 1 );
+    Reference      = sentence.Field( 2 );
+    WindSpeed      = sentence.Double( 3 );
+    WindSpeedUnits = sentence.Field( 4 );
+    IsDataValid    = sentence.Boolean( 5 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool MWV::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
-
-   sentence += WindAngle;
-   sentence += Reference;
-   sentence += WindSpeed;
-   sentence += WindSpeedUnits;
-   sentence += IsDataValid;
+    /*
+    ** Let the parent do its thing
+    */
 
-   sentence.Finish();
+    RESPONSE::Write( sentence );
 
-   return( TRUE );
+    sentence += WindAngle;
+    sentence += Reference;
+    sentence += WindSpeed;
+    sentence += WindSpeedUnits;
+    sentence += IsDataValid;
+
+    sentence.Finish();
+
+    return ( TRUE );
 }
 
 const MWV& MWV::operator = ( const MWV& source )
 {
 //   ASSERT_VALID( this );
- 
-   WindAngle      = source.WindAngle;
-   Reference      = source.Reference;
-   WindSpeed      = source.WindSpeed;
-   WindSpeedUnits = source.WindSpeedUnits;
-   IsDataValid    = source.IsDataValid;
 
-   return( *this );
+    WindAngle      = source.WindAngle;
+    Reference      = source.Reference;
+    WindSpeed      = source.WindSpeed;
+    WindSpeedUnits = source.WindSpeedUnits;
+    IsDataValid    = source.IsDataValid;
+
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mwv.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mwv.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/mwv.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/mwv.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,34 +44,34 @@
 {
 //   DECLARE_DYNAMIC( MWV )
 
-   public:
+public:
 
-      MWV();
-     ~MWV();
+    MWV();
+    ~MWV();
 
-      /*
-      ** Data
-      */
-
-      double           WindAngle;
-      wxString          Reference;
-      double           WindSpeed;
-      wxString          WindSpeedUnits;
-      NMEA0183L_BOOLEAN IsDataValid;
-
-      /*
-      ** Methods
-      */
-
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
-
-      /*
-      ** Operators
-      */
+    /*
+    ** Data
+    */
+
+    double           WindAngle;
+    wxString          Reference;
+    double           WindSpeed;
+    wxString          WindSpeedUnits;
+    NMEA0183L_BOOLEAN IsDataValid;
+
+    /*
+    ** Methods
+    */
+
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
+
+    /*
+    ** Operators
+    */
 
-      virtual const MWV& operator = ( const MWV& source );
+    virtual const MWV& operator = ( const MWV& source );
 };
 
 #endif // MWV_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/nmea0183.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/nmea0183.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/nmea0183.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/nmea0183.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -41,171 +41,171 @@
 */
 
 #include <wx/listimpl.cpp>
-WX_DEFINE_LIST(MRL);
+WX_DEFINE_LIST( MRL );
 
 
 NMEA0183L::NMEA0183L()
 {
-   initialize();
+    initialize();
 
-/*
-   response_table.Append( (RESPONSE *) &Aam );
-   response_table.Append( (RESPONSE *) &Alm );
-   response_table.Append( (RESPONSE *) &Apb );
-   response_table.Append( (RESPONSE *) &Asd );
-   response_table.Append( (RESPONSE *) &Bec );
-   response_table.Append( (RESPONSE *) &Bod );
-   response_table.Append( (RESPONSE *) &Bwc );
-   response_table.Append( (RESPONSE *) &Bwr );
-   response_table.Append( (RESPONSE *) &Bww );
-*/
-   response_table.Append( (RESPONSE *) &Dbt );
-/*
-   response_table.Append( (RESPONSE *) &Dcn );
-*/
-   response_table.Append( (RESPONSE *) &Dpt );
-/*
-   response_table.Append( (RESPONSE *) &Fsi );
-*/
-   response_table.Append( (RESPONSE *) &Gga );
-/*
-   response_table.Append( (RESPONSE *) &Glc );
-*/
-   response_table.Append( (RESPONSE *) &Gll );
-   response_table.Append( (RESPONSE *) &Gsv );
-/*
-   response_table.Append( (RESPONSE *) &Gxa );
-*/
-   response_table.Append( (RESPONSE *) &Hdm );
-   response_table.Append( (RESPONSE *) &Hdg );
-   response_table.Append( (RESPONSE *) &Hdt );
-/*
-   response_table.Append( (RESPONSE *) &Hsc );
-   response_table.Append( (RESPONSE *) &Lcd );
-*/
-   response_table.Append( (RESPONSE *) &Mtw );
-   response_table.Append( (RESPONSE *) &Mwv );
-/*
-   response_table.Append( (RESPONSE *) &Oln );
-   response_table.Append( (RESPONSE *) &Osd );
-   response_table.Append( (RESPONSE *) &Proprietary );
-   response_table.Append( (RESPONSE *) &Rma );
-*/
-   response_table.Append( (RESPONSE *) &Rmb );
-   response_table.Append( (RESPONSE *) &Rmc );
-/*
-   response_table.Append( (RESPONSE *) &Rot );
-   response_table.Append( (RESPONSE *) &Rpm );
-*/
-   response_table.Append( (RESPONSE *) &Rsa );
-/*
-   response_table.Append( (RESPONSE *) &Rsd );
-*/
-   response_table.Append( (RESPONSE *) &Rte );
-/*
-   response_table.Append( (RESPONSE *) &Sfi );
-   response_table.Append( (RESPONSE *) &Stn );
-   response_table.Append( (RESPONSE *) &Trf );
-   response_table.Append( (RESPONSE *) &Ttm );
-   response_table.Append( (RESPONSE *) &Vbw );
-*/
-   response_table.Append( (RESPONSE *) &Vhw );
-/*
-   response_table.Append( (RESPONSE *) &Vdr );
-   response_table.Append( (RESPONSE *) &Vlw );
-   response_table.Append( (RESPONSE *) &Vpw );
-*/
-   response_table.Append( (RESPONSE *) &Vtg );
-   response_table.Append( (RESPONSE *) &Vwr );
-   response_table.Append( (RESPONSE *) &Vwt );
-/*
-   response_table.Append( (RESPONSE *) &Wcv );
-   response_table.Append( (RESPONSE *) &Wnc );
-*/
-   response_table.Append( (RESPONSE *) &Wpl );
-/*
-   response_table.Append( (RESPONSE *) &Xdr );
-   response_table.Append( (RESPONSE *) &Xte );
-   response_table.Append( (RESPONSE *) &Xtr );
-*/
-   response_table.Append( (RESPONSE *) &Zda );
-/*
-   response_table.Append( (RESPONSE *) &Zfo );
-   response_table.Append( (RESPONSE *) &Ztg );
-*/
-   sort_response_table();
-   set_container_pointers();
+    /*
+       response_table.Append( (RESPONSE *) &Aam );
+       response_table.Append( (RESPONSE *) &Alm );
+       response_table.Append( (RESPONSE *) &Apb );
+       response_table.Append( (RESPONSE *) &Asd );
+       response_table.Append( (RESPONSE *) &Bec );
+       response_table.Append( (RESPONSE *) &Bod );
+       response_table.Append( (RESPONSE *) &Bwc );
+       response_table.Append( (RESPONSE *) &Bwr );
+       response_table.Append( (RESPONSE *) &Bww );
+    */
+    response_table.Append( ( RESPONSE * ) &Dbt );
+    /*
+       response_table.Append( (RESPONSE *) &Dcn );
+    */
+    response_table.Append( ( RESPONSE * ) &Dpt );
+    /*
+       response_table.Append( (RESPONSE *) &Fsi );
+    */
+    response_table.Append( ( RESPONSE * ) &Gga );
+    /*
+       response_table.Append( (RESPONSE *) &Glc );
+    */
+    response_table.Append( ( RESPONSE * ) &Gll );
+    response_table.Append( ( RESPONSE * ) &Gsv );
+    /*
+       response_table.Append( (RESPONSE *) &Gxa );
+    */
+    response_table.Append( ( RESPONSE * ) &Hdm );
+    response_table.Append( ( RESPONSE * ) &Hdg );
+    response_table.Append( ( RESPONSE * ) &Hdt );
+    /*
+       response_table.Append( (RESPONSE *) &Hsc );
+       response_table.Append( (RESPONSE *) &Lcd );
+    */
+    response_table.Append( ( RESPONSE * ) &Mtw );
+    response_table.Append( ( RESPONSE * ) &Mwv );
+    /*
+       response_table.Append( (RESPONSE *) &Oln );
+       response_table.Append( (RESPONSE *) &Osd );
+       response_table.Append( (RESPONSE *) &Proprietary );
+       response_table.Append( (RESPONSE *) &Rma );
+    */
+    response_table.Append( ( RESPONSE * ) &Rmb );
+    response_table.Append( ( RESPONSE * ) &Rmc );
+    /*
+       response_table.Append( (RESPONSE *) &Rot );
+       response_table.Append( (RESPONSE *) &Rpm );
+    */
+    response_table.Append( ( RESPONSE * ) &Rsa );
+    /*
+       response_table.Append( (RESPONSE *) &Rsd );
+    */
+    response_table.Append( ( RESPONSE * ) &Rte );
+    /*
+       response_table.Append( (RESPONSE *) &Sfi );
+       response_table.Append( (RESPONSE *) &Stn );
+       response_table.Append( (RESPONSE *) &Trf );
+       response_table.Append( (RESPONSE *) &Ttm );
+       response_table.Append( (RESPONSE *) &Vbw );
+    */
+    response_table.Append( ( RESPONSE * ) &Vhw );
+    /*
+       response_table.Append( (RESPONSE *) &Vdr );
+       response_table.Append( (RESPONSE *) &Vlw );
+       response_table.Append( (RESPONSE *) &Vpw );
+    */
+    response_table.Append( ( RESPONSE * ) &Vtg );
+    response_table.Append( ( RESPONSE * ) &Vwr );
+    response_table.Append( ( RESPONSE * ) &Vwt );
+    /*
+       response_table.Append( (RESPONSE *) &Wcv );
+       response_table.Append( (RESPONSE *) &Wnc );
+    */
+    response_table.Append( ( RESPONSE * ) &Wpl );
+    /*
+       response_table.Append( (RESPONSE *) &Xdr );
+       response_table.Append( (RESPONSE *) &Xte );
+       response_table.Append( (RESPONSE *) &Xtr );
+    */
+    response_table.Append( ( RESPONSE * ) &Zda );
+    /*
+       response_table.Append( (RESPONSE *) &Zfo );
+       response_table.Append( (RESPONSE *) &Ztg );
+    */
+    sort_response_table();
+    set_container_pointers();
 }
 
 NMEA0183L::~NMEA0183L()
 {
-   initialize();
+    initialize();
 }
 
 void NMEA0183L::initialize( void )
 {
 //   ASSERT_VALID( this );
 
-   ErrorMessage.Empty();
+    ErrorMessage.Empty();
 }
 
 void NMEA0183L::set_container_pointers( void )
 {
 //   ASSERT_VALID( this );
 
-   int index = 0;
-   int number_of_entries_in_table = response_table.GetCount();
+    int index = 0;
+    int number_of_entries_in_table = response_table.GetCount();
 
-   RESPONSE *this_response = (RESPONSE *) NULL;
+    RESPONSE *this_response = ( RESPONSE * ) NULL;
 
-   index = 0;
+    index = 0;
 
-   while( index < number_of_entries_in_table )
-   {
-      this_response = (RESPONSE *) response_table[ index ];
+    while ( index < number_of_entries_in_table )
+    {
+        this_response = ( RESPONSE * ) response_table[ index ];
 
-      this_response->SetContainer( this );
+        this_response->SetContainer( this );
 
-      index++;
-   }
+        index++;
+    }
 }
 
 void NMEA0183L::sort_response_table( void )
 {
 //   ASSERT_VALID( this );
 
-/*
-   int index = 0;
-   int number_of_entries_in_table = response_table.GetSize();
-
-   RESPONSE *this_response = (RESPONSE *) NULL;
-   RESPONSE *that_response = (RESPONSE *) NULL;
-
-   bool sorted = FALSE;
-
-   while( sorted == FALSE )
-   {
-      sorted = TRUE;
-
-      index = 0;
-
-      while( index < number_of_entries_in_table )
-      {
-         this_response = (RESPONSE *) response_table.Item( index     );
-         that_response = (RESPONSE *) response_table.Item( index + 1 );
-
-         if ( this_response->Mnemonic.Compare( that_response->Mnemonic ) > 0 )
-         {
-            response_table[ index     ] = that_response;
-            response_table[ index + 1 ] = this_response;
-
-            sorted = FALSE;
-         }
-
-         index++;
-      }
-   }
-*/
+    /*
+       int index = 0;
+       int number_of_entries_in_table = response_table.GetSize();
+
+       RESPONSE *this_response = (RESPONSE *) NULL;
+       RESPONSE *that_response = (RESPONSE *) NULL;
+
+       bool sorted = FALSE;
+
+       while( sorted == FALSE )
+       {
+          sorted = TRUE;
+
+          index = 0;
+
+          while( index < number_of_entries_in_table )
+          {
+             this_response = (RESPONSE *) response_table.Item( index     );
+             that_response = (RESPONSE *) response_table.Item( index + 1 );
+
+             if ( this_response->Mnemonic.Compare( that_response->Mnemonic ) > 0 )
+             {
+                response_table[ index     ] = that_response;
+                response_table[ index + 1 ] = this_response;
+
+                sorted = FALSE;
+             }
+
+             index++;
+          }
+       }
+    */
 }
 
 /*
@@ -216,159 +216,159 @@
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** NMEA 0183 sentences begin with $ and and with CR LF
-   */
-
-   if ( sentence.Sentence[ 0 ] != '$' )
-   {
-      return( FALSE );
-   }
-
-   /*
-   ** Next to last character must be a CR
-   */
-
-   if ( sentence.Sentence.Mid( sentence.Sentence.Len() - 2, 1 ) != wxString(_T("\r")) )
-   {
-      return( FALSE );
-   }
-
-   if ( sentence.Sentence.Right( 1 ) != _T("\n") )
-   {
-      return( FALSE );
-   }
+    /*
+    ** NMEA 0183 sentences begin with $ and and with CR LF
+    */
+
+    if ( sentence.Sentence[ 0 ] != '$' )
+    {
+        return ( FALSE );
+    }
+
+    /*
+    ** Next to last character must be a CR
+    */
+
+    if ( sentence.Sentence.Mid( sentence.Sentence.Len() - 2, 1 ) != wxString( _T( "\r" ) ) )
+    {
+        return ( FALSE );
+    }
+
+    if ( sentence.Sentence.Right( 1 ) != _T( "\n" ) )
+    {
+        return ( FALSE );
+    }
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 
 bool NMEA0183L::PreParse( void )
 {
     wxCharBuffer buf = sentence.Sentence.ToUTF8();
-    if( !buf.data() )                            // badly formed sentence?
+    if ( !buf.data() )                           // badly formed sentence?
         return false;
-    
-      if ( IsGood() )
-      {
-            wxString mnemonic = sentence.Field( 0 );
 
-      /*
-            ** See if this is a proprietary field
-      */
+    if ( IsGood() )
+    {
+        wxString mnemonic = sentence.Field( 0 );
+
+        /*
+              ** See if this is a proprietary field
+        */
 
-            if ( mnemonic.Left( 1 ) == 'P' )
-                  mnemonic = _T("P");
+        if ( mnemonic.Left( 1 ) == 'P' )
+            mnemonic = _T( "P" );
 
-            else
-                  mnemonic = mnemonic.Right( 3 );
+        else
+            mnemonic = mnemonic.Right( 3 );
 
 
-            LastSentenceIDReceived = mnemonic;
+        LastSentenceIDReceived = mnemonic;
 
-            return true;
-      }
-      else
-            return false;
+        return true;
+    }
+    else
+        return false;
 }
 
 
 bool NMEA0183L::Parse( void )
 {
-   bool return_value = FALSE;
+    bool return_value = FALSE;
 
-   if(PreParse())
-   {
+    if ( PreParse() )
+    {
 
-      wxString mnemonic = sentence.Field( 0 );
+        wxString mnemonic = sentence.Field( 0 );
 
-      /*
-      ** See if this is a proprietary field
-      */
+        /*
+        ** See if this is a proprietary field
+        */
 
-      if ( mnemonic.Left( 1 ) == 'P' )
-      {
-          mnemonic = _T("P");
-      }
-      else
-      {
-         mnemonic = mnemonic.Right( 3 );
-      }
+        if ( mnemonic.Left( 1 ) == 'P' )
+        {
+            mnemonic = _T( "P" );
+        }
+        else
+        {
+            mnemonic = mnemonic.Right( 3 );
+        }
 
-      /*
-      ** Set up our default error message
-      */
+        /*
+        ** Set up our default error message
+        */
 
-      ErrorMessage = mnemonic;
-      ErrorMessage += _T(" is an unknown type of sentence");
+        ErrorMessage = mnemonic;
+        ErrorMessage += _T( " is an unknown type of sentence" );
 
-      LastSentenceIDReceived = mnemonic;
+        LastSentenceIDReceived = mnemonic;
 
-      RESPONSE *response_p = (RESPONSE *) NULL;
+        RESPONSE *response_p = ( RESPONSE * ) NULL;
 
 
 //          Traverse the response list to find a mnemonic match
 
-       wxMRLNode *node = response_table.GetFirst();
+        wxMRLNode *node = response_table.GetFirst();
 
-       int comparison  = 0;
+        int comparison  = 0;
 
-        while(node)
+        while ( node )
         {
-           RESPONSE *resp = node->GetData();
+            RESPONSE *resp = node->GetData();
 
             comparison = mnemonic.Cmp( resp->Mnemonic );
 
             if ( comparison == 0 )
             {
-                        response_p = (RESPONSE *) resp;
-                        return_value = response_p->Parse( sentence );
+                response_p = ( RESPONSE * ) resp;
+                return_value = response_p->Parse( sentence );
 
-                        /*
-                        ** Set your ErrorMessage
-                        */
-
-                        if ( return_value == TRUE )
-                        {
-                           ErrorMessage = _T("No Error");
-                           LastSentenceIDParsed = response_p->Mnemonic;
-                           TalkerID = talker_id( sentence );
-                           ExpandedTalkerID = expand_talker_id( TalkerID );
-                        }
-                        else
-                        {
-                           ErrorMessage = response_p->ErrorMessage;
-                        }
+                /*
+                ** Set your ErrorMessage
+                */
+
+                if ( return_value == TRUE )
+                {
+                    ErrorMessage = _T( "No Error" );
+                    LastSentenceIDParsed = response_p->Mnemonic;
+                    TalkerID = talker_id( sentence );
+                    ExpandedTalkerID = expand_talker_id( TalkerID );
+                }
+                else
+                {
+                    ErrorMessage = response_p->ErrorMessage;
+                }
 
-                        break;
-                   }
+                break;
+            }
 
-              node = node->GetNext();
+            node = node->GetNext();
         }
 
-   }
-   else
-   {
-      return_value = FALSE;
-   }
+    }
+    else
+    {
+        return_value = FALSE;
+    }
 
-   return( return_value );
+    return ( return_value );
 }
 
 NMEA0183L& NMEA0183L::operator << ( wxString & source )
 {
 //   ASSERT_VALID( this );
 
-   sentence = source;
+    sentence = source;
 
-   return( *this );
+    return ( *this );
 }
 
 NMEA0183L& NMEA0183L::operator >> ( wxString& destination )
 {
 //   ASSERT_VALID( this );
 
-   destination = sentence;
+    destination = sentence;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/nmea0183.h opencpn-plugin-logbookkonni-1.2024/src/nmea0183/nmea0183.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/nmea0183.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/nmea0183.h	2016-02-25 13:06:29.000000000 +0000
@@ -66,77 +66,77 @@
 
 typedef enum _NMEA0183L_BOOLEAN
 {
-   Unknown0183 = 0,
-   NTrue,
-   NFalse
+    Unknown0183 = 0,
+    NTrue,
+    NFalse
 } NMEA0183L_BOOLEAN;
 
 typedef enum _leftright
 {
-   LR_Unknown = 0,
-   Left,
-   Right
+    LR_Unknown = 0,
+    Left,
+    Right
 } LEFTRIGHT;
 
 typedef enum _eastwest
 {
-   EW_Unknown = 0,
-   East,
-   West
+    EW_Unknown = 0,
+    East,
+    West
 } EASTWEST;
 
 typedef enum _northsouth
 {
-   NS_Unknown = 0,
-   North,
-   South
+    NS_Unknown = 0,
+    North,
+    South
 } NORTHSOUTH;
 
 typedef enum _reference
 {
-   ReferenceUnknown = 0,
-   BottomTrackingLog,
-   ManuallyEntered,
-   WaterReferenced,
-   RadarTrackingOfFixedTarget,
-   PositioningSystemGroundReference
+    ReferenceUnknown = 0,
+    BottomTrackingLog,
+    ManuallyEntered,
+    WaterReferenced,
+    RadarTrackingOfFixedTarget,
+    PositioningSystemGroundReference
 } REFERENCE;
 
 typedef enum _communicationsmode
 {
-   CommunicationsModeUnknown         = 0,
-   F3E_G3E_SimplexTelephone          = 'd',
-   F3E_G3E_DuplexTelephone           = 'e',
-   J3E_Telephone                     = 'm',
-   H3E_Telephone                     = 'o',
-   F1B_J2B_FEC_NBDP_TelexTeleprinter = 'q',
-   F1B_J2B_ARQ_NBDP_TelexTeleprinter = 's',
-   F1B_J2B_ReceiveOnlyTeleprinterDSC = 'w',
-   A1A_MorseTapeRecorder             = 'x',
-   A1A_MorseKeyHeadset               = '{',
-   F1C_F2C_F3C_FaxMachine            = '|'
+    CommunicationsModeUnknown         = 0,
+    F3E_G3E_SimplexTelephone          = 'd',
+    F3E_G3E_DuplexTelephone           = 'e',
+    J3E_Telephone                     = 'm',
+    H3E_Telephone                     = 'o',
+    F1B_J2B_FEC_NBDP_TelexTeleprinter = 'q',
+    F1B_J2B_ARQ_NBDP_TelexTeleprinter = 's',
+    F1B_J2B_ReceiveOnlyTeleprinterDSC = 'w',
+    A1A_MorseTapeRecorder             = 'x',
+    A1A_MorseKeyHeadset               = '{',
+    F1C_F2C_F3C_FaxMachine            = '|'
 } COMMUNICATIONS_MODE;
 
 typedef enum _transducertype
 {
-   TransducerUnknown   = 0,
-   AngularDisplacementTransducer = 'A',
-   TemperatureTransducer         = 'C',
-   LinearDisplacementTransducer  = 'D',
-   FrequencyTransducer           = 'F',
-   HumidityTransducer            = 'H',
-   ForceTransducer               = 'N',
-   PressureTransducer            = 'P',
-   FlowRateTransducer            = 'R',
-   TachometerTransducer          = 'T',
-   VolumeTransducer              = 'V'
+    TransducerUnknown   = 0,
+    AngularDisplacementTransducer = 'A',
+    TemperatureTransducer         = 'C',
+    LinearDisplacementTransducer  = 'D',
+    FrequencyTransducer           = 'F',
+    HumidityTransducer            = 'H',
+    ForceTransducer               = 'N',
+    PressureTransducer            = 'P',
+    FlowRateTransducer            = 'R',
+    TachometerTransducer          = 'T',
+    VolumeTransducer              = 'V'
 } TRANSDUCER_TYPE;
 
 typedef enum
 {
-      RouteUnknown = 0,
-      CompleteRoute,
-      WorkingRoute
+    RouteUnknown = 0,
+    CompleteRoute,
+    WorkingRoute
 } ROUTE_TYPE;
 
 /*
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/nmea0183.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/nmea0183.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/nmea0183.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/nmea0183.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -132,133 +132,133 @@
 #include "ZTG.hpp"
 */
 
-WX_DECLARE_LIST(RESPONSE, MRL);
+WX_DECLARE_LIST( RESPONSE, MRL );
 
 class NMEA0183L
 {
 
-   private:
+private:
 
-      SENTENCE sentence;
+    SENTENCE sentence;
 
-      void initialize( void );
+    void initialize( void );
 
-   protected:
+protected:
 
-      MRL response_table;
+    MRL response_table;
+
+    void set_container_pointers( void );
+    void sort_response_table( void );
+
+public:
+
+    NMEA0183L();
+    virtual ~NMEA0183L();
+
+    /*
+    ** NMEA 0183 Sentences we understand
+    */
+
+    /*
+          AAM Aam;
+          ALM Alm;
+          APB Apb;
+          ASD Asd;
+          BEC Bec;
+          BOD Bod;
+          BWC Bwc;
+          BWR Bwr;
+          BWW Bww;
+    */
+    DBT Dbt;
+    /*
+          DCN Dcn;
+    */
+    DPT Dpt;
+    /*
+          FSI Fsi;
+    */
+    GGA Gga;
+    /*
+          GLC Glc;
+    */
+    GLL Gll;
+    GSV Gsv;
+    /*
+          GXA Gxa;
+    */
+    HDM Hdm;
+    HDG Hdg;
+    HDT Hdt;
+    /*
+          HSC Hsc;
+          LCD Lcd;
+    */
+    MTW Mtw;
+    MWV Mwv;
+    /*
+          OLN Oln;
+          OSD Osd;
+          P   Proprietary;
+          RMA Rma;
+    */
+    RMB Rmb;
+    RMC Rmc;
+    /*
+          ROT Rot;
+          RPM Rpm;
+    */
+    RSA Rsa;
+    /*
+          RSD Rsd;
+    */
+    RTE Rte;
+    /*
+          SFI Sfi;
+          STN Stn;
+          TRF Trf;
+          TTM Ttm;
+          VBW Vbw;
+          VDR Vdr;
+    */
+    VHW Vhw;
+    /*
+          VLW Vlw;
+          VPW Vpw;
+    */
+    VTG Vtg;
+    VWR Vwr;
+    VWT Vwt;
+    /*
+          WCV Wcv;
+          WNC Wnc;
+    */
+    WPL Wpl;
+    /*
+          XDR Xdr;
+          XTE Xte;
+          XTR Xtr;
+    */
+    ZDA Zda;
+    /*
+          ZFO Zfo;
+          ZTG Ztg;
+    */
+    wxString ErrorMessage; // Filled when Parse returns FALSE
+    wxString LastSentenceIDParsed; // ID of the lst sentence successfully parsed
+    wxString LastSentenceIDReceived; // ID of the last sentence received, may not have parsed successfully
 
-      void set_container_pointers( void );
-      void sort_response_table( void );
-
-   public:
-
-      NMEA0183L();
-      virtual ~NMEA0183L();
-
-      /*
-      ** NMEA 0183 Sentences we understand
-      */
-
-/*
-      AAM Aam;
-      ALM Alm;
-      APB Apb;
-      ASD Asd;
-      BEC Bec;
-      BOD Bod;
-      BWC Bwc;
-      BWR Bwr;
-      BWW Bww;
-*/
-      DBT Dbt;
-/*
-      DCN Dcn;
-*/
-      DPT Dpt;
-/*
-      FSI Fsi;
-*/
-      GGA Gga;
-/*
-      GLC Glc;
-*/
-      GLL Gll;
-      GSV Gsv;
-/*
-      GXA Gxa;
-*/
-      HDM Hdm;
-      HDG Hdg;
-      HDT Hdt;
-/*
-      HSC Hsc;
-      LCD Lcd;
-*/
-      MTW Mtw;
-      MWV Mwv;
-/*
-      OLN Oln;
-      OSD Osd;
-      P   Proprietary;
-      RMA Rma;
-*/
-      RMB Rmb;
-      RMC Rmc;
-/*
-      ROT Rot;
-      RPM Rpm;
-*/
-      RSA Rsa;
-/*
-      RSD Rsd;
-*/
-      RTE Rte;
-/*
-      SFI Sfi;
-      STN Stn;
-      TRF Trf;
-      TTM Ttm;
-      VBW Vbw;
-      VDR Vdr;
-*/
-      VHW Vhw;
-/*
-      VLW Vlw;
-      VPW Vpw;
-*/
-      VTG Vtg;
-      VWR Vwr;
-      VWT Vwt;
-/*
-      WCV Wcv;
-      WNC Wnc;
-*/
-      WPL Wpl;
-/*
-      XDR Xdr;
-      XTE Xte;
-      XTR Xtr;
-*/
-      ZDA Zda;
-/*
-      ZFO Zfo;
-      ZTG Ztg;
-*/
-      wxString ErrorMessage; // Filled when Parse returns FALSE
-      wxString LastSentenceIDParsed; // ID of the lst sentence successfully parsed
-      wxString LastSentenceIDReceived; // ID of the last sentence received, may not have parsed successfully
-
-      wxString TalkerID;
-      wxString ExpandedTalkerID;
+    wxString TalkerID;
+    wxString ExpandedTalkerID;
 
 //      MANUFACTURER_LIST Manufacturers;
 
-      virtual bool IsGood( void ) const;
-      virtual bool Parse( void );
-      virtual bool PreParse( void );
+    virtual bool IsGood( void ) const;
+    virtual bool Parse( void );
+    virtual bool PreParse( void );
 
-      NMEA0183L& operator << ( wxString& source );
-      NMEA0183L& operator >> ( wxString& destination );
+    NMEA0183L& operator << ( wxString& source );
+    NMEA0183L& operator >> ( wxString& destination );
 };
 
 #endif // NMEA_0183_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/response.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/response.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/response.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/response.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,52 +43,52 @@
 
 RESPONSE::RESPONSE()
 {
-   Talker.Empty();
-   ErrorMessage.Empty();
+    Talker.Empty();
+    ErrorMessage.Empty();
 }
 
 RESPONSE::~RESPONSE()
 {
-   Mnemonic.Empty();
-   Talker.Empty();
-   ErrorMessage.Empty();
+    Mnemonic.Empty();
+    Talker.Empty();
+    ErrorMessage.Empty();
 }
 
 void RESPONSE::SetContainer( NMEA0183L *container )
 {
-   container_p = container;
+    container_p = container;
 }
 
 void RESPONSE::SetErrorMessage( const wxString& error_message )
 {
-   ErrorMessage  = Mnemonic;
-   ErrorMessage += _T(", ");
-   ErrorMessage += error_message;
+    ErrorMessage  = Mnemonic;
+    ErrorMessage += _T( ", " );
+    ErrorMessage += error_message;
 }
 
 bool RESPONSE::Write( SENTENCE& sentence )
 {
-   /*
-   ** All NMEA0183 sentences begin with the mnemonic...
-   */
+    /*
+    ** All NMEA0183 sentences begin with the mnemonic...
+    */
 
-    sentence  = _T("$");
+    sentence  = _T( "$" );
 
-    if(NULL == container_p)
-          sentence.Sentence.Append(_T("--"));
+    if ( NULL == container_p )
+        sentence.Sentence.Append( _T( "--" ) );
     else
-          sentence.Sentence.Append(container_p->TalkerID);
+        sentence.Sentence.Append( container_p->TalkerID );
 
-    sentence.Sentence.Append(Mnemonic);
+    sentence.Sentence.Append( Mnemonic );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const wxString& RESPONSE::PlainEnglish( void )
 {
-   static wxString return_string;
+    static wxString return_string;
 
-   return_string.Empty();
+    return_string.Empty();
 
-   return( return_string );
+    return ( return_string );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/Response.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/Response.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/Response.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/Response.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,38 +43,38 @@
 
 class NMEA0183L;
 
-class RESPONSE 
+class RESPONSE
 {
 
-   private:
+private:
 
-      NMEA0183L *container_p;
+    NMEA0183L *container_p;
 
-   public:
+public:
 
-      RESPONSE();
-      virtual ~RESPONSE();
+    RESPONSE();
+    virtual ~RESPONSE();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      wxString ErrorMessage;
-      wxString Mnemonic;
-      wxString Talker;
+    wxString ErrorMessage;
+    wxString Mnemonic;
+    wxString Talker;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void ) = 0;
-      virtual bool Parse( const SENTENCE& sentence ) = 0;
-      virtual const wxString& PlainEnglish( void );
-      virtual void SetErrorMessage( const wxString& );
-      virtual void SetContainer( NMEA0183L *container );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void ) = 0;
+    virtual bool Parse( const SENTENCE& sentence ) = 0;
+    virtual const wxString& PlainEnglish( void );
+    virtual void SetErrorMessage( const wxString& );
+    virtual void SetContainer( NMEA0183L *container );
+    virtual bool Write( SENTENCE& sentence );
 };
 
 
- 
+
 #endif // RESPONSE_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rmb.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rmb.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rmb.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rmb.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,136 +43,136 @@
 
 RMB::RMB()
 {
-    Mnemonic = _T("RMB");
-   Empty();
+    Mnemonic = _T( "RMB" );
+    Empty();
 }
 
 RMB::~RMB()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void RMB::Empty( void )
 {
 
-   IsDataValid                     = Unknown0183;
-   CrossTrackError                 = 0.0;
-   DirectionToSteer                = LR_Unknown;
-   To.Empty();
-   From.Empty();
-   DestinationPosition.Empty();
-   RangeToDestinationNauticalMiles = 0.0;
-   BearingToDestinationDegreesTrue = 0.0;
-   DestinationClosingVelocityKnots = 0.0;
-   IsArrivalCircleEntered          = Unknown0183;
+    IsDataValid                     = Unknown0183;
+    CrossTrackError                 = 0.0;
+    DirectionToSteer                = LR_Unknown;
+    To.Empty();
+    From.Empty();
+    DestinationPosition.Empty();
+    RangeToDestinationNauticalMiles = 0.0;
+    BearingToDestinationDegreesTrue = 0.0;
+    DestinationClosingVelocityKnots = 0.0;
+    IsArrivalCircleEntered          = Unknown0183;
 }
 
 bool RMB::Parse( const SENTENCE& sentence )
 {
 
-   /*
-   ** RMB - Recommended Minimum Navigation Information
-   **                                                             14
-   **        1 2   3 4    5    6       7 8        9 10  11  12  13|
-   **        | |   | |    |    |       | |        | |   |   |   | |
-   ** $--RMB,A,x.x,a,c--c,c--c,llll.ll,a,yyyyy.yy,a,x.x,x.x,x.x,A*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Status, V = Navigation receiver warning
-   **  2) Cross Track error - nautical miles
-   **  3) Direction to Steer, Left or Right
-   **  4) TO Waypoint ID
-   **  5) FROM Waypoint ID
-   **  6) Destination Waypoint Latitude
-   **  7) N or S
-   **  8) Destination Waypoint Longitude
-   **  9) E or W
-   ** 10) Range to destination in nautical miles
-   ** 11) Bearing to destination in degrees True
-   ** 12) Destination closing velocity in knots
-   ** 13) Arrival Status, A = Arrival Circle Entered
-   ** 14) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 14 );
-
-   if ( check == NTrue )
-   {
-       SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   }
-
-/*
-   if ( check == Unknown0183 )
-   {
-       SetErrorMessage( _T("Missing Checksum") );
-      return( FALSE );
-   }
-*/
-
-   IsDataValid                     = sentence.Boolean( 1 );
-   CrossTrackError                 = sentence.Double( 2 );
-   DirectionToSteer                = sentence.LeftOrRight( 3 );
-   From                            = sentence.Field( 4 );
-   To                              = sentence.Field( 5 );
-   DestinationPosition.Parse( 6, 7, 8, 9, sentence );
-   RangeToDestinationNauticalMiles = sentence.Double( 10 );
-   BearingToDestinationDegreesTrue = sentence.Double( 11 );
-   DestinationClosingVelocityKnots = sentence.Double( 12 );
-   IsArrivalCircleEntered          = sentence.Boolean( 13 );
+    /*
+    ** RMB - Recommended Minimum Navigation Information
+    **                                                             14
+    **        1 2   3 4    5    6       7 8        9 10  11  12  13|
+    **        | |   | |    |    |       | |        | |   |   |   | |
+    ** $--RMB,A,x.x,a,c--c,c--c,llll.ll,a,yyyyy.yy,a,x.x,x.x,x.x,A*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Status, V = Navigation receiver warning
+    **  2) Cross Track error - nautical miles
+    **  3) Direction to Steer, Left or Right
+    **  4) TO Waypoint ID
+    **  5) FROM Waypoint ID
+    **  6) Destination Waypoint Latitude
+    **  7) N or S
+    **  8) Destination Waypoint Longitude
+    **  9) E or W
+    ** 10) Range to destination in nautical miles
+    ** 11) Bearing to destination in degrees True
+    ** 12) Destination closing velocity in knots
+    ** 13) Arrival Status, A = Arrival Circle Entered
+    ** 14) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 14 );
+
+    if ( check == NTrue )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    /*
+       if ( check == Unknown0183 )
+       {
+           SetErrorMessage( _T("Missing Checksum") );
+          return( FALSE );
+       }
+    */
+
+    IsDataValid                     = sentence.Boolean( 1 );
+    CrossTrackError                 = sentence.Double( 2 );
+    DirectionToSteer                = sentence.LeftOrRight( 3 );
+    From                            = sentence.Field( 4 );
+    To                              = sentence.Field( 5 );
+    DestinationPosition.Parse( 6, 7, 8, 9, sentence );
+    RangeToDestinationNauticalMiles = sentence.Double( 10 );
+    BearingToDestinationDegreesTrue = sentence.Double( 11 );
+    DestinationClosingVelocityKnots = sentence.Double( 12 );
+    IsArrivalCircleEntered          = sentence.Boolean( 13 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool RMB::Write( SENTENCE& sentence )
 {
 
-   /*
-   ** Let the parent do its thing
-   */
-
-   RESPONSE::Write( sentence );
-
-   sentence += IsDataValid;
-   sentence += CrossTrackError;
-   if(DirectionToSteer == Left)
-       sentence += _T("L");
-   else
-       sentence += _T("R");
-
-   sentence += From;
-   sentence += To;
-   sentence += DestinationPosition;
-   sentence += RangeToDestinationNauticalMiles;
-   sentence += BearingToDestinationDegreesTrue;
-   sentence += DestinationClosingVelocityKnots;
-   sentence += IsArrivalCircleEntered;
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += IsDataValid;
+    sentence += CrossTrackError;
+    if ( DirectionToSteer == Left )
+        sentence += _T( "L" );
+    else
+        sentence += _T( "R" );
+
+    sentence += From;
+    sentence += To;
+    sentence += DestinationPosition;
+    sentence += RangeToDestinationNauticalMiles;
+    sentence += BearingToDestinationDegreesTrue;
+    sentence += DestinationClosingVelocityKnots;
+    sentence += IsArrivalCircleEntered;
 
-   sentence.Finish();
+    sentence.Finish();
 
 //   NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 14 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const RMB& RMB::operator = ( const RMB& source )
 {
 
-   IsDataValid                     = source.IsDataValid;
-   CrossTrackError                 = source.CrossTrackError;
-   DirectionToSteer                = source.DirectionToSteer;
-   From                            = source.From;
-   To                              = source.To;
-   DestinationPosition             = source.DestinationPosition;
-   RangeToDestinationNauticalMiles = source.RangeToDestinationNauticalMiles;
-   BearingToDestinationDegreesTrue = source.BearingToDestinationDegreesTrue;
-   DestinationClosingVelocityKnots = source.DestinationClosingVelocityKnots;
-   IsArrivalCircleEntered          = source.IsArrivalCircleEntered;
+    IsDataValid                     = source.IsDataValid;
+    CrossTrackError                 = source.CrossTrackError;
+    DirectionToSteer                = source.DirectionToSteer;
+    From                            = source.From;
+    To                              = source.To;
+    DestinationPosition             = source.DestinationPosition;
+    RangeToDestinationNauticalMiles = source.RangeToDestinationNauticalMiles;
+    BearingToDestinationDegreesTrue = source.BearingToDestinationDegreesTrue;
+    DestinationClosingVelocityKnots = source.DestinationClosingVelocityKnots;
+    IsArrivalCircleEntered          = source.IsArrivalCircleEntered;
 
-  return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/RMB.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/RMB.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/RMB.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/RMB.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,39 +44,39 @@
 class RMB : public RESPONSE
 {
 
-   public:
+public:
 
-      RMB();
-      virtual ~RMB();
+    RMB();
+    virtual ~RMB();
 
-      /*
-      ** Data
-      */
-
-      NMEA0183L_BOOLEAN IsDataValid;
-      double           CrossTrackError;
-      LEFTRIGHT        DirectionToSteer;
-      wxString          To;
-      wxString          From;
-      LATLONG          DestinationPosition;
-      double           RangeToDestinationNauticalMiles;
-      double           BearingToDestinationDegreesTrue;
-      double           DestinationClosingVelocityKnots;
-      NMEA0183L_BOOLEAN IsArrivalCircleEntered;
-
-      /*
-      ** Methods
-      */
-
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
-
-      /*
-      ** Operators
-      */
+    /*
+    ** Data
+    */
+
+    NMEA0183L_BOOLEAN IsDataValid;
+    double           CrossTrackError;
+    LEFTRIGHT        DirectionToSteer;
+    wxString          To;
+    wxString          From;
+    LATLONG          DestinationPosition;
+    double           RangeToDestinationNauticalMiles;
+    double           BearingToDestinationDegreesTrue;
+    double           DestinationClosingVelocityKnots;
+    NMEA0183L_BOOLEAN IsArrivalCircleEntered;
+
+    /*
+    ** Methods
+    */
+
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
+
+    /*
+    ** Operators
+    */
 
-      virtual const RMB& operator = ( const RMB& source );
+    virtual const RMB& operator = ( const RMB& source );
 };
 
 #endif // RMB_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rmc.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rmc.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rmc.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rmc.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,147 +43,147 @@
 
 RMC::RMC()
 {
-    Mnemonic = _T("RMC");
-   Empty();
+    Mnemonic = _T( "RMC" );
+    Empty();
 }
 
 RMC::~RMC()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void RMC::Empty( void )
 {
 
-   UTCTime.Empty();
-   IsDataValid                = Unknown0183;
-   SpeedOverGroundKnots       = 0.0;
-   Position.Empty();
-   TrackMadeGoodDegreesTrue   = 0.0;
-   Date.Empty();
-   MagneticVariation          = 0.0;
-   MagneticVariationDirection = EW_Unknown;
+    UTCTime.Empty();
+    IsDataValid                = Unknown0183;
+    SpeedOverGroundKnots       = 0.0;
+    Position.Empty();
+    TrackMadeGoodDegreesTrue   = 0.0;
+    Date.Empty();
+    MagneticVariation          = 0.0;
+    MagneticVariationDirection = EW_Unknown;
 }
 
 bool RMC::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** RMC - Recommended Minimum Navigation Information
-   **
-   **  Version 2.0 Format
-   **                                                            12
-   **        1         2 3       4 5        6 7   8   9    10  11|
-   **        |         | |       | |        | |   |   |    |   | |
-   ** $--RMC,hhmmss.ss,A,llll.ll,a,yyyyy.yy,a,x.x,x.x,xxxx,x.x,a*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) UTC Time
-   **  2) Status, V = Navigation receiver warning
-   **  3) Latitude
-   **  4) N or S
-   **  5) Longitude
-   **  6) E or W
-   **  7) Speed over ground, knots
-   **  8) Track made good, degrees true
-   **  9) Date, ddmmyy
-   ** 10) Magnetic Variation, degrees
-   ** 11) E or W
-
-   ** Version 2.0
-   ** 12) Checksum
-
-   ** Version 2.3
-   ** 12) Mode (D or A), optional, may be NULL
-   ** 13) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 12 );
-
-   if ( check == NTrue )
-   {
-   /*
-   ** This may be an NMEA Version 2.3 sentence, with "Mode" field
-   */
-       wxString checksum_in_sentence = sentence.Field( 12 );
-       if(checksum_in_sentence.StartsWith(_T("*")))       // Field is a valid erroneous checksum
-       {
-         SetErrorMessage( _T("Invalid Checksum") );
-         return( FALSE );
-       }
-       else
+    /*
+    ** RMC - Recommended Minimum Navigation Information
+    **
+    **  Version 2.0 Format
+    **                                                            12
+    **        1         2 3       4 5        6 7   8   9    10  11|
+    **        |         | |       | |        | |   |   |    |   | |
+    ** $--RMC,hhmmss.ss,A,llll.ll,a,yyyyy.yy,a,x.x,x.x,xxxx,x.x,a*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) UTC Time
+    **  2) Status, V = Navigation receiver warning
+    **  3) Latitude
+    **  4) N or S
+    **  5) Longitude
+    **  6) E or W
+    **  7) Speed over ground, knots
+    **  8) Track made good, degrees true
+    **  9) Date, ddmmyy
+    ** 10) Magnetic Variation, degrees
+    ** 11) E or W
+
+    ** Version 2.0
+    ** 12) Checksum
+
+    ** Version 2.3
+    ** 12) Mode (D or A), optional, may be NULL
+    ** 13) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 12 );
+
+    if ( check == NTrue )
+    {
+        /*
+        ** This may be an NMEA Version 2.3 sentence, with "Mode" field
+        */
+        wxString checksum_in_sentence = sentence.Field( 12 );
+        if ( checksum_in_sentence.StartsWith( _T( "*" ) ) ) // Field is a valid erroneous checksum
+        {
+            SetErrorMessage( _T( "Invalid Checksum" ) );
+            return ( FALSE );
+        }
+        else
+        {
+            check = sentence.IsChecksumBad( 13 );
+            if ( check == NTrue )
+            {
+                SetErrorMessage( _T( "Invalid Checksum" ) );
+                return ( FALSE );
+            }
+        }
+    }
+
+    /*
+       if ( check == Unknown0183 )
        {
-         check = sentence.IsChecksumBad( 13 );
-         if( check == NTrue)
-         {
-            SetErrorMessage( _T("Invalid Checksum") );
-            return( FALSE );
-         }
+           SetErrorMessage( _T("Missing Checksum") );
+          return( FALSE );
        }
-   }
+    */
 
-/*
-   if ( check == Unknown0183 )
-   {
-       SetErrorMessage( _T("Missing Checksum") );
-      return( FALSE );
-   }
-*/
-
-   UTCTime                    = sentence.Field( 1 );
-   IsDataValid                = sentence.Boolean( 2 );
-   Position.Parse( 3, 4, 5, 6, sentence );
-   SpeedOverGroundKnots       = sentence.Double( 7 );
-   TrackMadeGoodDegreesTrue   = sentence.Double( 8 );
-   Date                       = sentence.Field( 9 );
-   MagneticVariation          = sentence.Double( 10 );
-   MagneticVariationDirection = sentence.EastOrWest( 11 );
+    UTCTime                    = sentence.Field( 1 );
+    IsDataValid                = sentence.Boolean( 2 );
+    Position.Parse( 3, 4, 5, 6, sentence );
+    SpeedOverGroundKnots       = sentence.Double( 7 );
+    TrackMadeGoodDegreesTrue   = sentence.Double( 8 );
+    Date                       = sentence.Field( 9 );
+    MagneticVariation          = sentence.Double( 10 );
+    MagneticVariationDirection = sentence.EastOrWest( 11 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool RMC::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-
-   RESPONSE::Write( sentence );
-
-   sentence += UTCTime;
-   sentence += IsDataValid;
-   sentence += Position;
-   sentence += SpeedOverGroundKnots;
-   sentence += TrackMadeGoodDegreesTrue;
-   sentence += Date;
-   sentence += MagneticVariation;
-   sentence += MagneticVariationDirection;
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += UTCTime;
+    sentence += IsDataValid;
+    sentence += Position;
+    sentence += SpeedOverGroundKnots;
+    sentence += TrackMadeGoodDegreesTrue;
+    sentence += Date;
+    sentence += MagneticVariation;
+    sentence += MagneticVariationDirection;
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const RMC& RMC::operator = ( const RMC& source )
 {
 //   ASSERT_VALID( this );
 
-   UTCTime                    = source.UTCTime;
-   IsDataValid                = source.IsDataValid;
-   Position                   = source.Position;
-   SpeedOverGroundKnots       = source.SpeedOverGroundKnots;
-   TrackMadeGoodDegreesTrue   = source.TrackMadeGoodDegreesTrue;
-   Date                       = source.Date;
-   MagneticVariation          = source.MagneticVariation;
-   MagneticVariationDirection = source.MagneticVariationDirection;
+    UTCTime                    = source.UTCTime;
+    IsDataValid                = source.IsDataValid;
+    Position                   = source.Position;
+    SpeedOverGroundKnots       = source.SpeedOverGroundKnots;
+    TrackMadeGoodDegreesTrue   = source.TrackMadeGoodDegreesTrue;
+    Date                       = source.Date;
+    MagneticVariation          = source.MagneticVariation;
+    MagneticVariationDirection = source.MagneticVariationDirection;
 
-  return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rsa.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rsa.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rsa.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rsa.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,91 +44,91 @@
 
 RSA::RSA()
 {
-   Mnemonic = _T("RSA");
-   Empty();
+    Mnemonic = _T( "RSA" );
+    Empty();
 }
 
 RSA::~RSA()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void RSA::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   Starboard            = 0.0;
-   IsStarboardDataValid = Unknown0183;
-   Port                 = 0.0;
-   IsPortDataValid      = Unknown0183;
+    Starboard            = 0.0;
+    IsStarboardDataValid = Unknown0183;
+    Port                 = 0.0;
+    IsPortDataValid      = Unknown0183;
 }
 
 bool RSA::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** RSA - Rudder Sensor Angle
-   **
-   **        1   2 3   4 5
-   **        |   | |   | |
-   ** $--RSA,x.x,A,x.x,A*hh<CR><LF>
-   **
-   ** Field Number: 
-   **  1) Starboard (or single) rudder sensor, "-" means Turn To Port
-   **  2) Status, A means data is valid
-   **  3) Port rudder sensor
-   **  4) Status, A means data is valid
-   **  5) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 5 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
-
-   Starboard            = sentence.Double(  1 );
-   IsStarboardDataValid = sentence.Boolean( 2 );
-   Port                 = sentence.Double(  3 );
-   IsPortDataValid      = sentence.Boolean( 4 );
+    /*
+    ** RSA - Rudder Sensor Angle
+    **
+    **        1   2 3   4 5
+    **        |   | |   | |
+    ** $--RSA,x.x,A,x.x,A*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Starboard (or single) rudder sensor, "-" means Turn To Port
+    **  2) Status, A means data is valid
+    **  3) Port rudder sensor
+    **  4) Status, A means data is valid
+    **  5) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 5 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    Starboard            = sentence.Double(  1 );
+    IsStarboardDataValid = sentence.Boolean( 2 );
+    Port                 = sentence.Double(  3 );
+    IsPortDataValid      = sentence.Boolean( 4 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool RSA::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
-
-   sentence += Starboard;
-   sentence += IsStarboardDataValid;
-   sentence += Port;
-   sentence += IsPortDataValid;
-   
-   sentence.Finish();
+    /*
+    ** Let the parent do its thing
+    */
 
-   return( TRUE );
+    RESPONSE::Write( sentence );
+
+    sentence += Starboard;
+    sentence += IsStarboardDataValid;
+    sentence += Port;
+    sentence += IsPortDataValid;
+
+    sentence.Finish();
+
+    return ( TRUE );
 }
 
 const RSA& RSA::operator = ( const RSA& source )
 {
 //   ASSERT_VALID( this );
 
-   Starboard            = source.Starboard;
-   IsStarboardDataValid = source.IsStarboardDataValid;
-   Port                 = source.Port;
-   IsPortDataValid      = source.IsPortDataValid;
+    Starboard            = source.Starboard;
+    IsStarboardDataValid = source.IsStarboardDataValid;
+    Port                 = source.Port;
+    IsPortDataValid      = source.IsPortDataValid;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rsa.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rsa.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rsa.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rsa.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -45,33 +45,33 @@
 {
 //   DECLARE_DYNAMIC( RSA )
 
-   public:
+public:
 
-      RSA();
-     ~RSA();
+    RSA();
+    ~RSA();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double           Starboard;
-      NMEA0183L_BOOLEAN IsStarboardDataValid;
-      double           Port;
-      NMEA0183L_BOOLEAN IsPortDataValid;
+    double           Starboard;
+    NMEA0183L_BOOLEAN IsStarboardDataValid;
+    double           Port;
+    NMEA0183L_BOOLEAN IsPortDataValid;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const RSA& operator = ( const RSA& source );
+    virtual const RSA& operator = ( const RSA& source );
 };
 
 #endif // RSA_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rte.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rte.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rte.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rte.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,145 +43,145 @@
 
 RTE::RTE()
 {
-   Mnemonic = _T("RTE");
-   Empty();
+    Mnemonic = _T( "RTE" );
+    Empty();
 }
 
 RTE::~RTE()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void RTE::Empty( void )
 {
-   total_number_of_messages     = 0;
-   last_message_number_received = 0;
-   message_number               = 0;
-   last_waypoint_number_written = 0;
+    total_number_of_messages     = 0;
+    last_message_number_received = 0;
+    message_number               = 0;
+    last_waypoint_number_written = 0;
 
-   TypeOfRoute = RouteUnknown;
-   RouteName.Empty();
+    TypeOfRoute = RouteUnknown;
+    RouteName.Empty();
 
-   delete_all_entries();
+    delete_all_entries();
 }
 
 bool RTE::Parse( const SENTENCE& sentence )
 {
-   /*
-   ** RTE - Routes
-   **
-   **        1   2   3 4	 5		       x    n
-   **        |   |   | |    |           |    |
-   ** $--RTE,x.x,x.x,a,c--c,c--c, ..... c--c*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Total number of messages being transmitted
-   **  2) Message Number
-   **  3) Message mode
-   **     c = complete route, all waypoints
-   **     w = working route, the waypoint you just left, the waypoint you're heading to then all the rest
-   **  4) Waypoint ID
-   **  x) More Waypoints
-   **  n) Checksum
-   */
+    /*
+    ** RTE - Routes
+    **
+    **        1   2   3 4	 5		       x    n
+    **        |   |   | |    |           |    |
+    ** $--RTE,x.x,x.x,a,c--c,c--c, ..... c--c*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Total number of messages being transmitted
+    **  2) Message Number
+    **  3) Message mode
+    **     c = complete route, all waypoints
+    **     w = working route, the waypoint you just left, the waypoint you're heading to then all the rest
+    **  4) Waypoint ID
+    **  x) More Waypoints
+    **  n) Checksum
+    */
 
-   delete_all_entries();
+    delete_all_entries();
 
-   int field_number = 1;
+    int field_number = 1;
 
-   total_number_of_messages = sentence.Integer( 1 );
+    total_number_of_messages = sentence.Integer( 1 );
 //   total_number_of_messages = sentence.Double( 1 );
 
-   int this_message_number = sentence.Integer( 2 );
+    int this_message_number = sentence.Integer( 2 );
 //   double this_message_number = sentence.Double( 2 );
 
-   if ( this_message_number == 1 )
-   {
-      /*
-      ** Make sure we've got a clean list
-      */
-
-      delete_all_entries();
-   }
-
-
-   if ( sentence.Field( 3 ).StartsWith(_T("c")) )
-   {
-      TypeOfRoute = CompleteRoute;
-   }
-   else if ( sentence.Field( 3 ).StartsWith(_T("w")))
-   {
-      TypeOfRoute = WorkingRoute;
-   }
-   else
-   {
-      TypeOfRoute = RouteUnknown;
-   }
-
-   RouteName = sentence.Field( 4 );
-
-   int number_of_data_fields = sentence.GetNumberOfDataFields();
-   field_number = 5;
-
-   while( field_number < number_of_data_fields )
-   {
-      Waypoints.Add( ( sentence.Field( field_number ) )) ;
-      field_number++;
-   }
+    if ( this_message_number == 1 )
+    {
+        /*
+        ** Make sure we've got a clean list
+        */
+
+        delete_all_entries();
+    }
+
+
+    if ( sentence.Field( 3 ).StartsWith( _T( "c" ) ) )
+    {
+        TypeOfRoute = CompleteRoute;
+    }
+    else if ( sentence.Field( 3 ).StartsWith( _T( "w" ) ) )
+    {
+        TypeOfRoute = WorkingRoute;
+    }
+    else
+    {
+        TypeOfRoute = RouteUnknown;
+    }
+
+    RouteName = sentence.Field( 4 );
+
+    int number_of_data_fields = sentence.GetNumberOfDataFields();
+    field_number = 5;
+
+    while ( field_number < number_of_data_fields )
+    {
+        Waypoints.Add( ( sentence.Field( field_number ) ) ) ;
+        field_number++;
+    }
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool RTE::Write( SENTENCE& sentence )
 {
 
-   /*
-   ** Let the parent do its thing
-   */
-
-   RESPONSE::Write( sentence );
-
-   sentence += total_number_of_messages;
-   sentence += message_number;
-
-   switch( TypeOfRoute )
-   {
-      case CompleteRoute:
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += total_number_of_messages;
+    sentence += message_number;
+
+    switch ( TypeOfRoute )
+    {
+    case CompleteRoute:
 
 //            sentence += _T("C");             // uppercase required for GPS MLR FFX312
-            sentence += _T("c");             // trying lowercase for generic NMEA device
-            break;
+        sentence += _T( "c" );           // trying lowercase for generic NMEA device
+        break;
 
-      case WorkingRoute:
+    case WorkingRoute:
 
-         sentence += _T("w");
-         break;
+        sentence += _T( "w" );
+        break;
 
-      default:
+    default:
 
 //         sentence += "";
-         break;
-   }
+        break;
+    }
 
-   sentence += RouteName;
+    sentence += RouteName;
 
-   for(unsigned int i=0 ; i < Waypoints.GetCount() ; i++)
-         sentence += Waypoints[i];
+    for ( unsigned int i=0 ; i < Waypoints.GetCount() ; i++ )
+        sentence += Waypoints[i];
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
-bool RTE::AddWaypoint(const wxString& name)
+bool RTE::AddWaypoint( const wxString& name )
 {
-      Waypoints.Add(name);
+    Waypoints.Add( name );
 
-      return( TRUE );
+    return ( TRUE );
 }
 
 void RTE::delete_all_entries( void )
 {
-   Waypoints.Clear();
+    Waypoints.Clear();
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rte.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rte.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/rte.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/rte.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,30 +44,30 @@
 class RTE : public RESPONSE
 {
 
-   private:
+private:
 
-      void delete_all_entries( void );
+    void delete_all_entries( void );
 
-      double last_message_number_received;
+    double last_message_number_received;
 
-      int last_waypoint_number_written;
+    int last_waypoint_number_written;
 
-   public:
+public:
 
-      RTE();
-     ~RTE();
+    RTE();
+    ~RTE();
 
 
-      ROUTE_TYPE TypeOfRoute;
-      wxString    RouteName;
-      wxArrayString Waypoints;
-      int message_number;
-      int total_number_of_messages;
+    ROUTE_TYPE TypeOfRoute;
+    wxString    RouteName;
+    wxArrayString Waypoints;
+    int message_number;
+    int total_number_of_messages;
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
-      virtual bool AddWaypoint(const wxString& name);
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
+    virtual bool AddWaypoint( const wxString& name );
 };
 
 #endif // RTE_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/SatInfo.h opencpn-plugin-logbookkonni-1.2024/src/nmea0183/SatInfo.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/SatInfo.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/SatInfo.h	2016-02-25 13:06:29.000000000 +0000
@@ -35,10 +35,10 @@
 
 typedef struct
 {
-   int SatNumber;
-   int ElevationDegrees;
-   int AzimuthDegreesTrue;
-   int SignalToNoiseRatio;
+    int SatNumber;
+    int ElevationDegrees;
+    int AzimuthDegreesTrue;
+    int SignalToNoiseRatio;
 } SAT_INFO;
 
 #endif // SAT_INFO_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/sentence.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/sentence.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/sentence.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/sentence.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,117 +43,117 @@
 
 SENTENCE::SENTENCE()
 {
-   Sentence.Empty();
+    Sentence.Empty();
 }
 
 SENTENCE::~SENTENCE()
 {
-   Sentence.Empty();
+    Sentence.Empty();
 }
 
 NMEA0183L_BOOLEAN SENTENCE::Boolean( int field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   wxString field_data;
+    wxString field_data;
 
-   field_data = Field( field_number );
+    field_data = Field( field_number );
 
-   if ( field_data.StartsWith(_T("A")) )
-   {
-      return( NTrue );
-   }
-   else if ( field_data.StartsWith(_T("V")) )
-   {
-      return( NFalse );
-   }
-   else
-   {
-      return( Unknown0183 );
-   }
+    if ( field_data.StartsWith( _T( "A" ) ) )
+    {
+        return ( NTrue );
+    }
+    else if ( field_data.StartsWith( _T( "V" ) ) )
+    {
+        return ( NFalse );
+    }
+    else
+    {
+        return ( Unknown0183 );
+    }
 }
 
 COMMUNICATIONS_MODE SENTENCE::CommunicationsMode( int field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   wxString field_data;
+    wxString field_data;
 
-   field_data = Field( field_number );
+    field_data = Field( field_number );
 
-   if ( field_data == _T("d") )
-   {
-      return( F3E_G3E_SimplexTelephone );
-   }
-   else if ( field_data == _T("e") )
-   {
-      return( F3E_G3E_DuplexTelephone );
-   }
-   else if ( field_data == _T("m") )
-   {
-      return( J3E_Telephone );
-   }
-   else if ( field_data == _T("o") )
-   {
-      return( H3E_Telephone );
-   }
-   else if ( field_data == _T("q") )
-   {
-      return( F1B_J2B_FEC_NBDP_TelexTeleprinter );
-   }
-   else if ( field_data == _T("s") )
-   {
-      return( F1B_J2B_ARQ_NBDP_TelexTeleprinter );
-   }
-   else if ( field_data == _T("w") )
-   {
-      return( F1B_J2B_ReceiveOnlyTeleprinterDSC );
-   }
-   else if ( field_data == _T("x") )
-   {
-      return( A1A_MorseTapeRecorder );
-   }
-   else if ( field_data == _T("{") )
-   {
-      return( A1A_MorseKeyHeadset );
-   }
-   else if ( field_data == _T("|") )
-   {
-      return( F1C_F2C_F3C_FaxMachine );
-   }
-   else
-   {
-      return( CommunicationsModeUnknown );
-   }
+    if ( field_data == _T( "d" ) )
+    {
+        return ( F3E_G3E_SimplexTelephone );
+    }
+    else if ( field_data == _T( "e" ) )
+    {
+        return ( F3E_G3E_DuplexTelephone );
+    }
+    else if ( field_data == _T( "m" ) )
+    {
+        return ( J3E_Telephone );
+    }
+    else if ( field_data == _T( "o" ) )
+    {
+        return ( H3E_Telephone );
+    }
+    else if ( field_data == _T( "q" ) )
+    {
+        return ( F1B_J2B_FEC_NBDP_TelexTeleprinter );
+    }
+    else if ( field_data == _T( "s" ) )
+    {
+        return ( F1B_J2B_ARQ_NBDP_TelexTeleprinter );
+    }
+    else if ( field_data == _T( "w" ) )
+    {
+        return ( F1B_J2B_ReceiveOnlyTeleprinterDSC );
+    }
+    else if ( field_data == _T( "x" ) )
+    {
+        return ( A1A_MorseTapeRecorder );
+    }
+    else if ( field_data == _T( "{" ) )
+    {
+        return ( A1A_MorseKeyHeadset );
+    }
+    else if ( field_data == _T( "|" ) )
+    {
+        return ( F1C_F2C_F3C_FaxMachine );
+    }
+    else
+    {
+        return ( CommunicationsModeUnknown );
+    }
 }
 
 unsigned char SENTENCE::ComputeChecksum( void ) const
 {
-   unsigned char checksum_value = 0;
+    unsigned char checksum_value = 0;
 
-   int string_length = Sentence.Length();
-   int index = 1; // Skip over the $ at the begining of the sentence
+    int string_length = Sentence.Length();
+    int index = 1; // Skip over the $ at the begining of the sentence
 
-   while( index < string_length    &&
-       Sentence[ index ] != '*' &&
-       Sentence[ index ] != CARRIAGE_RETURN &&
-       Sentence[ index ] != LINE_FEED )
-   {
-       checksum_value ^= (char)Sentence[ index ];
-       index++;
-   }
+    while ( index < string_length    &&
+            Sentence[ index ] != '*' &&
+            Sentence[ index ] != CARRIAGE_RETURN &&
+            Sentence[ index ] != LINE_FEED )
+    {
+        checksum_value ^= ( char )Sentence[ index ];
+        index++;
+    }
 
-   return( checksum_value );
+    return ( checksum_value );
 }
 
 double SENTENCE::Double( int field_number ) const
 {
- //  ASSERT_VALID( this );
-    wxCharBuffer abuf = Field( field_number).ToUTF8();
-    if( !abuf.data() )                            // badly formed sentence?
-        return (999.);
- 
-    return( ::atof( abuf.data() ));
+//  ASSERT_VALID( this );
+    wxCharBuffer abuf = Field( field_number ).ToUTF8();
+    if ( !abuf.data() )                           // badly formed sentence?
+        return ( 999. );
+
+    return ( ::atof( abuf.data() ) );
 }
 
 
@@ -161,271 +161,271 @@
 {
 //   ASSERT_VALID( this );
 
-   wxString field_data;
+    wxString field_data;
 
-   field_data = Field( field_number );
+    field_data = Field( field_number );
 
-   if ( field_data == _T("E") )
-   {
-      return( East );
-   }
-   else if ( field_data == _T("W") )
-   {
-      return( West );
-   }
-   else
-   {
-      return( EW_Unknown );
-   }
+    if ( field_data == _T( "E" ) )
+    {
+        return ( East );
+    }
+    else if ( field_data == _T( "W" ) )
+    {
+        return ( West );
+    }
+    else
+    {
+        return ( EW_Unknown );
+    }
 }
 
 const wxString& SENTENCE::Field( int desired_field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   static wxString return_string;
-   return_string.Empty();
+    static wxString return_string;
+    return_string.Empty();
 
-   int index                = 1; // Skip over the $ at the begining of the sentence
-   int current_field_number = 0;
-   int string_length        = 0;
-
-   string_length = Sentence.Len();
-
-   while( current_field_number < desired_field_number && index < string_length )
-   {
-      if ( Sentence[ index ] == ',' || Sentence[ index ] == '*' )
-      {
-         current_field_number++;
-      }
-
-      if( Sentence[ index ] == '*')
-          return_string += Sentence[ index ];
-
-      index++;
-   }
-
-   if ( current_field_number == desired_field_number )
-   {
-      while( index < string_length    &&
-             Sentence[ index ] != ',' &&
-             Sentence[ index ] != '*' &&
-             Sentence[ index ] != 0x00 )
-      {
-         return_string += Sentence[ index ];
-         index++;
-      }
-   }
+    int index                = 1; // Skip over the $ at the begining of the sentence
+    int current_field_number = 0;
+    int string_length        = 0;
+
+    string_length = Sentence.Len();
+
+    while ( current_field_number < desired_field_number && index < string_length )
+    {
+        if ( Sentence[ index ] == ',' || Sentence[ index ] == '*' )
+        {
+            current_field_number++;
+        }
+
+        if ( Sentence[ index ] == '*' )
+            return_string += Sentence[ index ];
+
+        index++;
+    }
+
+    if ( current_field_number == desired_field_number )
+    {
+        while ( index < string_length    &&
+                Sentence[ index ] != ',' &&
+                Sentence[ index ] != '*' &&
+                Sentence[ index ] != 0x00 )
+        {
+            return_string += Sentence[ index ];
+            index++;
+        }
+    }
 
 
-   return( return_string );
+    return ( return_string );
 }
 
 int SENTENCE::GetNumberOfDataFields( void ) const
 {
 //   ASSERT_VALID( this );
 
-   int index                = 1; // Skip over the $ at the begining of the sentence
-   int current_field_number = 0;
-   int string_length        = 0;
-
-   string_length = Sentence.Len();
-
-   while( index < string_length )
-   {
-      if ( Sentence[ index ] == '*' )
-      {
-         return( (int) current_field_number );
-      }
-
-      if ( Sentence[ index ] == ',' )
-      {
-         current_field_number++;
-      }
+    int index                = 1; // Skip over the $ at the begining of the sentence
+    int current_field_number = 0;
+    int string_length        = 0;
+
+    string_length = Sentence.Len();
+
+    while ( index < string_length )
+    {
+        if ( Sentence[ index ] == '*' )
+        {
+            return ( ( int ) current_field_number );
+        }
+
+        if ( Sentence[ index ] == ',' )
+        {
+            current_field_number++;
+        }
 
-      index++;
-   }
+        index++;
+    }
 
-   return( (int) current_field_number );
+    return ( ( int ) current_field_number );
 }
 
 void SENTENCE::Finish( void )
 {
 //   ASSERT_VALID( this );
 
-   unsigned char checksum = ComputeChecksum();
+    unsigned char checksum = ComputeChecksum();
 
-   wxString temp_string;
+    wxString temp_string;
 
-   temp_string.Printf(_T("*%02X%c%c"), (int) checksum, CARRIAGE_RETURN, LINE_FEED );
-   Sentence += temp_string;
+    temp_string.Printf( _T( "*%02X%c%c" ), ( int ) checksum, CARRIAGE_RETURN, LINE_FEED );
+    Sentence += temp_string;
 }
 
 int SENTENCE::Integer( int field_number ) const
 {
 //   ASSERT_VALID( this );
 
-    wxCharBuffer abuf = Field( field_number).ToUTF8();
-    if( !abuf.data() )                            // badly formed sentence?
+    wxCharBuffer abuf = Field( field_number ).ToUTF8();
+    if ( !abuf.data() )                           // badly formed sentence?
         return 0;
-    
-    return( ::atoi( abuf.data() ));
+
+    return ( ::atoi( abuf.data() ) );
 }
 
 NMEA0183L_BOOLEAN SENTENCE::IsChecksumBad( int checksum_field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Checksums are optional, return TRUE if an existing checksum is known to be bad
-   */
-
-   wxString checksum_in_sentence = Field( checksum_field_number );
-
-   if ( checksum_in_sentence == _T("") )
-   {
-      return( Unknown0183 );
-   }
-
-   wxString check = checksum_in_sentence.Mid( 1 );
-   if ( ComputeChecksum() != HexValue( check ) )
-   {
-      return( NTrue );
-   }
+    /*
+    ** Checksums are optional, return TRUE if an existing checksum is known to be bad
+    */
+
+    wxString checksum_in_sentence = Field( checksum_field_number );
+
+    if ( checksum_in_sentence == _T( "" ) )
+    {
+        return ( Unknown0183 );
+    }
+
+    wxString check = checksum_in_sentence.Mid( 1 );
+    if ( ComputeChecksum() != HexValue( check ) )
+    {
+        return ( NTrue );
+    }
 
-   return( NFalse );
+    return ( NFalse );
 }
 
 LEFTRIGHT SENTENCE::LeftOrRight( int field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   wxString field_data;
+    wxString field_data;
 
-   field_data = Field( field_number );
+    field_data = Field( field_number );
 
-   if ( field_data == _T("L") )
-   {
-      return( Left );
-   }
-   else if ( field_data == _T("R") )
-   {
-      return( Right );
-   }
-   else
-   {
-      return( LR_Unknown );
-   }
+    if ( field_data == _T( "L" ) )
+    {
+        return ( Left );
+    }
+    else if ( field_data == _T( "R" ) )
+    {
+        return ( Right );
+    }
+    else
+    {
+        return ( LR_Unknown );
+    }
 }
 
 NORTHSOUTH SENTENCE::NorthOrSouth( int field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   wxString field_data;
+    wxString field_data;
 
-   field_data = Field( field_number );
+    field_data = Field( field_number );
 
-   if ( field_data == _T("N") )
-   {
-      return( North );
-   }
-   else if ( field_data == _T("S") )
-   {
-      return( South );
-   }
-   else
-   {
-      return( NS_Unknown );
-   }
+    if ( field_data == _T( "N" ) )
+    {
+        return ( North );
+    }
+    else if ( field_data == _T( "S" ) )
+    {
+        return ( South );
+    }
+    else
+    {
+        return ( NS_Unknown );
+    }
 }
 
 REFERENCE SENTENCE::Reference( int field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   wxString field_data;
+    wxString field_data;
 
-   field_data = Field( field_number );
+    field_data = Field( field_number );
 
-   if ( field_data == _T("B") )
-   {
-      return( BottomTrackingLog );
-   }
-   else if ( field_data == _T("M") )
-   {
-      return( ManuallyEntered );
-   }
-   else if ( field_data == _T("W") )
-   {
-      return( WaterReferenced );
-   }
-   else if ( field_data == _T("R") )
-   {
-      return( RadarTrackingOfFixedTarget );
-   }
-   else if ( field_data == _T("P") )
-   {
-      return( PositioningSystemGroundReference );
-   }
-   else
-   {
-      return( ReferenceUnknown );
-   }
+    if ( field_data == _T( "B" ) )
+    {
+        return ( BottomTrackingLog );
+    }
+    else if ( field_data == _T( "M" ) )
+    {
+        return ( ManuallyEntered );
+    }
+    else if ( field_data == _T( "W" ) )
+    {
+        return ( WaterReferenced );
+    }
+    else if ( field_data == _T( "R" ) )
+    {
+        return ( RadarTrackingOfFixedTarget );
+    }
+    else if ( field_data == _T( "P" ) )
+    {
+        return ( PositioningSystemGroundReference );
+    }
+    else
+    {
+        return ( ReferenceUnknown );
+    }
 }
 
 TRANSDUCER_TYPE SENTENCE::TransducerType( int field_number ) const
 {
 //   ASSERT_VALID( this );
 
-   wxString field_data;
+    wxString field_data;
 
-   field_data = Field( field_number );
+    field_data = Field( field_number );
 
-   if ( field_data == _T("A") )
-   {
-      return( AngularDisplacementTransducer );
-   }
-   else if ( field_data == _T("D") )
-   {
-      return( LinearDisplacementTransducer );
-   }
-   else if ( field_data == _T("C") )
-   {
-      return( TemperatureTransducer );
-   }
-   else if ( field_data == _T("F") )
-   {
-      return( FrequencyTransducer );
-   }
-   else if ( field_data == _T("N") )
-   {
-      return( ForceTransducer );
-   }
-   else if ( field_data == _T("P") )
-   {
-      return( PressureTransducer );
-   }
-   else if ( field_data == _T("R") )
-   {
-      return( FlowRateTransducer );
-   }
-   else if ( field_data == _T("T") )
-   {
-      return( TachometerTransducer );
-   }
-   else if ( field_data == _T("H") )
-   {
-      return( HumidityTransducer );
-   }
-   else if ( field_data == _T("V") )
-   {
-      return( VolumeTransducer );
-   }
-   else
-   {
-      return( TransducerUnknown );
-   }
+    if ( field_data == _T( "A" ) )
+    {
+        return ( AngularDisplacementTransducer );
+    }
+    else if ( field_data == _T( "D" ) )
+    {
+        return ( LinearDisplacementTransducer );
+    }
+    else if ( field_data == _T( "C" ) )
+    {
+        return ( TemperatureTransducer );
+    }
+    else if ( field_data == _T( "F" ) )
+    {
+        return ( FrequencyTransducer );
+    }
+    else if ( field_data == _T( "N" ) )
+    {
+        return ( ForceTransducer );
+    }
+    else if ( field_data == _T( "P" ) )
+    {
+        return ( PressureTransducer );
+    }
+    else if ( field_data == _T( "R" ) )
+    {
+        return ( FlowRateTransducer );
+    }
+    else if ( field_data == _T( "T" ) )
+    {
+        return ( TachometerTransducer );
+    }
+    else if ( field_data == _T( "H" ) )
+    {
+        return ( HumidityTransducer );
+    }
+    else if ( field_data == _T( "V" ) )
+    {
+        return ( VolumeTransducer );
+    }
+    else
+    {
+        return ( TransducerUnknown );
+    }
 }
 
 /*
@@ -436,258 +436,258 @@
 {
 //   ASSERT_VALID( this );
 
-   return( Sentence );
+    return ( Sentence );
 }
 
 const SENTENCE& SENTENCE::operator = ( const SENTENCE& source )
 {
 //   ASSERT_VALID( this );
 
-   Sentence = source.Sentence;
+    Sentence = source.Sentence;
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator = ( const wxString& source )
 {
 //   ASSERT_VALID( this );
 
-   Sentence = source;
+    Sentence = source;
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( const wxString& source )
 {
 //   ASSERT_VALID( this );
 
-    Sentence += _T(",");
-   Sentence += source;
+    Sentence += _T( "," );
+    Sentence += source;
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( double value )
 {
 //   ASSERT_VALID( this );
 
-   wxString temp_string;
+    wxString temp_string;
 
-   temp_string.Printf(_T("%.3f"), value );
+    temp_string.Printf( _T( "%.3f" ), value );
 
-   Sentence += _T(",");
-   Sentence += temp_string;
+    Sentence += _T( "," );
+    Sentence += temp_string;
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( COMMUNICATIONS_MODE mode )
 {
 //   ASSERT_VALID( this );
 
-    Sentence += _T(",");
+    Sentence += _T( "," );
 
-   switch( mode )
-   {
-      case F3E_G3E_SimplexTelephone:
+    switch ( mode )
+    {
+    case F3E_G3E_SimplexTelephone:
 
-          Sentence += _T("d");
-               break;
+        Sentence += _T( "d" );
+        break;
 
-      case F3E_G3E_DuplexTelephone:
+    case F3E_G3E_DuplexTelephone:
 
-          Sentence += _T("e");
-               break;
+        Sentence += _T( "e" );
+        break;
 
-      case J3E_Telephone:
+    case J3E_Telephone:
 
-          Sentence += _T("m");
-               break;
+        Sentence += _T( "m" );
+        break;
 
-      case H3E_Telephone:
+    case H3E_Telephone:
 
-          Sentence += _T("o");
-               break;
+        Sentence += _T( "o" );
+        break;
 
-      case F1B_J2B_FEC_NBDP_TelexTeleprinter:
+    case F1B_J2B_FEC_NBDP_TelexTeleprinter:
 
-          Sentence += _T("q");
-               break;
+        Sentence += _T( "q" );
+        break;
 
-      case F1B_J2B_ARQ_NBDP_TelexTeleprinter:
+    case F1B_J2B_ARQ_NBDP_TelexTeleprinter:
 
-          Sentence += _T("s");
-               break;
+        Sentence += _T( "s" );
+        break;
 
-      case F1B_J2B_ReceiveOnlyTeleprinterDSC:
+    case F1B_J2B_ReceiveOnlyTeleprinterDSC:
 
-          Sentence += _T("w");
-               break;
+        Sentence += _T( "w" );
+        break;
 
-      case A1A_MorseTapeRecorder:
+    case A1A_MorseTapeRecorder:
 
-          Sentence += _T("x");
-               break;
+        Sentence += _T( "x" );
+        break;
 
-      case A1A_MorseKeyHeadset:
+    case A1A_MorseKeyHeadset:
 
-          Sentence += _T("{");
-               break;
+        Sentence += _T( "{" );
+        break;
 
-       case F1C_F2C_F3C_FaxMachine:
+    case F1C_F2C_F3C_FaxMachine:
 
-           Sentence += _T("|");
-           break;
+        Sentence += _T( "|" );
+        break;
 
-       case CommunicationsModeUnknown:
+    case CommunicationsModeUnknown:
 
-           break;
-   }
+        break;
+    }
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( TRANSDUCER_TYPE transducer )
 {
 //   ASSERT_VALID( this );
 
-    Sentence += _T(",");
+    Sentence += _T( "," );
 
-   switch( transducer )
-   {
-      case TemperatureTransducer:
+    switch ( transducer )
+    {
+    case TemperatureTransducer:
 
-          Sentence += _T("C");
-               break;
+        Sentence += _T( "C" );
+        break;
 
-      case AngularDisplacementTransducer:
+    case AngularDisplacementTransducer:
 
-          Sentence += _T("A");
-               break;
+        Sentence += _T( "A" );
+        break;
 
-      case LinearDisplacementTransducer:
+    case LinearDisplacementTransducer:
 
-          Sentence += _T("D");
-               break;
+        Sentence += _T( "D" );
+        break;
 
-      case FrequencyTransducer:
+    case FrequencyTransducer:
 
-          Sentence += _T("F");
-               break;
+        Sentence += _T( "F" );
+        break;
 
-      case ForceTransducer:
+    case ForceTransducer:
 
-          Sentence += _T("N");
-               break;
+        Sentence += _T( "N" );
+        break;
 
-      case PressureTransducer:
+    case PressureTransducer:
 
-          Sentence += _T("P");
-               break;
+        Sentence += _T( "P" );
+        break;
 
-      case FlowRateTransducer:
+    case FlowRateTransducer:
 
-          Sentence += _T("R");
-               break;
+        Sentence += _T( "R" );
+        break;
 
-      case TachometerTransducer:
+    case TachometerTransducer:
 
-          Sentence += _T("T");
-               break;
+        Sentence += _T( "T" );
+        break;
 
-      case HumidityTransducer:
+    case HumidityTransducer:
 
-          Sentence += _T("H");
-               break;
+        Sentence += _T( "H" );
+        break;
 
-      case VolumeTransducer:
+    case VolumeTransducer:
 
-          Sentence += _T("V");
-               break;
+        Sentence += _T( "V" );
+        break;
 
-      case TransducerUnknown:
+    case TransducerUnknown:
 
-          Sentence += _T("?");
-               break;
+        Sentence += _T( "?" );
+        break;
 
-   }
+    }
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( NORTHSOUTH northing )
 {
 //   ASSERT_VALID( this );
 
-    Sentence += _T(",");
+    Sentence += _T( "," );
 
-   if ( northing == North )
-   {
-       Sentence += _T("N");
-   }
-   else if ( northing == South )
-   {
-       Sentence += _T("S");
-   }
+    if ( northing == North )
+    {
+        Sentence += _T( "N" );
+    }
+    else if ( northing == South )
+    {
+        Sentence += _T( "S" );
+    }
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( int value )
 {
 //   ASSERT_VALID( this );
 
-   wxString temp_string;
+    wxString temp_string;
 
-   temp_string.Printf(_T("%d"), value );
+    temp_string.Printf( _T( "%d" ), value );
 
-   Sentence += _T(",");
-   Sentence += temp_string;
+    Sentence += _T( "," );
+    Sentence += temp_string;
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( EASTWEST easting )
 {
 //   ASSERT_VALID( this );
 
-    Sentence += _T(",");
+    Sentence += _T( "," );
 
-   if ( easting == East )
-   {
-       Sentence += _T("E");
-   }
-   else if ( easting == West )
-   {
-       Sentence += _T("W");
-   }
+    if ( easting == East )
+    {
+        Sentence += _T( "E" );
+    }
+    else if ( easting == West )
+    {
+        Sentence += _T( "W" );
+    }
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( NMEA0183L_BOOLEAN boolean )
 {
 //   ASSERT_VALID( this );
 
-    Sentence += _T(",");
+    Sentence += _T( "," );
 
-   if ( boolean == NTrue )
-   {
-       Sentence += _T("A");
-   }
-   else if ( boolean == NFalse )
-   {
-       Sentence += _T("V");
-   }
+    if ( boolean == NTrue )
+    {
+        Sentence += _T( "A" );
+    }
+    else if ( boolean == NFalse )
+    {
+        Sentence += _T( "V" );
+    }
 
-   return( *this );
+    return ( *this );
 }
 
 const SENTENCE& SENTENCE::operator += ( LATLONG& source )
 {
 //   ASSERT_VALID( this );
 
-   source.Write( *this );
+    source.Write( *this );
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/Sentence.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/Sentence.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/Sentence.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/Sentence.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,56 +43,56 @@
 
 class LATLONG;
 
-class SENTENCE 
+class SENTENCE
 {
 //   DECLARE_DYNAMIC( SENTENCE )
 
-   public:
+public:
 
-      SENTENCE();
-      virtual ~SENTENCE();
+    SENTENCE();
+    virtual ~SENTENCE();
 
-      /*
-      ** Data
-      */
-
-      wxString Sentence;
-
-      /*
-      ** Methods
-      */
-
-      virtual NMEA0183L_BOOLEAN Boolean( int field_number ) const;
-      virtual unsigned char ComputeChecksum( void ) const;
-      virtual COMMUNICATIONS_MODE CommunicationsMode( int field_number ) const;
-      virtual double Double( int field_number ) const;
-      virtual EASTWEST EastOrWest( int field_number ) const;
-      virtual const wxString& Field( int field_number ) const;
-      virtual void Finish( void );
-      virtual int GetNumberOfDataFields( void ) const;
-      virtual int Integer( int field_number ) const;
-      virtual NMEA0183L_BOOLEAN IsChecksumBad( int checksum_field_number ) const;
-      virtual LEFTRIGHT LeftOrRight( int field_number ) const;
-      virtual NORTHSOUTH NorthOrSouth( int field_number ) const;
-      virtual REFERENCE Reference( int field_number ) const;
-      virtual TRANSDUCER_TYPE TransducerType( int field_number ) const;
-
-      /*
-      ** Operators
-      */
-
-      operator wxString() const; 
-      virtual const SENTENCE& operator  = ( const SENTENCE& source );
-      virtual const SENTENCE& operator  = ( const wxString& source );
-      virtual const SENTENCE& operator += ( const wxString& source );
-      virtual const SENTENCE& operator += ( double value );
-      virtual const SENTENCE& operator += ( NORTHSOUTH northing );
-      virtual const SENTENCE& operator += ( COMMUNICATIONS_MODE mode );
-      virtual const SENTENCE& operator += ( int value );
-      virtual const SENTENCE& operator += ( EASTWEST easting );
-      virtual const SENTENCE& operator += ( TRANSDUCER_TYPE transducer );
-      virtual const SENTENCE& operator += ( NMEA0183L_BOOLEAN boolean );
-      virtual const SENTENCE& operator += ( LATLONG& source );
+    /*
+    ** Data
+    */
+
+    wxString Sentence;
+
+    /*
+    ** Methods
+    */
+
+    virtual NMEA0183L_BOOLEAN Boolean( int field_number ) const;
+    virtual unsigned char ComputeChecksum( void ) const;
+    virtual COMMUNICATIONS_MODE CommunicationsMode( int field_number ) const;
+    virtual double Double( int field_number ) const;
+    virtual EASTWEST EastOrWest( int field_number ) const;
+    virtual const wxString& Field( int field_number ) const;
+    virtual void Finish( void );
+    virtual int GetNumberOfDataFields( void ) const;
+    virtual int Integer( int field_number ) const;
+    virtual NMEA0183L_BOOLEAN IsChecksumBad( int checksum_field_number ) const;
+    virtual LEFTRIGHT LeftOrRight( int field_number ) const;
+    virtual NORTHSOUTH NorthOrSouth( int field_number ) const;
+    virtual REFERENCE Reference( int field_number ) const;
+    virtual TRANSDUCER_TYPE TransducerType( int field_number ) const;
+
+    /*
+    ** Operators
+    */
+
+    operator wxString() const;
+    virtual const SENTENCE& operator  = ( const SENTENCE& source );
+    virtual const SENTENCE& operator  = ( const wxString& source );
+    virtual const SENTENCE& operator += ( const wxString& source );
+    virtual const SENTENCE& operator += ( double value );
+    virtual const SENTENCE& operator += ( NORTHSOUTH northing );
+    virtual const SENTENCE& operator += ( COMMUNICATIONS_MODE mode );
+    virtual const SENTENCE& operator += ( int value );
+    virtual const SENTENCE& operator += ( EASTWEST easting );
+    virtual const SENTENCE& operator += ( TRANSDUCER_TYPE transducer );
+    virtual const SENTENCE& operator += ( NMEA0183L_BOOLEAN boolean );
+    virtual const SENTENCE& operator += ( LATLONG& source );
 };
- 
+
 #endif // SENTENCE_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/talkerid.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/talkerid.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/talkerid.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/talkerid.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -40,19 +40,19 @@
 ** You can use it any way you like.
 */
 
- wxString& talker_id( const wxString &sentence )
+wxString& talker_id( const wxString &sentence )
 {
-   static wxString return_string;
+    static wxString return_string;
 
-   return_string.Empty();
+    return_string.Empty();
 
-   if ( sentence.Len() >= 3 )
-   {
-      if ( sentence[ 0 ] == '$' )
-      {
-         return_string = sentence.Mid( 1, 2 );
-      }
-   }
+    if ( sentence.Len() >= 3 )
+    {
+        if ( sentence[ 0 ] == '$' )
+        {
+            return_string = sentence.Mid( 1, 2 );
+        }
+    }
 
-   return( return_string );
+    return ( return_string );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vhw.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vhw.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vhw.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vhw.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,99 +43,99 @@
 
 VHW::VHW()
 {
-   Mnemonic = _T("VHW");
-   Empty();
+    Mnemonic = _T( "VHW" );
+    Empty();
 }
 
 VHW::~VHW()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void VHW::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   DegreesTrue       = 0.0;
-   DegreesMagnetic   = 0.0;
-   Knots             = 0.0;
-   KilometersPerHour = 0.0;
+    DegreesTrue       = 0.0;
+    DegreesMagnetic   = 0.0;
+    Knots             = 0.0;
+    KilometersPerHour = 0.0;
 }
 
 bool VHW::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** VHW - Water speed and heading
-   **
-   **        1   2 3   4 5   6 7   8 9
-   **        |   | |   | |   | |   | |
-   ** $--VHW,x.x,T,x.x,M,x.x,N,x.x,K*hh<CR><LF>
-   **
-   ** Field Number: 
-   **  1) Degress True
-   **  2) T = True
-   **  3) Degrees Magnetic
-   **  4) M = Magnetic
-   **  5) Knots (speed of vessel relative to the water)
-   **  6) N = Knots
-   **  7) Kilometers (speed of vessel relative to the water)
-   **  8) K = Kilometers
-   **  9) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 9 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
-
-   DegreesTrue       = sentence.Double( 1 );
-   DegreesMagnetic   = sentence.Double( 3 );
-   Knots             = sentence.Double( 5 );
-   KilometersPerHour = sentence.Double( 7 );
+    /*
+    ** VHW - Water speed and heading
+    **
+    **        1   2 3   4 5   6 7   8 9
+    **        |   | |   | |   | |   | |
+    ** $--VHW,x.x,T,x.x,M,x.x,N,x.x,K*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Degress True
+    **  2) T = True
+    **  3) Degrees Magnetic
+    **  4) M = Magnetic
+    **  5) Knots (speed of vessel relative to the water)
+    **  6) N = Knots
+    **  7) Kilometers (speed of vessel relative to the water)
+    **  8) K = Kilometers
+    **  9) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 9 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    DegreesTrue       = sentence.Double( 1 );
+    DegreesMagnetic   = sentence.Double( 3 );
+    Knots             = sentence.Double( 5 );
+    KilometersPerHour = sentence.Double( 7 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool VHW::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
-
-   sentence += DegreesTrue;
-   sentence += _T("T");
-   sentence += DegreesMagnetic;
-   sentence += _T("M");
-   sentence += Knots;
-   sentence += _T("N");
-   sentence += KilometersPerHour;
-   sentence += _T("K");
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += DegreesTrue;
+    sentence += _T( "T" );
+    sentence += DegreesMagnetic;
+    sentence += _T( "M" );
+    sentence += Knots;
+    sentence += _T( "N" );
+    sentence += KilometersPerHour;
+    sentence += _T( "K" );
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const VHW& VHW::operator = ( const VHW& source )
 {
 //   ASSERT_VALID( this );
 
-   DegreesTrue       = source.DegreesTrue;
-   DegreesMagnetic   = source.DegreesMagnetic;
-   Knots             = source.Knots;
-   KilometersPerHour = source.KilometersPerHour;
+    DegreesTrue       = source.DegreesTrue;
+    DegreesMagnetic   = source.DegreesMagnetic;
+    Knots             = source.Knots;
+    KilometersPerHour = source.KilometersPerHour;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vhw.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vhw.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vhw.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vhw.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -42,35 +42,35 @@
 
 class VHW : public RESPONSE
 {
-   //DECLARE_DYNAMIC( VHW )
+    //DECLARE_DYNAMIC( VHW )
 
-   public:
+public:
 
-      VHW();
-     ~VHW();
+    VHW();
+    ~VHW();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double DegreesTrue;
-      double DegreesMagnetic;
-      double Knots;
-      double KilometersPerHour;
+    double DegreesTrue;
+    double DegreesMagnetic;
+    double Knots;
+    double KilometersPerHour;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const VHW& operator = ( const VHW& source );
+    virtual const VHW& operator = ( const VHW& source );
 };
 
 #endif // VHW_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vtg.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vtg.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vtg.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vtg.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -45,131 +45,131 @@
 
 VTG::VTG()
 {
-   Mnemonic = _T("VTG");
-   Empty();
+    Mnemonic = _T( "VTG" );
+    Empty();
 }
 
 VTG::~VTG()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void VTG::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   TrackDegreesTrue       = 0.0;
-   TrackDegreesMagnetic   = 0.0;
-   SpeedKnots             = 0.0;
-   SpeedKilometersPerHour = 0.0;
+    TrackDegreesTrue       = 0.0;
+    TrackDegreesMagnetic   = 0.0;
+    SpeedKnots             = 0.0;
+    SpeedKilometersPerHour = 0.0;
 }
 
 bool VTG::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** VTG - Track made good and Ground speed
-   **
-   **        1   2 3   4 5	 6 7   8 9
-   **        |   | |   | |	 | |   | |
-   ** $--VTG,x.x,T,x.x,M,x.x,N,x.x,K*hh<CR><LF>
-   **
-   ** Field Number:
-   **  1) Track Degrees
-   **  2) T = True
-   **  3) Track Degrees
-   **  4) M = Magnetic
-   **  5) Speed Knots
-   **  6) N = Knots
-   **  7) Speed Kilometers Per Hour
-   **  8) K = Kilometers Per Hour
-   **  9) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-      int target_field_count = 8;
-
-      NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 9 );
-
-      if ( check == NTrue )
-      {
-
-  /*
-      ** This may be an NMEA Version 2.3 sentence, with "Mode" field
-  */
-            wxString checksum_in_sentence = sentence.Field( 9 );
-            if(checksum_in_sentence.StartsWith(_T("*")))       // Field is a valid erroneous checksum
+    /*
+    ** VTG - Track made good and Ground speed
+    **
+    **        1   2 3   4 5	 6 7   8 9
+    **        |   | |   | |	 | |   | |
+    ** $--VTG,x.x,T,x.x,M,x.x,N,x.x,K*hh<CR><LF>
+    **
+    ** Field Number:
+    **  1) Track Degrees
+    **  2) T = True
+    **  3) Track Degrees
+    **  4) M = Magnetic
+    **  5) Speed Knots
+    **  6) N = Knots
+    **  7) Speed Kilometers Per Hour
+    **  8) K = Kilometers Per Hour
+    **  9) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    int target_field_count = 8;
+
+    NMEA0183L_BOOLEAN check = sentence.IsChecksumBad( 9 );
+
+    if ( check == NTrue )
+    {
+
+        /*
+            ** This may be an NMEA Version 2.3 sentence, with "Mode" field
+        */
+        wxString checksum_in_sentence = sentence.Field( 9 );
+        if ( checksum_in_sentence.StartsWith( _T( "*" ) ) ) // Field is a valid erroneous checksum
+        {
+            SetErrorMessage( _T( "Invalid Checksum" ) );
+            return ( FALSE );
+        }
+
+        else
+        {
+            target_field_count = 9;
+            check = sentence.IsChecksumBad( 10 );
+            if ( check == NTrue )
             {
-                  SetErrorMessage( _T("Invalid Checksum") );
-                  return( FALSE );
+                SetErrorMessage( _T( "Invalid Checksum" ) );
+                return ( FALSE );
             }
-
-           else
-           {
-                  target_field_count = 9;
-                  check = sentence.IsChecksumBad( 10 );
-                  if( check == NTrue)
-                  {
-                        SetErrorMessage( _T("Invalid Checksum") );
-                        return( FALSE );
-                  }
-            }
-      }
+        }
+    }
 
 
 
-   if ( sentence.GetNumberOfDataFields() != target_field_count )
-   {
-         SetErrorMessage( _T("Invalid FieldCount") );
-         return( FALSE );
-   }
+    if ( sentence.GetNumberOfDataFields() != target_field_count )
+    {
+        SetErrorMessage( _T( "Invalid FieldCount" ) );
+        return ( FALSE );
+    }
 
 
-   TrackDegreesTrue       = sentence.Double( 1 );
-   TrackDegreesMagnetic   = sentence.Double( 3 );
-   SpeedKnots             = sentence.Double( 5 );
-   SpeedKilometersPerHour = sentence.Double( 7 );
+    TrackDegreesTrue       = sentence.Double( 1 );
+    TrackDegreesMagnetic   = sentence.Double( 3 );
+    SpeedKnots             = sentence.Double( 5 );
+    SpeedKilometersPerHour = sentence.Double( 7 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool VTG::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-
-   RESPONSE::Write( sentence );
-
-   sentence += TrackDegreesTrue;
-   sentence += _T("T");
-   sentence += TrackDegreesMagnetic;
-   sentence += _T("M");
-   sentence += SpeedKnots;
-   sentence += _T("N");
-   sentence += SpeedKilometersPerHour;
-   sentence += _T("K");
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += TrackDegreesTrue;
+    sentence += _T( "T" );
+    sentence += TrackDegreesMagnetic;
+    sentence += _T( "M" );
+    sentence += SpeedKnots;
+    sentence += _T( "N" );
+    sentence += SpeedKilometersPerHour;
+    sentence += _T( "K" );
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const VTG& VTG::operator = ( const VTG& source )
 {
 //   ASSERT_VALID( this );
 
-   TrackDegreesTrue       = source.TrackDegreesTrue;
-   TrackDegreesMagnetic   = source.TrackDegreesMagnetic;
-   SpeedKnots             = source.SpeedKnots;
-   SpeedKilometersPerHour = source.SpeedKilometersPerHour;
+    TrackDegreesTrue       = source.TrackDegreesTrue;
+    TrackDegreesMagnetic   = source.TrackDegreesMagnetic;
+    SpeedKnots             = source.SpeedKnots;
+    SpeedKilometersPerHour = source.SpeedKilometersPerHour;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vtg.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vtg.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vtg.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vtg.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,33 +44,33 @@
 class VTG : public RESPONSE
 {
 
-   public:
+public:
 
-      VTG();
-     ~VTG();
+    VTG();
+    ~VTG();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      double TrackDegreesTrue;
-      double TrackDegreesMagnetic;
-	   double SpeedKnots;
-	   double SpeedKilometersPerHour;
+    double TrackDegreesTrue;
+    double TrackDegreesMagnetic;
+    double SpeedKnots;
+    double SpeedKilometersPerHour;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const VTG& operator = ( const VTG& source );
+    virtual const VTG& operator = ( const VTG& source );
 };
 
 #endif // VTG_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwr.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwr.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwr.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwr.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,22 +43,22 @@
 
 VWR::VWR()
 {
-   Mnemonic = _T("VWR");
-   Empty();
+    Mnemonic = _T( "VWR" );
+    Empty();
 }
 
 VWR::~VWR()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void VWR::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-	WindDirectionMagnitude = 0.0;
-	DirectionOfWind = LR_Unknown;
+    WindDirectionMagnitude = 0.0;
+    DirectionOfWind = LR_Unknown;
     WindSpeedKnots = 0.0;
     WindSpeedms = 0.0;
     WindSpeedKmh = 0.0;
@@ -68,72 +68,72 @@
 {
 //   ASSERT_VALID( this );
 
-   /*
-	** MWV - Wind Speed and Angle
-	**
-	**        1   2 3 4   5 6   7   8
-	**        |   | | |   | |   |   |
-	** $--VWR,x.x,L,x.x,N,x.x,M,x.x,K,*hh<CR><LF>
-	**
-	** 1) Wind direction magnitude in degrees
-	** 2) Wind direction Left/Right of bow
-	** 3) Speed
-	** 4) N = Knots
-	** 5) Speed
-	** 6) M = Meters Per Second
-	** 7) Speed
-	** 8) K = Kilometers Per Hour
-	** 9) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 9 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
-
-   WindDirectionMagnitude = sentence.Double( 1 );
-   DirectionOfWind = sentence.LeftOrRight( 2 );
-   WindSpeedKnots = sentence.Double( 3 );
-   WindSpeedms = sentence.Double( 5 );
-   WindSpeedKmh = sentence.Double( 7 );
+    /*
+    ** MWV - Wind Speed and Angle
+    **
+    **        1   2 3 4   5 6   7   8
+    **        |   | | |   | |   |   |
+    ** $--VWR,x.x,L,x.x,N,x.x,M,x.x,K,*hh<CR><LF>
+    **
+    ** 1) Wind direction magnitude in degrees
+    ** 2) Wind direction Left/Right of bow
+    ** 3) Speed
+    ** 4) N = Knots
+    ** 5) Speed
+    ** 6) M = Meters Per Second
+    ** 7) Speed
+    ** 8) K = Kilometers Per Hour
+    ** 9) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 9 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    WindDirectionMagnitude = sentence.Double( 1 );
+    DirectionOfWind = sentence.LeftOrRight( 2 );
+    WindSpeedKnots = sentence.Double( 3 );
+    WindSpeedms = sentence.Double( 5 );
+    WindSpeedKmh = sentence.Double( 7 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool VWR::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
-
-   sentence += WindDirectionMagnitude;
-   sentence += DirectionOfWind;
-   sentence += WindSpeedKnots;
-   sentence += WindSpeedms;
-   sentence += WindSpeedms;
-   sentence += WindSpeedKmh;
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += WindDirectionMagnitude;
+    sentence += DirectionOfWind;
+    sentence += WindSpeedKnots;
+    sentence += WindSpeedms;
+    sentence += WindSpeedms;
+    sentence += WindSpeedKmh;
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const VWR& VWR::operator = ( const VWR& source )
 {
 //   ASSERT_VALID( this );
- 
-   WindDirectionMagnitude   = source.WindDirectionMagnitude;
-   DirectionOfWind			= source.DirectionOfWind;
-   WindSpeedKnots			= source.WindSpeedKnots;
-   WindSpeedms				= source.WindSpeedms;
-   WindSpeedKmh				= source.WindSpeedKmh;
 
-   return( *this );
+    WindDirectionMagnitude   = source.WindDirectionMagnitude;
+    DirectionOfWind			= source.DirectionOfWind;
+    WindSpeedKnots			= source.WindSpeedKnots;
+    WindSpeedms				= source.WindSpeedms;
+    WindSpeedKmh				= source.WindSpeedKmh;
+
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwr.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwr.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwr.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwr.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,34 +44,34 @@
 {
 //   DECLARE_DYNAMIC( MWV )
 
-   public:
+public:
 
-      VWR();
-     ~VWR();
+    VWR();
+    ~VWR();
 
-      /*
-      ** Data
-      */
-
-      double           WindDirectionMagnitude;
-	  LEFTRIGHT			DirectionOfWind;
-      double           WindSpeedKnots;
-      double           WindSpeedms;
-      double           WindSpeedKmh;
-
-      /*
-      ** Methods
-      */
-
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
-
-      /*
-      ** Operators
-      */
+    /*
+    ** Data
+    */
+
+    double           WindDirectionMagnitude;
+    LEFTRIGHT			DirectionOfWind;
+    double           WindSpeedKnots;
+    double           WindSpeedms;
+    double           WindSpeedKmh;
+
+    /*
+    ** Methods
+    */
+
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
+
+    /*
+    ** Operators
+    */
 
-      virtual const VWR& operator = ( const VWR& source );
+    virtual const VWR& operator = ( const VWR& source );
 };
 
 #endif // VWR_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwt.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwt.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwt.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwt.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,22 +43,22 @@
 
 VWT::VWT()
 {
-   Mnemonic = _T("VWT");
-   Empty();
+    Mnemonic = _T( "VWT" );
+    Empty();
 }
 
 VWT::~VWT()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void VWT::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-	WindDirectionMagnitude = 0.0;
-	DirectionOfWind = LR_Unknown;
+    WindDirectionMagnitude = 0.0;
+    DirectionOfWind = LR_Unknown;
     WindSpeedKnots = 0.0;
     WindSpeedms = 0.0;
     WindSpeedKmh = 0.0;
@@ -68,72 +68,72 @@
 {
 //   ASSERT_VALID( this );
 
-   /*
-	** VWT - Wind Speed and Angle
-	**
-	**        1   2 3 4   5 6   7   8
-	**        |   | | |   | |   |   |
-	** $--VWT,x.x,L,x.x,N,x.x,M,x.x,K,*hh<CR><LF>
-	**
-	** 1) Wind direction magnitude in degrees
-	** 2) Wind direction Left/Right of bow
-	** 3) Speed
-	** 4) N = Knots
-	** 5) Speed
-	** 6) M = Meters Per Second
-	** 7) Speed
-	** 8) K = Kilometers Per Hour
-	** 9) Checksum
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 9 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
-
-   WindDirectionMagnitude = sentence.Double( 1 );
-   DirectionOfWind = sentence.LeftOrRight( 2 );
-   WindSpeedKnots = sentence.Double( 3 );
-   WindSpeedms = sentence.Double( 5 );
-   WindSpeedKmh = sentence.Double( 7 );
+    /*
+    ** VWT - Wind Speed and Angle
+    **
+    **        1   2 3 4   5 6   7   8
+    **        |   | | |   | |   |   |
+    ** $--VWT,x.x,L,x.x,N,x.x,M,x.x,K,*hh<CR><LF>
+    **
+    ** 1) Wind direction magnitude in degrees
+    ** 2) Wind direction Left/Right of bow
+    ** 3) Speed
+    ** 4) N = Knots
+    ** 5) Speed
+    ** 6) M = Meters Per Second
+    ** 7) Speed
+    ** 8) K = Kilometers Per Hour
+    ** 9) Checksum
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 9 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    WindDirectionMagnitude = sentence.Double( 1 );
+    DirectionOfWind = sentence.LeftOrRight( 2 );
+    WindSpeedKnots = sentence.Double( 3 );
+    WindSpeedms = sentence.Double( 5 );
+    WindSpeedKmh = sentence.Double( 7 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool VWT::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
-
-   sentence += WindDirectionMagnitude;
-   sentence += DirectionOfWind;
-   sentence += WindSpeedKnots;
-   sentence += WindSpeedms;
-   sentence += WindSpeedms;
-   sentence += WindSpeedKmh;
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += WindDirectionMagnitude;
+    sentence += DirectionOfWind;
+    sentence += WindSpeedKnots;
+    sentence += WindSpeedms;
+    sentence += WindSpeedms;
+    sentence += WindSpeedKmh;
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const VWT& VWT::operator = ( const VWT& source )
 {
 //   ASSERT_VALID( this );
- 
-   WindDirectionMagnitude   = source.WindDirectionMagnitude;
-   DirectionOfWind			= source.DirectionOfWind;
-   WindSpeedKnots			= source.WindSpeedKnots;
-   WindSpeedms				= source.WindSpeedms;
-   WindSpeedKmh				= source.WindSpeedKmh;
 
-   return( *this );
+    WindDirectionMagnitude   = source.WindDirectionMagnitude;
+    DirectionOfWind			= source.DirectionOfWind;
+    WindSpeedKnots			= source.WindSpeedKnots;
+    WindSpeedms				= source.WindSpeedms;
+    WindSpeedKmh				= source.WindSpeedKmh;
+
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwt.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwt.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/vwt.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/vwt.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,34 +44,34 @@
 {
 //   DECLARE_DYNAMIC( MWV )
 
-   public:
+public:
 
-      VWT();
-     ~VWT();
+    VWT();
+    ~VWT();
 
-      /*
-      ** Data
-      */
-
-      double           WindDirectionMagnitude;
-      LEFTRIGHT	     DirectionOfWind;
-      double           WindSpeedKnots;
-      double           WindSpeedms;
-      double           WindSpeedKmh;
-
-      /*
-      ** Methods
-      */
-
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
-
-      /*
-      ** Operators
-      */
+    /*
+    ** Data
+    */
+
+    double           WindDirectionMagnitude;
+    LEFTRIGHT	     DirectionOfWind;
+    double           WindSpeedKnots;
+    double           WindSpeedms;
+    double           WindSpeedKmh;
+
+    /*
+    ** Methods
+    */
+
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
+
+    /*
+    ** Operators
+    */
 
-      virtual const VWT& operator = ( const VWT& source );
+    virtual const VWT& operator = ( const VWT& source );
 };
 
 #endif // VWT_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/wpl.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/wpl.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/wpl.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/wpl.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,76 +44,76 @@
 
 WPL::WPL()
 {
-   Mnemonic = _T("WPL");
-   Empty();
+    Mnemonic = _T( "WPL" );
+    Empty();
 }
 
 WPL::~WPL()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void WPL::Empty( void )
 {
 
-   Position.Empty();
-   To.Empty();
+    Position.Empty();
+    To.Empty();
 }
 
 bool WPL::Parse( const SENTENCE& sentence )
 {
 
-   /*
-   ** WPL - Waypoint Location
-   **
-   **        +-------------------------------- 1) Latitude
-   **        |       +------------------------ 2) N or S (North or South)
-   **        |       | +---------------------- 3) Longitude
-   **        |       | |        +------------- 4) E or W (East or West)
-   **        |       | |        | +----------- 5) Waypoint name
-   **        |       | |        | |    +-------6) Checksum
-   **        |       | |        | |    |
-   ** $--WPL,llll.ll,a,yyyyy.yy,a,c--c*hh<CR><LF>
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 6 ) == NTrue )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   }
+    /*
+    ** WPL - Waypoint Location
+    **
+    **        +-------------------------------- 1) Latitude
+    **        |       +------------------------ 2) N or S (North or South)
+    **        |       | +---------------------- 3) Longitude
+    **        |       | |        +------------- 4) E or W (East or West)
+    **        |       | |        | +----------- 5) Waypoint name
+    **        |       | |        | |    +-------6) Checksum
+    **        |       | |        | |    |
+    ** $--WPL,llll.ll,a,yyyyy.yy,a,c--c*hh<CR><LF>
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 6 ) == NTrue )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
 
-   Position.Parse( 1, 2, 3, 4, sentence );
-   To = sentence.Field( 5 );
+    Position.Parse( 1, 2, 3, 4, sentence );
+    To = sentence.Field( 5 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool WPL::Write( SENTENCE& sentence )
 {
-   /*
-   ** Let the parent do its thing
-   */
+    /*
+    ** Let the parent do its thing
+    */
 
-   RESPONSE::Write( sentence );
+    RESPONSE::Write( sentence );
 
-   sentence += Position;
-   sentence += To;
+    sentence += Position;
+    sentence += To;
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const WPL& WPL::operator = ( const WPL& source )
 {
 
-   Position = source.Position;
-   To       = source.To;
+    Position = source.Position;
+    To       = source.To;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/wpl.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/wpl.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/wpl.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/wpl.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -44,31 +44,31 @@
 class WPL : public RESPONSE
 {
 
-   public:
+public:
 
-      WPL();
-     ~WPL();
+    WPL();
+    ~WPL();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      LATLONG Position;
-      wxString To;
+    LATLONG Position;
+    wxString To;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const WPL& operator = ( const WPL& source );
+    virtual const WPL& operator = ( const WPL& source );
 };
 
 #endif // WPL_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/zda.cpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/zda.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/zda.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/zda.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -43,98 +43,98 @@
 
 ZDA::ZDA()
 {
-   Mnemonic = _T("ZDA");
-   Empty();
+    Mnemonic = _T( "ZDA" );
+    Empty();
 }
 
 ZDA::~ZDA()
 {
-   Mnemonic.Empty();
-   Empty();
+    Mnemonic.Empty();
+    Empty();
 }
 
 void ZDA::Empty( void )
 {
 //   ASSERT_VALID( this );
 
-   UTCTime.Empty();
-   Day                   = 0;
-   Month                 = 0;
-   Year                  = 0;
-   LocalHourDeviation    = 0;
-   LocalMinutesDeviation = 0;
+    UTCTime.Empty();
+    Day                   = 0;
+    Month                 = 0;
+    Year                  = 0;
+    LocalHourDeviation    = 0;
+    LocalMinutesDeviation = 0;
 }
 
 bool ZDA::Parse( const SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** ZDA - Time & Date
-   ** UTC, day, month, year and local time zone
-   **
-   ** $--ZDA,hhmmss.ss,xx,xx,xxxx,xx,xx*hh<CR><LF>
-   **        |         |  |  |    |  |
-   **        |         |  |  |    |  +- Local zone minutes description, same sign as local hours
-   **        |         |  |  |    +- Local zone description, 00 to +- 13 hours
-   **        |         |  |  +- Year
-   **        |         |  +- Month, 01 to 12
-   **        |         +- Day, 01 to 31
-   **        +- Universal Time Coordinated (UTC)
-   */
-
-   /*
-   ** First we check the checksum...
-   */
-
-   if ( sentence.IsChecksumBad( 7 ) == TRUE )
-   {
-      SetErrorMessage( _T("Invalid Checksum") );
-      return( FALSE );
-   } 
-
-   UTCTime               = sentence.Field( 1 );
-   Day                   = sentence.Integer( 2 );
-   Month                 = sentence.Integer( 3 );
-   Year                  = sentence.Integer( 4 );
-   LocalHourDeviation    = sentence.Integer( 5 );
-   LocalMinutesDeviation = sentence.Integer( 6 );
+    /*
+    ** ZDA - Time & Date
+    ** UTC, day, month, year and local time zone
+    **
+    ** $--ZDA,hhmmss.ss,xx,xx,xxxx,xx,xx*hh<CR><LF>
+    **        |         |  |  |    |  |
+    **        |         |  |  |    |  +- Local zone minutes description, same sign as local hours
+    **        |         |  |  |    +- Local zone description, 00 to +- 13 hours
+    **        |         |  |  +- Year
+    **        |         |  +- Month, 01 to 12
+    **        |         +- Day, 01 to 31
+    **        +- Universal Time Coordinated (UTC)
+    */
+
+    /*
+    ** First we check the checksum...
+    */
+
+    if ( sentence.IsChecksumBad( 7 ) == TRUE )
+    {
+        SetErrorMessage( _T( "Invalid Checksum" ) );
+        return ( FALSE );
+    }
+
+    UTCTime               = sentence.Field( 1 );
+    Day                   = sentence.Integer( 2 );
+    Month                 = sentence.Integer( 3 );
+    Year                  = sentence.Integer( 4 );
+    LocalHourDeviation    = sentence.Integer( 5 );
+    LocalMinutesDeviation = sentence.Integer( 6 );
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 bool ZDA::Write( SENTENCE& sentence )
 {
 //   ASSERT_VALID( this );
 
-   /*
-   ** Let the parent do its thing
-   */
-   
-   RESPONSE::Write( sentence );
-
-   sentence += UTCTime;
-   sentence += Day;
-   sentence += Month;
-   sentence += Year;
-   sentence += LocalHourDeviation;
-   sentence += LocalMinutesDeviation;
+    /*
+    ** Let the parent do its thing
+    */
+
+    RESPONSE::Write( sentence );
+
+    sentence += UTCTime;
+    sentence += Day;
+    sentence += Month;
+    sentence += Year;
+    sentence += LocalHourDeviation;
+    sentence += LocalMinutesDeviation;
 
-   sentence.Finish();
+    sentence.Finish();
 
-   return( TRUE );
+    return ( TRUE );
 }
 
 const ZDA& ZDA::operator = ( const ZDA& source )
 {
 //   ASSERT_VALID( this );
 
-   UTCTime               = source.UTCTime;
-   Day                   = source.Day;
-   Month                 = source.Month;
-   Year                  = source.Year;
-   LocalHourDeviation    = source.LocalHourDeviation;
-   LocalMinutesDeviation = source.LocalMinutesDeviation;
+    UTCTime               = source.UTCTime;
+    Day                   = source.Day;
+    Month                 = source.Month;
+    Year                  = source.Year;
+    LocalHourDeviation    = source.LocalHourDeviation;
+    LocalMinutesDeviation = source.LocalMinutesDeviation;
 
-   return( *this );
+    return ( *this );
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/zda.hpp opencpn-plugin-logbookkonni-1.2024/src/nmea0183/zda.hpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/nmea0183/zda.hpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/nmea0183/zda.hpp	2016-02-25 13:06:29.000000000 +0000
@@ -42,37 +42,37 @@
 
 class ZDA : public RESPONSE
 {
-   //DECLARE_DYNAMIC( ZDA )
+    //DECLARE_DYNAMIC( ZDA )
 
-   public:
+public:
 
-      ZDA();
-     ~ZDA();
+    ZDA();
+    ~ZDA();
 
-      /*
-      ** Data
-      */
+    /*
+    ** Data
+    */
 
-      wxString UTCTime;
-      int     Day;
-      int     Month;
-      int     Year;
-      int     LocalHourDeviation;
-      int     LocalMinutesDeviation;
+    wxString UTCTime;
+    int     Day;
+    int     Month;
+    int     Year;
+    int     LocalHourDeviation;
+    int     LocalMinutesDeviation;
 
-      /*
-      ** Methods
-      */
+    /*
+    ** Methods
+    */
 
-      virtual void Empty( void );
-      virtual bool Parse( const SENTENCE& sentence );
-      virtual bool Write( SENTENCE& sentence );
+    virtual void Empty( void );
+    virtual bool Parse( const SENTENCE& sentence );
+    virtual bool Write( SENTENCE& sentence );
 
-      /*
-      ** Operators
-      */
+    /*
+    ** Operators
+    */
 
-      virtual const ZDA& operator = ( const ZDA& source );
+    virtual const ZDA& operator = ( const ZDA& source );
 };
 
 #endif // ZDA_CLASS_HEADER
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/ocpn_plugin.h opencpn-plugin-logbookkonni-1.2024/src/ocpn_plugin.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/ocpn_plugin.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/ocpn_plugin.h	2016-02-25 13:06:29.000000000 +0000
@@ -86,148 +86,149 @@
 //----------------------------------------------------------------------------------------------------------
 enum PI_ColorScheme
 {
-      PI_GLOBAL_COLOR_SCHEME_RGB,
-      PI_GLOBAL_COLOR_SCHEME_DAY,
-      PI_GLOBAL_COLOR_SCHEME_DUSK,
-      PI_GLOBAL_COLOR_SCHEME_NIGHT,
-      PI_N_COLOR_SCHEMES
+    PI_GLOBAL_COLOR_SCHEME_RGB,
+    PI_GLOBAL_COLOR_SCHEME_DAY,
+    PI_GLOBAL_COLOR_SCHEME_DUSK,
+    PI_GLOBAL_COLOR_SCHEME_NIGHT,
+    PI_N_COLOR_SCHEMES
 };
 
 class PlugIn_ViewPort
 {
-      public:
-            double   clat;                   // center point
-            double   clon;
-            double   view_scale_ppm;
-            double   skew;
-            double   rotation;
-
-            float    chart_scale;            // conventional chart displayed scale
-
-            int      pix_width;
-            int      pix_height;
-            wxRect   rv_rect;
-            bool     b_quilt;
-            int      m_projection_type;
+public:
+    double   clat;                   // center point
+    double   clon;
+    double   view_scale_ppm;
+    double   skew;
+    double   rotation;
+
+    float    chart_scale;            // conventional chart displayed scale
+
+    int      pix_width;
+    int      pix_height;
+    wxRect   rv_rect;
+    bool     b_quilt;
+    int      m_projection_type;
 
-            double   lat_min, lat_max, lon_min, lon_max;
+    double   lat_min, lat_max, lon_min, lon_max;
 
-            bool     bValid;                 // This VP is valid
+    bool     bValid;                 // This VP is valid
 };
 
 class PlugIn_Position_Fix
 {
-   public:
-      double Lat;
-      double Lon;
-      double Cog;
-      double Sog;
-      double Var;            // Variation, typically from RMC message
-      time_t FixTime;
-      int    nSats;
+public:
+    double Lat;
+    double Lon;
+    double Cog;
+    double Sog;
+    double Var;            // Variation, typically from RMC message
+    time_t FixTime;
+    int    nSats;
 };
 
 class PlugIn_Position_Fix_Ex
 {
-      public:
-            double Lat;
-            double Lon;
-            double Cog;
-            double Sog;
-            double Var;            // Variation, typically from RMC message
-            double Hdm;
-            double Hdt;
-            time_t FixTime;
-            int    nSats;
+public:
+    double Lat;
+    double Lon;
+    double Cog;
+    double Sog;
+    double Var;            // Variation, typically from RMC message
+    double Hdm;
+    double Hdt;
+    time_t FixTime;
+    int    nSats;
 };
 
 //    Describe AIS Alarm state
 enum plugin_ais_alarm_type
 {
-      PI_AIS_NO_ALARM = 0,
-      PI_AIS_ALARM_SET,
-      PI_AIS_ALARM_ACKNOWLEDGED
+    PI_AIS_NO_ALARM = 0,
+    PI_AIS_ALARM_SET,
+    PI_AIS_ALARM_ACKNOWLEDGED
 
 };
 
 
 class PlugIn_AIS_Target
 {
-      public:
+public:
 
-            int                       MMSI;
-            int                       Class;
-            int                       NavStatus;
-            double                    SOG;
-            double                    COG;
-            double                    HDG;
-            double                    Lon;
-            double                    Lat;
-            int                       ROTAIS;
-            char                      CallSign[8];                // includes terminator
-            char                      ShipName[21];
-            unsigned char             ShipType;
-            int                       IMO;
+    int                       MMSI;
+    int                       Class;
+    int                       NavStatus;
+    double                    SOG;
+    double                    COG;
+    double                    HDG;
+    double                    Lon;
+    double                    Lat;
+    int                       ROTAIS;
+    char                      CallSign[8];                // includes terminator
+    char                      ShipName[21];
+    unsigned char             ShipType;
+    int                       IMO;
 
-            double                    Range_NM;
-            double                    Brg;
+    double                    Range_NM;
+    double                    Brg;
 
     //      Per target collision parameters
-            bool                      bCPA_Valid;
-            double                    TCPA;                     // Minutes
-            double                    CPA;                      // Nautical Miles
+    bool                      bCPA_Valid;
+    double                    TCPA;                     // Minutes
+    double                    CPA;                      // Nautical Miles
 
-            plugin_ais_alarm_type     alarm_state;
+    plugin_ais_alarm_type     alarm_state;
 };
 
 
 //    ChartType constants
 typedef enum ChartTypeEnumPI
 {
-      PI_CHART_TYPE_UNKNOWN = 0,
-      PI_CHART_TYPE_DUMMY,
-      PI_CHART_TYPE_DONTCARE,
-      PI_CHART_TYPE_KAP,
-      PI_CHART_TYPE_GEO,
-      PI_CHART_TYPE_S57,
-      PI_CHART_TYPE_CM93,
-      PI_CHART_TYPE_CM93COMP,
-      PI_CHART_TYPE_PLUGIN
-}_ChartTypeEnumPI;
+    PI_CHART_TYPE_UNKNOWN = 0,
+    PI_CHART_TYPE_DUMMY,
+    PI_CHART_TYPE_DONTCARE,
+    PI_CHART_TYPE_KAP,
+    PI_CHART_TYPE_GEO,
+    PI_CHART_TYPE_S57,
+    PI_CHART_TYPE_CM93,
+    PI_CHART_TYPE_CM93COMP,
+    PI_CHART_TYPE_PLUGIN
+} _ChartTypeEnumPI;
 
 //    ChartFamily constants
 typedef enum ChartFamilyEnumPI
 {
-      PI_CHART_FAMILY_UNKNOWN = 0,
-      PI_CHART_FAMILY_RASTER,
-      PI_CHART_FAMILY_VECTOR,
-      PI_CHART_FAMILY_DONTCARE
-}_ChartFamilyEnumPI;
+    PI_CHART_FAMILY_UNKNOWN = 0,
+    PI_CHART_FAMILY_RASTER,
+    PI_CHART_FAMILY_VECTOR,
+    PI_CHART_FAMILY_DONTCARE
+} _ChartFamilyEnumPI;
 
 //          Depth unit type enum
 typedef enum ChartDepthUnitTypePI
 {
-      PI_DEPTH_UNIT_UNKNOWN,
-      PI_DEPTH_UNIT_FEET,
-      PI_DEPTH_UNIT_METERS,
-      PI_DEPTH_UNIT_FATHOMS
-}_ChartDepthUnitTypePI;
+    PI_DEPTH_UNIT_UNKNOWN,
+    PI_DEPTH_UNIT_FEET,
+    PI_DEPTH_UNIT_METERS,
+    PI_DEPTH_UNIT_FATHOMS
+} _ChartDepthUnitTypePI;
 
 //          Projection type enum
 typedef enum OcpnProjTypePI
 {
-      PI_PROJECTION_UNKNOWN,
-      PI_PROJECTION_MERCATOR,
-      PI_PROJECTION_TRANSVERSE_MERCATOR,
-      PI_PROJECTION_POLYCONIC
-}_OcpnProjTypePI;
-
-typedef struct _ExtentPI{
-      double SLAT;
-      double WLON;
-      double NLAT;
-      double ELON;
-}ExtentPI;
+    PI_PROJECTION_UNKNOWN,
+    PI_PROJECTION_MERCATOR,
+    PI_PROJECTION_TRANSVERSE_MERCATOR,
+    PI_PROJECTION_POLYCONIC
+} _OcpnProjTypePI;
+
+typedef struct _ExtentPI
+{
+    double SLAT;
+    double WLON;
+    double NLAT;
+    double ELON;
+} ExtentPI;
 
 //    PlugInChartBase::Init()  init_flags constants
 #define      PI_FULL_INIT        0
@@ -242,89 +243,158 @@
 
 class DECL_EXP PlugInChartBase : public wxObject
 {
-      public:
-            //    These methods Must be overriden in any derived class
-            PlugInChartBase();
-            virtual ~PlugInChartBase();
-
-            virtual wxString GetFileSearchMask(void);
-
-            virtual int Init( const wxString& full_path, int init_flags );
-            virtual void SetColorScheme(int cs, bool bApplyImmediate);
-
-            virtual double GetNormalScaleMin(double canvas_scale_factor, bool b_allow_overzoom);
-            virtual double GetNormalScaleMax(double canvas_scale_factor, int canvas_width);
-            virtual double GetNearestPreferredScalePPM(double target_scale_ppm);
-
-            virtual bool GetChartExtent(ExtentPI *pext);
-
-            virtual wxBitmap &RenderRegionView(const PlugIn_ViewPort& VPoint, const wxRegion &Region);
-
-            virtual bool AdjustVP(PlugIn_ViewPort &vp_last, PlugIn_ViewPort &vp_proposed);
-
-            virtual void GetValidCanvasRegion(const PlugIn_ViewPort& VPoint, wxRegion *pValidRegion);
-
-            virtual int GetCOVREntries(){ return  0; }
-            virtual int GetCOVRTablePoints(int iTable) { return 0; }
-            virtual int  GetCOVRTablenPoints(int iTable){ return 0; }
-            virtual float *GetCOVRTableHead(int iTable){ return (float *)NULL; }
+public:
+    //    These methods Must be overriden in any derived class
+    PlugInChartBase();
+    virtual ~PlugInChartBase();
+
+    virtual wxString GetFileSearchMask( void );
+
+    virtual int Init( const wxString& full_path, int init_flags );
+    virtual void SetColorScheme( int cs, bool bApplyImmediate );
+
+    virtual double GetNormalScaleMin( double canvas_scale_factor, bool b_allow_overzoom );
+    virtual double GetNormalScaleMax( double canvas_scale_factor, int canvas_width );
+    virtual double GetNearestPreferredScalePPM( double target_scale_ppm );
+
+    virtual bool GetChartExtent( ExtentPI *pext );
+
+    virtual wxBitmap &RenderRegionView( const PlugIn_ViewPort& VPoint, const wxRegion &Region );
+
+    virtual bool AdjustVP( PlugIn_ViewPort &vp_last, PlugIn_ViewPort &vp_proposed );
+
+    virtual void GetValidCanvasRegion( const PlugIn_ViewPort& VPoint, wxRegion *pValidRegion );
+
+    virtual int GetCOVREntries()
+    {
+        return  0;
+    }
+    virtual int GetCOVRTablePoints( int iTable )
+    {
+        return 0;
+    }
+    virtual int  GetCOVRTablenPoints( int iTable )
+    {
+        return 0;
+    }
+    virtual float *GetCOVRTableHead( int iTable )
+    {
+        return ( float * )NULL;
+    }
 
-            virtual wxBitmap *GetThumbnail(int tnx, int tny, int cs);
+    virtual wxBitmap *GetThumbnail( int tnx, int tny, int cs );
 
 //    Accessors, need not be overridden in derived class if the member variables are maintained
-            virtual wxString GetFullPath() const            { return m_FullPath;}
-            virtual ChartTypeEnumPI GetChartType()          { return m_ChartType;}
-            virtual ChartFamilyEnumPI GetChartFamily()      { return m_ChartFamily;}
-            virtual OcpnProjTypePI GetChartProjection()     { return m_projection;}
-            virtual wxString GetName()                      { return m_Name;}
-            virtual wxString GetDescription()               { return m_Description;}
-            virtual wxString GetID()                        { return m_ID;}
-            virtual wxString GetSE()                        { return m_SE;}
-            virtual wxString GetDepthUnits()                { return m_DepthUnits;}
-            virtual wxString GetSoundingsDatum()            { return m_SoundingsDatum;}
-            virtual wxString GetDatumString()               { return m_datum_str;}
-            virtual wxString GetExtraInfo()                 { return m_ExtraInfo; }
-            virtual wxString GetPubDate()                   { return m_PubYear;}
-            virtual double GetChartErrorFactor()            { return m_Chart_Error_Factor;}
-            virtual ChartDepthUnitTypePI GetDepthUnitId()   { return m_depth_unit_id;}
-            virtual bool IsReadyToRender()                  { return m_bReadyToRender;}
-            virtual int GetNativeScale()                    { return m_Chart_Scale; };
-            virtual double GetChartSkew()                   { return m_Chart_Skew; }
-            virtual wxDateTime GetEditionDate(void)         { return m_EdDate;}
+    virtual wxString GetFullPath() const
+    {
+        return m_FullPath;
+    }
+    virtual ChartTypeEnumPI GetChartType()
+    {
+        return m_ChartType;
+    }
+    virtual ChartFamilyEnumPI GetChartFamily()
+    {
+        return m_ChartFamily;
+    }
+    virtual OcpnProjTypePI GetChartProjection()
+    {
+        return m_projection;
+    }
+    virtual wxString GetName()
+    {
+        return m_Name;
+    }
+    virtual wxString GetDescription()
+    {
+        return m_Description;
+    }
+    virtual wxString GetID()
+    {
+        return m_ID;
+    }
+    virtual wxString GetSE()
+    {
+        return m_SE;
+    }
+    virtual wxString GetDepthUnits()
+    {
+        return m_DepthUnits;
+    }
+    virtual wxString GetSoundingsDatum()
+    {
+        return m_SoundingsDatum;
+    }
+    virtual wxString GetDatumString()
+    {
+        return m_datum_str;
+    }
+    virtual wxString GetExtraInfo()
+    {
+        return m_ExtraInfo;
+    }
+    virtual wxString GetPubDate()
+    {
+        return m_PubYear;
+    }
+    virtual double GetChartErrorFactor()
+    {
+        return m_Chart_Error_Factor;
+    }
+    virtual ChartDepthUnitTypePI GetDepthUnitId()
+    {
+        return m_depth_unit_id;
+    }
+    virtual bool IsReadyToRender()
+    {
+        return m_bReadyToRender;
+    }
+    virtual int GetNativeScale()
+    {
+        return m_Chart_Scale;
+    };
+    virtual double GetChartSkew()
+    {
+        return m_Chart_Skew;
+    }
+    virtual wxDateTime GetEditionDate( void )
+    {
+        return m_EdDate;
+    }
 
 //    Methods pertaining to CHART_FAMILY_RASTER type PlugIn charts only
-            virtual void ComputeSourceRectangle(const PlugIn_ViewPort &vp, wxRect *pSourceRect);
-            virtual double GetRasterScaleFactor();
-            virtual bool GetChartBits( wxRect& source, unsigned char *pPix, int sub_samp );
-            virtual int GetSize_X();
-            virtual int GetSize_Y();
-            virtual void latlong_to_chartpix(double lat, double lon, double &pixx, double &pixy);
-
-      protected:
-            ChartTypeEnumPI     m_ChartType;
-            ChartFamilyEnumPI   m_ChartFamily;
-
-            wxString            m_FullPath;
-            OcpnProjTypePI      m_projection;
-            int                 m_Chart_Scale;
-            double              m_Chart_Skew;
-
-            wxDateTime          m_EdDate;
-            bool                m_bReadyToRender;
-
-            wxString          m_Name;
-            wxString          m_Description;
-            wxString          m_ID;
-            wxString          m_SE;
-            wxString          m_SoundingsDatum;
-            wxString          m_datum_str;
-            wxString          m_PubYear;
-            wxString          m_DepthUnits;
-            wxString          m_ExtraInfo;
+    virtual void ComputeSourceRectangle( const PlugIn_ViewPort &vp, wxRect *pSourceRect );
+    virtual double GetRasterScaleFactor();
+    virtual bool GetChartBits( wxRect& source, unsigned char *pPix, int sub_samp );
+    virtual int GetSize_X();
+    virtual int GetSize_Y();
+    virtual void latlong_to_chartpix( double lat, double lon, double &pixx, double &pixy );
+
+protected:
+    ChartTypeEnumPI     m_ChartType;
+    ChartFamilyEnumPI   m_ChartFamily;
+
+    wxString            m_FullPath;
+    OcpnProjTypePI      m_projection;
+    int                 m_Chart_Scale;
+    double              m_Chart_Skew;
+
+    wxDateTime          m_EdDate;
+    bool                m_bReadyToRender;
+
+    wxString          m_Name;
+    wxString          m_Description;
+    wxString          m_ID;
+    wxString          m_SE;
+    wxString          m_SoundingsDatum;
+    wxString          m_datum_str;
+    wxString          m_PubYear;
+    wxString          m_DepthUnits;
+    wxString          m_ExtraInfo;
 
-            ChartDepthUnitTypePI  m_depth_unit_id;
+    ChartDepthUnitTypePI  m_depth_unit_id;
 
-            double            m_Chart_Error_Factor;
+    double            m_Chart_Error_Factor;
 
 
 };
@@ -334,7 +404,7 @@
 
 
 //    Declare an array of PlugIn_AIS_Targets
-WX_DEFINE_ARRAY_PTR(PlugIn_AIS_Target *, ArrayOfPlugIn_AIS_Targets);
+WX_DEFINE_ARRAY_PTR( PlugIn_AIS_Target *, ArrayOfPlugIn_AIS_Targets );
 
 
 
@@ -354,114 +424,114 @@
 {
 
 public:
-      opencpn_plugin(void *pmgr) {}
-      virtual ~opencpn_plugin();
+    opencpn_plugin( void *pmgr ) {}
+    virtual ~opencpn_plugin();
 
-      //    Public API to the PlugIn class
+    //    Public API to the PlugIn class
 
-      //    This group of methods is required, and will be called by the opencpn host
-      //    opencpn PlugIns must implement this group
-      virtual int Init(void);               // Return the PlugIn Capabilites flag
-      virtual bool DeInit(void);
+    //    This group of methods is required, and will be called by the opencpn host
+    //    opencpn PlugIns must implement this group
+    virtual int Init( void );             // Return the PlugIn Capabilites flag
+    virtual bool DeInit( void );
 
-      virtual int GetAPIVersionMajor();
-      virtual int GetAPIVersionMinor();
-      virtual int GetPlugInVersionMajor();
-      virtual int GetPlugInVersionMinor();
-      virtual wxBitmap *GetPlugInBitmap();
+    virtual int GetAPIVersionMajor();
+    virtual int GetAPIVersionMinor();
+    virtual int GetPlugInVersionMajor();
+    virtual int GetPlugInVersionMinor();
+    virtual wxBitmap *GetPlugInBitmap();
 
-      //    These three methods should produce valid, meaningful strings always
-      //    ---EVEN IF--- the PlugIn has not (yet) been initialized.
-      //    They are used by the PlugInManager GUI
-      virtual wxString GetCommonName();
-      virtual wxString GetShortDescription();
-      virtual wxString GetLongDescription();
+    //    These three methods should produce valid, meaningful strings always
+    //    ---EVEN IF--- the PlugIn has not (yet) been initialized.
+    //    They are used by the PlugInManager GUI
+    virtual wxString GetCommonName();
+    virtual wxString GetShortDescription();
+    virtual wxString GetLongDescription();
 
-      //    This group is optional.
-      //    PlugIns may override any of these methods as required
+    //    This group is optional.
+    //    PlugIns may override any of these methods as required
 
-      virtual void SetDefaults(void);     //This will be called upon enabling a PlugIn via the user Dialog
-                                          //It gives a chance to setup any default options and behavior
+    virtual void SetDefaults( void );   //This will be called upon enabling a PlugIn via the user Dialog
+    //It gives a chance to setup any default options and behavior
 
-      virtual int GetToolbarToolCount(void);
+    virtual int GetToolbarToolCount( void );
 
-      virtual int GetToolboxPanelCount(void);
-      virtual void SetupToolboxPanel(int page_sel, wxNotebook* pnotebook);
-      virtual void OnCloseToolboxPanel(int page_sel, int ok_apply_cancel);
+    virtual int GetToolboxPanelCount( void );
+    virtual void SetupToolboxPanel( int page_sel, wxNotebook* pnotebook );
+    virtual void OnCloseToolboxPanel( int page_sel, int ok_apply_cancel );
 
-      virtual void ShowPreferencesDialog( wxWindow* parent );
+    virtual void ShowPreferencesDialog( wxWindow* parent );
 
-      virtual bool RenderOverlay(wxMemoryDC *pmdc, PlugIn_ViewPort *vp);
-      virtual void SetCursorLatLon(double lat, double lon);
-      virtual void SetCurrentViewPort(PlugIn_ViewPort &vp);
+    virtual bool RenderOverlay( wxMemoryDC *pmdc, PlugIn_ViewPort *vp );
+    virtual void SetCursorLatLon( double lat, double lon );
+    virtual void SetCurrentViewPort( PlugIn_ViewPort &vp );
 
-      virtual void SetPositionFix(PlugIn_Position_Fix &pfix);
-      virtual void SetNMEASentence(wxString &sentence);
-      virtual void SetAISSentence(wxString &sentence);
+    virtual void SetPositionFix( PlugIn_Position_Fix &pfix );
+    virtual void SetNMEASentence( wxString &sentence );
+    virtual void SetAISSentence( wxString &sentence );
 
-      virtual void ProcessParentResize(int x, int y);
-      virtual void SetColorScheme(PI_ColorScheme cs);
+    virtual void ProcessParentResize( int x, int y );
+    virtual void SetColorScheme( PI_ColorScheme cs );
 
-      virtual void OnToolbarToolCallback(int id);
-      virtual void OnContextMenuItemCallback(int id);
+    virtual void OnToolbarToolCallback( int id );
+    virtual void OnContextMenuItemCallback( int id );
 
-      virtual void UpdateAuiStatus(void);
+    virtual void UpdateAuiStatus( void );
 
-      virtual wxArrayString GetDynamicChartClassNameArray(void);
+    virtual wxArrayString GetDynamicChartClassNameArray( void );
 
- };
+};
 
 
- // the types of the class factories used to create PlugIn instances
- typedef opencpn_plugin* create_t(void*);
- typedef void destroy_t(opencpn_plugin*);
+// the types of the class factories used to create PlugIn instances
+typedef opencpn_plugin* create_t( void* );
+typedef void destroy_t( opencpn_plugin* );
 
- class DECL_EXP opencpn_plugin_16 : public opencpn_plugin
- {
-       public:
-             opencpn_plugin_16(void *pmgr);
-             virtual ~opencpn_plugin_16();
+class DECL_EXP opencpn_plugin_16 : public opencpn_plugin
+{
+public:
+    opencpn_plugin_16( void *pmgr );
+    virtual ~opencpn_plugin_16();
 
-             virtual bool RenderOverlay(wxDC &dc, PlugIn_ViewPort *vp);
+    virtual bool RenderOverlay( wxDC &dc, PlugIn_ViewPort *vp );
 
-             virtual void SetPluginMessage(wxString &message_id, wxString &message_body);
+    virtual void SetPluginMessage( wxString &message_id, wxString &message_body );
 
- };
+};
 
 class DECL_EXP opencpn_plugin_17 : public opencpn_plugin
 {
-       public:
-             opencpn_plugin_17(void *pmgr);
-             virtual ~opencpn_plugin_17();
+public:
+    opencpn_plugin_17( void *pmgr );
+    virtual ~opencpn_plugin_17();
 
-             virtual bool RenderOverlay(wxDC &dc, PlugIn_ViewPort *vp);
-             virtual bool RenderGLOverlay(wxGLContext *pcontext, PlugIn_ViewPort *vp);
+    virtual bool RenderOverlay( wxDC &dc, PlugIn_ViewPort *vp );
+    virtual bool RenderGLOverlay( wxGLContext *pcontext, PlugIn_ViewPort *vp );
 
-             virtual void SetPluginMessage(wxString &message_id, wxString &message_body);
+    virtual void SetPluginMessage( wxString &message_id, wxString &message_body );
 
 };
 
 class DECL_EXP opencpn_plugin_18 : public opencpn_plugin
 {
-      public:
-            opencpn_plugin_18(void *pmgr);
-            virtual ~opencpn_plugin_18();
+public:
+    opencpn_plugin_18( void *pmgr );
+    virtual ~opencpn_plugin_18();
 
-            virtual bool RenderOverlay(wxDC &dc, PlugIn_ViewPort *vp);
-            virtual bool RenderGLOverlay(wxGLContext *pcontext, PlugIn_ViewPort *vp);
+    virtual bool RenderOverlay( wxDC &dc, PlugIn_ViewPort *vp );
+    virtual bool RenderGLOverlay( wxGLContext *pcontext, PlugIn_ViewPort *vp );
 
-            virtual void SetPluginMessage(wxString &message_id, wxString &message_body);
-            virtual void SetPositionFixEx(PlugIn_Position_Fix_Ex &pfix);
+    virtual void SetPluginMessage( wxString &message_id, wxString &message_body );
+    virtual void SetPositionFixEx( PlugIn_Position_Fix_Ex &pfix );
 
 };
 
 class DECL_EXP opencpn_plugin_19 : public opencpn_plugin_18
 {
-      public:
-            opencpn_plugin_19(void *pmgr);
-            virtual ~opencpn_plugin_19();
+public:
+    opencpn_plugin_19( void *pmgr );
+    virtual ~opencpn_plugin_19();
 
-            virtual void OnSetupOptions(void);
+    virtual void OnSetupOptions( void );
 };
 
 //----------------------------------------------------------------------------------------------------------
@@ -473,67 +543,67 @@
 //----------------------------------------------------------------------------------------------------------
 
 
-extern "C"  DECL_EXP int InsertPlugInTool(wxString label, wxBitmap *bitmap, wxBitmap *bmpDisabled, wxItemKind kind,
-                                          wxString shortHelp, wxString longHelp, wxObject *clientData, int position,
-                                          int tool_sel, opencpn_plugin *pplugin);
-extern "C"  DECL_EXP void RemovePlugInTool(int tool_id);
-extern "C"  DECL_EXP void SetToolbarToolViz(int item, bool viz);      // Temporarily change toolbar tool viz
-extern "C"  DECL_EXP void SetToolbarItemState(int item, bool toggle);
-extern "C"  DECL_EXP void SetToolbarToolBitmaps(int item, wxBitmap *bitmap, wxBitmap *bmpDisabled);
-
-extern "C"  DECL_EXP  int AddCanvasContextMenuItem(wxMenuItem *pitem, opencpn_plugin *pplugin );
-extern "C"  DECL_EXP void RemoveCanvasContextMenuItem(int item);      // Fully remove this item
-extern "C"  DECL_EXP void SetCanvasContextMenuItemViz(int item, bool viz);      // Temporarily change context menu ptions
-extern "C"  DECL_EXP void SetCanvasContextMenuItemGrey(int item, bool grey);
+extern "C"  DECL_EXP int InsertPlugInTool( wxString label, wxBitmap *bitmap, wxBitmap *bmpDisabled, wxItemKind kind,
+        wxString shortHelp, wxString longHelp, wxObject *clientData, int position,
+        int tool_sel, opencpn_plugin *pplugin );
+extern "C"  DECL_EXP void RemovePlugInTool( int tool_id );
+extern "C"  DECL_EXP void SetToolbarToolViz( int item, bool viz );    // Temporarily change toolbar tool viz
+extern "C"  DECL_EXP void SetToolbarItemState( int item, bool toggle );
+extern "C"  DECL_EXP void SetToolbarToolBitmaps( int item, wxBitmap *bitmap, wxBitmap *bmpDisabled );
+
+extern "C"  DECL_EXP  int AddCanvasContextMenuItem( wxMenuItem *pitem, opencpn_plugin *pplugin );
+extern "C"  DECL_EXP void RemoveCanvasContextMenuItem( int item );    // Fully remove this item
+extern "C"  DECL_EXP void SetCanvasContextMenuItemViz( int item, bool viz );    // Temporarily change context menu ptions
+extern "C"  DECL_EXP void SetCanvasContextMenuItemGrey( int item, bool grey );
 
 
-extern "C"  DECL_EXP wxFileConfig *GetOCPNConfigObject(void);
+extern "C"  DECL_EXP wxFileConfig *GetOCPNConfigObject( void );
 
-extern "C"  DECL_EXP void RequestRefresh(wxWindow *);
-extern "C"  DECL_EXP bool GetGlobalColor(wxString colorName, wxColour *pcolour);
+extern "C"  DECL_EXP void RequestRefresh( wxWindow * );
+extern "C"  DECL_EXP bool GetGlobalColor( wxString colorName, wxColour *pcolour );
 
-extern "C"  DECL_EXP void GetCanvasPixLL(PlugIn_ViewPort *vp, wxPoint *pp, double lat, double lon);
-extern "C"  DECL_EXP void GetCanvasLLPix( PlugIn_ViewPort *vp, wxPoint p, double *plat, double *plon);
+extern "C"  DECL_EXP void GetCanvasPixLL( PlugIn_ViewPort *vp, wxPoint *pp, double lat, double lon );
+extern "C"  DECL_EXP void GetCanvasLLPix( PlugIn_ViewPort *vp, wxPoint p, double *plat, double *plon );
 
 extern "C"  DECL_EXP wxWindow *GetOCPNCanvasWindow();
 
-extern "C"  DECL_EXP wxFont *OCPNGetFont(wxString TextElement, int default_size);
+extern "C"  DECL_EXP wxFont *OCPNGetFont( wxString TextElement, int default_size );
 
 extern "C"  DECL_EXP wxString *GetpSharedDataLocation();
 
-extern "C"  DECL_EXP ArrayOfPlugIn_AIS_Targets *GetAISTargetArray(void);
+extern "C"  DECL_EXP ArrayOfPlugIn_AIS_Targets *GetAISTargetArray( void );
 
-extern "C"  DECL_EXP wxAuiManager *GetFrameAuiManager(void);
+extern "C"  DECL_EXP wxAuiManager *GetFrameAuiManager( void );
 
 extern "C"  DECL_EXP bool AddLocaleCatalog( wxString catalog );
 
 extern "C"  DECL_EXP void PushNMEABuffer( wxString str );
 
-extern  DECL_EXP wxXmlDocument GetChartDatabaseEntryXML(int dbIndex, bool b_getGeom);
+extern  DECL_EXP wxXmlDocument GetChartDatabaseEntryXML( int dbIndex, bool b_getGeom );
 
-extern  DECL_EXP bool UpdateChartDBInplace(wxArrayString dir_array,
-                          bool b_force_update,
-                          bool b_ProgressDialog);
+extern  DECL_EXP bool UpdateChartDBInplace( wxArrayString dir_array,
+        bool b_force_update,
+        bool b_ProgressDialog );
 extern  DECL_EXP wxArrayString GetChartDBDirArrayString();
 
 extern "C"  DECL_EXP void SendPluginMessage( wxString message_id, wxString message_body );
 
-extern "C"  DECL_EXP void DimeWindow(wxWindow *);
+extern "C"  DECL_EXP void DimeWindow( wxWindow * );
 
-extern "C"  DECL_EXP void JumpToPosition(double lat, double lon, double scale);
+extern "C"  DECL_EXP void JumpToPosition( double lat, double lon, double scale );
 
 /* API 1.9  adds some common cartographic fucntions to avoid unnecessary code duplication */
 /* Study the original OpenCPN source (georef.c) for functional definitions  */
 
-extern "C" void DistanceBearingMercator(double lat0, double lon0, double lat1, double lon1, double *brg, double *dist);
-extern "C" double DistGreatCircle(double slat, double slon, double dlat, double dlon);
+extern "C" void DistanceBearingMercator( double lat0, double lon0, double lat1, double lon1, double *brg, double *dist );
+extern "C" double DistGreatCircle( double slat, double slon, double dlat, double dlon );
 
-extern "C" void toTM(float lat, float lon, float lat0, float lon0, double *x, double *y);
-extern "C" void fromTM(double x, double y, double lat0, double lon0, double *lat, double *lon);
-extern "C" void toSM(double lat, double lon, double lat0, double lon0, double *x, double *y);
-extern "C" void fromSM(double x, double y, double lat0, double lon0, double *lat, double *lon);
-extern "C" void toSM_ECC(double lat, double lon, double lat0, double lon0, double *x, double *y);
-extern "C" void fromSM_ECC(double x, double y, double lat0, double lon0, double *lat, double *lon);
+extern "C" void toTM( float lat, float lon, float lat0, float lon0, double *x, double *y );
+extern "C" void fromTM( double x, double y, double lat0, double lon0, double *lat, double *lon );
+extern "C" void toSM( double lat, double lon, double lat0, double lon0, double *x, double *y );
+extern "C" void fromSM( double x, double y, double lat0, double lon0, double *lat, double *lon );
+extern "C" void toSM_ECC( double lat, double lon, double lat0, double lon0, double *x, double *y );
+extern "C" void fromSM_ECC( double x, double y, double lat0, double lon0, double *lat, double *lon );
 
 extern "C" DECL_EXP bool DecodeSingleVDOMessage( const wxString& str, PlugIn_Position_Fix_Ex *pos, wxString *acc );
 
@@ -541,14 +611,14 @@
 /* API 1.9 */
 typedef enum OptionsParentPI
 {
-      PI_OPTIONS_PARENT_DISPLAY,
-      PI_OPTIONS_PARENT_CONNECTIONS,
-      PI_OPTIONS_PARENT_CHARTS,
-      PI_OPTIONS_PARENT_SHIPS,
-      PI_OPTIONS_PARENT_UI,
-      PI_OPTIONS_PARENT_PLUGINS
-}_OptionsParentPI;
-extern DECL_EXP wxScrolledWindow *AddOptionsPage( OptionsParentPI parent, wxString title ); 
+    PI_OPTIONS_PARENT_DISPLAY,
+    PI_OPTIONS_PARENT_CONNECTIONS,
+    PI_OPTIONS_PARENT_CHARTS,
+    PI_OPTIONS_PARENT_SHIPS,
+    PI_OPTIONS_PARENT_UI,
+    PI_OPTIONS_PARENT_PLUGINS
+} _OptionsParentPI;
+extern DECL_EXP wxScrolledWindow *AddOptionsPage( OptionsParentPI parent, wxString title );
 extern DECL_EXP bool DeleteOptionsPage( wxScrolledWindow* page );
 
 extern "C" DECL_EXP int GetChartbarHeight( void );
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Options.cpp opencpn-plugin-logbookkonni-1.2024/src/Options.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/Options.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Options.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -4,32 +4,32 @@
 
 
 #include "Options.h"
-#include <wx/msgdlg.h> 
+#include <wx/msgdlg.h>
 #include <wx/mimetype.h>
 #include <wx/tokenzr.h>
 #include "LogbookDialog.h"
 
 
-Options::Options(void)
+Options::Options( void )
 {
-	//Date/Time 
-	timeformat  = -1;
-	noseconds   = true;
-	dateformat  = 0;
-	dateseparatorlocale = _T("/");
-	dateseparatorindiv  = _T("/");
-	sdateformat = _T("");
-	stimeformat = _T("");
-	date1 = date2 = date3 = 0;
-	statusbarGlobal = true;
+    //Date/Time
+    timeformat  = -1;
+    noseconds   = true;
+    dateformat  = 0;
+    dateseparatorlocale = _T( "/" );
+    dateseparatorindiv  = _T( "/" );
+    sdateformat = _T( "" );
+    stimeformat = _T( "" );
+    date1 = date2 = date3 = 0;
+    statusbarGlobal = true;
     layoutShow = false;
-	statusbarWatch = true;
-    kmlTrans.Add(_T("50"));
-    kmlTrans.Add(_T("FF"));
-    kmlColor.Add(_T("FFFFFF"));
-    kmlColor.Add(_T("000000"));
-    kmlColor.Add(_T("0000FF"));
-    kmlColor.Add(_T("14F0FF"));
+    statusbarWatch = true;
+    kmlTrans.Add( _T( "50" ) );
+    kmlTrans.Add( _T( "FF" ) );
+    kmlColor.Add( _T( "FFFFFF" ) );
+    kmlColor.Add( _T( "000000" ) );
+    kmlColor.Add( _T( "0000FF" ) );
+    kmlColor.Add( _T( "14F0FF" ) );
     engines = 0;
     generator = 0;
     toggleEngine1 = false;
@@ -50,185 +50,186 @@
     engine2Running = false;
     generatorRunning = false;
     bRPMCheck = false;
-    engineStr[0] = _T("1");
-    engineStr[1] = _T("2");
+    engineStr[0] = _T( "1" );
+    engineStr[1] = _T( "2" );
     engineMessageSails = false;
     engineMessageRunning = false;
     engineAllwaysSailsDown = false;
     statusbar = true;
+    windspeeds = false;
 
-    abrSails.Add(_("Ma"));
-    abrSails.Add(_("Tr"));
-    abrSails.Add(_("Ge1"));
-    abrSails.Add(_("Ge2"));
-    abrSails.Add(_("Ge3"));
-    abrSails.Add(_("Fo1"));
-    abrSails.Add(_("Fo2"));
-    abrSails.Add(_("Fo3"));
-    abrSails.Add(_("Ji"));
-    abrSails.Add(_("Mi"));
-    abrSails.Add(_("Mt"));
-    abrSails.Add(_("St"));
-    abrSails.Add(_("Sp"));
-    abrSails.Add(_("?"));
-
-    sailsName.Add(_("Main"));
-    sailsName.Add(_("Try"));
-    sailsName.Add(_("Genoa 1"));
-    sailsName.Add(_("Genoa 2"));
-    sailsName.Add(_("Genoa 3"));
-    sailsName.Add(_("Fock 1"));
-    sailsName.Add(_("Fock 2"));
-    sailsName.Add(_("Fock 3"));
-    sailsName.Add(_("Jib"));
-    sailsName.Add(_("Mizzen"));
-    sailsName.Add(_("Mizzen Storm"));
-    sailsName.Add(_("Staysail"));
-    sailsName.Add(_("Spinnacker"));
-    sailsName.Add(_("You can change the abreviations and the names of the sails\nin Options/Miscellaneous/Sails"));
+    abrSails.Add( _( "Ma" ) );
+    abrSails.Add( _( "Tr" ) );
+    abrSails.Add( _( "Ge1" ) );
+    abrSails.Add( _( "Ge2" ) );
+    abrSails.Add( _( "Ge3" ) );
+    abrSails.Add( _( "Fo1" ) );
+    abrSails.Add( _( "Fo2" ) );
+    abrSails.Add( _( "Fo3" ) );
+    abrSails.Add( _( "Ji" ) );
+    abrSails.Add( _( "Mi" ) );
+    abrSails.Add( _( "Mt" ) );
+    abrSails.Add( _( "St" ) );
+    abrSails.Add( _( "Sp" ) );
+    abrSails.Add( _( "?" ) );
+
+    sailsName.Add( _( "Main" ) );
+    sailsName.Add( _( "Try" ) );
+    sailsName.Add( _( "Genoa 1" ) );
+    sailsName.Add( _( "Genoa 2" ) );
+    sailsName.Add( _( "Genoa 3" ) );
+    sailsName.Add( _( "Fock 1" ) );
+    sailsName.Add( _( "Fock 2" ) );
+    sailsName.Add( _( "Fock 3" ) );
+    sailsName.Add( _( "Jib" ) );
+    sailsName.Add( _( "Mizzen" ) );
+    sailsName.Add( _( "Mizzen Storm" ) );
+    sailsName.Add( _( "Staysail" ) );
+    sailsName.Add( _( "Spinnacker" ) );
+    sailsName.Add( _( "You can change the abreviations and the names of the sails\nin Options/Miscellaneous/Sails" ) );
 
     rowGap = 0;
     colGap = 0;
 
-    for(int i = 0; i < 14; i++)
-            bSailIsChecked[i] = false;
+    for ( int i = 0; i < 14; i++ )
+        bSailIsChecked[i] = false;
 
-	// Global Options
-	traditional = true;
-	modern      = false;
-	showToolTips= true;
+    // Global Options
+    traditional = true;
+    modern      = false;
+    showToolTips= true;
 
 #ifdef __WXMSW__
-	firstTime = false;
+    firstTime = false;
 #endif
-#ifdef __WXOSX__ 
-	firstTime = false;
+#ifdef __WXOSX__
+    firstTime = false;
 #endif
 #ifdef __POSIX__
-	firstTime = true;
+    firstTime = true;
 #endif
-	dlgWidth = 1010;
-	dlgHeight = 535;
-	popup = true;
-    for(int i = 0; i < 7; i++)
+    dlgWidth = 1010;
+    dlgHeight = 535;
+    popup = true;
+    for ( int i = 0; i < 7; i++ )
     {
-        layoutPrefix[i] =  _T("Label_");
+        layoutPrefix[i] =  _T( "Label_" );
         filterLayout[i] =  true;
     }
-	noGPS = true;
-	colouredMaintenance = true;
-	waypointArrived = false;
-	waypointText = _("automatic line Waypoint arrived");
-	guardChange = false;
-	guardChangeText = _("automatic line\nchange of guards");
-	courseChange = false;
-	courseChangeDegrees = _T("90");
-	courseChangeText = _("automatic line\nchange of course >");
-	courseTextAfterMinutes = _T("5");
-	everySM = false;
-	everySMAmount = _T("10");
-	everySMText = _("automatic line\nDistance > ");
-	dCourseChangeDegrees = -1;
-	dEverySM = -1;
-
-	// Timer 
-	timer = false;
-	timerType = 0;
-	local = true;
-	UTC = false;
-	gpsAuto = false;
-	tzIndicator = 0;
-	tzHour = 0;
-	thour = _T("0");
-	tmin = _T("1");;
-	tsec = _T("0");;
-	ttext = _("Automatic line by timer\n\n\
+    noGPS = true;
+    colouredMaintenance = true;
+    waypointArrived = false;
+    waypointText = _( "automatic line Waypoint arrived" );
+    guardChange = false;
+    guardChangeText = _( "automatic line\nchange of guards" );
+    courseChange = false;
+    courseChangeDegrees = _T( "90" );
+    courseChangeText = _( "automatic line\nchange of course >" );
+    courseTextAfterMinutes = _T( "5" );
+    everySM = false;
+    everySMAmount = _T( "10" );
+    everySMText = _( "automatic line\nDistance > " );
+    dCourseChangeDegrees = -1;
+    dEverySM = -1;
+
+    // Timer
+    timer = false;
+    timerType = 0;
+    local = true;
+    UTC = false;
+    gpsAuto = false;
+    tzIndicator = 0;
+    tzHour = 0;
+    thour = _T( "0" );
+    tmin = _T( "1" );;
+    tsec = _T( "0" );;
+    ttext = _( "Automatic line by timer\n\n\
 You can set/unset a timer-interval\n\
-or change this text in Toolbox/Plugins/Logbook\n\nShift+Enter appends a new line");
-	timerSec = 5;
+or change this text in Toolbox/Plugins/Logbook\n\nShift+Enter appends a new line" );
+    timerSec = 5;
 
-	// Grid Navigation
-	Deg = _T("\xB0"); // Apple \xA1 ??
-	Min = _("'");
-	Sec = _("\"");
-
-	distance = _("NM");
-	speed = _("kts");
-
-	meter = _("m");
-	feet = _("ft");
-	fathom = _("fth");
-
-	// Grid Weather
-	baro = _("mb");
-	temperature = _("F");
-	windkts = _("kts");
-	windmeter = _("m/s");
-	windkmh = _("km/h");
-
-	// Grid MotorSails
-	vol = _("gal");
-	motorh = _("h");
-    engine = _T("E");
-    shaft = _T("S");
-    rpm = _T("RPM");
-
-	//Maintenance
-	days = _("day(s)");
-	weeks = _("week(s)");
-	month = _("month");
-
-	//Capacity
-	fuelTank   = _T("0");
-	waterTank  = _T("0");
-	watermaker = _T("0");
-	bank1      = _T("0");
-	bank2      = _T("0");
-	ampere     = _T("A");
-
-	//wxChoice
-	showDepth = 0;
-	showWaveSwell = 0;
-	showWindSpeed = 0;
-	showWindHeading = 0;
-	showWindDir = 0;
-	showHeading = 0;
-
-
-	overviewAll = 0;
-
-	navGridLayoutChoice = 0;
-	crewGridLayoutChoice = 0;
-	boatGridLayoutChoice = 0;
-	overviewGridLayoutChoice = 0;
-	serviceGridLayoutChoice = 0;
-	repairsGridLayoutChoice = 0;
-	buypartsGridLayoutChoice = 0;
-	
-	navGridLayoutChoiceODT = 0;
-	crewGridLayoutChoiceODT = 0;
-	boatGridLayoutChoiceODT = 0;
-	overviewGridLayoutChoiceODT = 0;
-	serviceGridLayoutChoiceODT = 0;
-	repairsGridLayoutChoiceODT = 0;
-	buypartsGridLayoutChoiceODT = 0;
-	
-	navHTML = true;
-	crewHTML = true;
-	boatHTML = true;
-	overviewHTML = true;
-	serviceHTML = true;
-	repairsHTML = true;
-	buypartsHTML = false;
-
-	// Paths
-	htmlEditor  = _T("");
-	htmlEditorReset = htmlEditor;
+    // Grid Navigation
+    Deg = _T( "\xB0" ); // Apple \xA1 ??
+    Min = _( "'" );
+    Sec = _( "\"" );
+
+    distance = _( "NM" );
+    speed = _( "kts" );
+
+    meter = _( "m" );
+    feet = _( "ft" );
+    fathom = _( "fth" );
+
+    // Grid Weather
+    baro = _( "mb" );
+    temperature = _( "F" );
+    windkts = _( "kts" );
+    windmeter = _( "m/s" );
+    windkmh = _( "km/h" );
+
+    // Grid MotorSails
+    vol = _( "gal" );
+    motorh = _( "h" );
+    engine = _T( "E" );
+    shaft = _T( "S" );
+    rpm = _T( "RPM" );
+
+    //Maintenance
+    days = _( "day(s)" );
+    weeks = _( "week(s)" );
+    month = _( "month" );
+
+    //Capacity
+    fuelTank   = _T( "0" );
+    waterTank  = _T( "0" );
+    watermaker = _T( "0" );
+    bank1      = _T( "0" );
+    bank2      = _T( "0" );
+    ampere     = _T( "A" );
+
+    //wxChoice
+    showDepth = 0;
+    showWaveSwell = 0;
+    showWindSpeed = 0;
+    showWindHeading = 0;
+    showWindDir = 0;
+    showHeading = 0;
+
+
+    overviewAll = 0;
+
+    navGridLayoutChoice = 0;
+    crewGridLayoutChoice = 0;
+    boatGridLayoutChoice = 0;
+    overviewGridLayoutChoice = 0;
+    serviceGridLayoutChoice = 0;
+    repairsGridLayoutChoice = 0;
+    buypartsGridLayoutChoice = 0;
+
+    navGridLayoutChoiceODT = 0;
+    crewGridLayoutChoiceODT = 0;
+    boatGridLayoutChoiceODT = 0;
+    overviewGridLayoutChoiceODT = 0;
+    serviceGridLayoutChoiceODT = 0;
+    repairsGridLayoutChoiceODT = 0;
+    buypartsGridLayoutChoiceODT = 0;
+
+    navHTML = true;
+    crewHTML = true;
+    boatHTML = true;
+    overviewHTML = true;
+    serviceHTML = true;
+    repairsHTML = true;
+    buypartsHTML = false;
+
+    // Paths
+    htmlEditor  = _T( "" );
+    htmlEditorReset = htmlEditor;
 
     // KML
     kmlRoute = 1;
     kmlTrack = 1;
-    kmlLineWidth = _T("4");;
+    kmlLineWidth = _T( "4" );;
     kmlLineTransparancy = 0;
     kmlRouteColor = 0;
     kmlTrackColor = 3;
@@ -238,226 +239,265 @@
     NMEAUseWIMDA = true;
 
 #ifdef __WXMSW__
-	wxFileType *filetype1=wxTheMimeTypesManager->GetFileTypeFromExtension(_T("odt"));
-	wxString command;
+    wxFileType *filetype1=wxTheMimeTypesManager->GetFileTypeFromExtension( _T( "odt" ) );
+    wxString command;
 
-	if(filetype1)
-	{
-		if((command = filetype1->GetOpenCommand(_T("x.odt"))) != wxEmptyString)
-		{
-			command = command.Remove(command.find_last_of(_T(" ")));
-
-			odtEditor   = command;
-			odtEditorReset = odtEditor;
-		}
-	}
-	else
-	{
-			odtEditor   = _T("");
-			odtEditorReset = _T("");
-	}
+    if ( filetype1 )
+    {
+        if ( ( command = filetype1->GetOpenCommand( _T( "x.odt" ) ) ) != wxEmptyString )
+        {
+            command = command.Remove( command.find_last_of( _T( " " ) ) );
+
+            odtEditor   = command;
+            odtEditorReset = odtEditor;
+        }
+    }
+    else
+    {
+        odtEditor   = _T( "" );
+        odtEditorReset = _T( "" );
+    }
 #endif
 #ifdef __WXGTK__
-	odtEditor   = _T("libreoffice --writer");
-	odtEditorReset = odtEditor;
+    odtEditor   = _T( "libreoffice --writer" );
+    odtEditorReset = odtEditor;
 #endif
 #ifdef __WXOSX__
 //	wxFileType *filetype1=wxTheMimeTypesManager->GetFileTypeFromExtension(_T("odt"));
-    wxFileType *filetype1=wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("application/vnd.oasis.opendocument.text-template"));
-	
-	wxString command;
-
-	if(filetype1)
-	{
-		if((command = filetype1->GetOpenCommand(_T("x.odt")))!= wxEmptyString)
-		{
-			command = command.Remove(command.find_last_of(_T(" ")));
-			odtEditor   = command;
-			odtEditorReset = odtEditor;
-		}
-	}
+    wxFileType *filetype1=wxTheMimeTypesManager->GetFileTypeFromMimeType( _T( "application/vnd.oasis.opendocument.text-template" ) );
+
+    wxString command;
+
+    if ( filetype1 )
+    {
+        if ( ( command = filetype1->GetOpenCommand( _T( "x.odt" ) ) )!= wxEmptyString )
+        {
+            command = command.Remove( command.find_last_of( _T( " " ) ) );
+            odtEditor   = command;
+            odtEditorReset = odtEditor;
+        }
+    }
 #endif
 
 #ifdef __WXMSW__
 #include <windows.h>
 
-	filetype1=wxTheMimeTypesManager->GetFileTypeFromExtension(_T("RSS"));
+    filetype1=wxTheMimeTypesManager->GetFileTypeFromExtension( _T( "RSS" ) );
 
-	if(filetype1)
-	{
-		command=filetype1->GetOpenCommand(_T(" "));
-		command = command.Remove(command.find_first_of(_T('/'))-1);
-		mailClient = command;
-		mailClientReset = mailClient;
-	}
-	else
-	{
-    OSVERSIONINFO osvi;
-
-    ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
-    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-
-    GetVersionEx(&osvi);
-
-    if((osvi.dwMajorVersion > 5) ||
-       ( (osvi.dwMajorVersion == 5) && (osvi.dwMinorVersion >= 1) ))
-	{
-		mailClient = _T("C:\\Programme\\Outlook Express\\msimn.exe");
-		mailClientReset = mailClient;
-	}
-	else
-	{
-		mailClient = _T("");
-		mailClientReset = _T("");
-	}
-	}
+    if ( filetype1 )
+    {
+        command=filetype1->GetOpenCommand( _T( " " ) );
+        command = command.Remove( command.find_first_of( _T( '/' ) )-1 );
+        mailClient = command;
+        mailClientReset = mailClient;
+    }
+    else
+    {
+        OSVERSIONINFO osvi;
+
+        ZeroMemory( &osvi, sizeof( OSVERSIONINFO ) );
+        osvi.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
+
+        GetVersionEx( &osvi );
+
+        if ( ( osvi.dwMajorVersion > 5 ) ||
+                ( ( osvi.dwMajorVersion == 5 ) && ( osvi.dwMinorVersion >= 1 ) ) )
+        {
+            mailClient = _T( "C:\\Programme\\Outlook Express\\msimn.exe" );
+            mailClientReset = mailClient;
+        }
+        else
+        {
+            mailClient = _T( "" );
+            mailClientReset = _T( "" );
+        }
+    }
 
 #endif
 #ifdef __WXGTK__
-	mailClient = _T("kmail --composer");
-	mailClientReset = mailClient;	
+    mailClient = _T( "kmail --composer" );
+    mailClientReset = mailClient;
 #endif
 #ifdef __WXOSX__
-	mailClient = _T("/Applications/Mail.app ");
-	mailClientReset = mailClient;
+    mailClient = _T( "/Applications/Mail.app " );
+    mailClientReset = mailClient;
 #endif
 
 #ifdef __WXMSW__
-	dataManager = _T("explorer.exe /select,");
-	dataManagerReset = dataManager; 
+    dataManager = _T( "explorer.exe /select," );
+    dataManagerReset = dataManager;
 #endif
 #ifdef __WXGTK__
-	dataManager = _T("dolphin --select");
-	dataManagerReset = dataManager; 
-	
-	htmlEditor = _T("libreoffice");
-	htmlEditorReset = htmlEditor;
+    dataManager = _T( "dolphin --select" );
+    dataManagerReset = dataManager;
+
+    htmlEditor = _T( "libreoffice" );
+    htmlEditorReset = htmlEditor;
 #endif
 #ifdef __WXOSW__
-	dataManager = _T("");
-	dataManagerReset = dataManagerReset; 
+    dataManager = _T( "" );
+    dataManagerReset = dataManagerReset;
 #endif
 
-	stateEvents = 0;
+    stateEvents = 0;
 
-    for(int i = 0; i < 14; i++)
+    for ( int i = 0; i < 14; i++ )
         bSailIsChecked[i] = false;
 }
 
-Options::~Options(void)
+Options::~Options( void )
 {
 }
 
 bool Options::checkStateOfEvents()
 {
-	if(timer || guardChange || courseChange || waypointArrived || everySM)
-		return true;
-	else
-		return false;
+    if ( timer || guardChange || courseChange || waypointArrived || everySM )
+        return true;
+    else
+        return false;
 }
 
 void Options::stopAllEvents()
 {
-	timer           = false;
-	guardChange     = false;
-	courseChange    = false;
-	waypointArrived = false;
-	everySM         = false;
+    timer           = false;
+    guardChange     = false;
+    courseChange    = false;
+    waypointArrived = false;
+    everySM         = false;
 }
 
-void Options::setTimeFormat(int i)
+void Options::setTimeFormat( int i )
 {
-	wxString stimeh = _T("%H:");
-	wxString stimei = _T("%I:");
-	wxString stimem = _T("%M");
-	wxString stimes = _T(":%S");
-	wxString sam    = _T(" %p");
-
-	if(i)
-	{
-		if(timeformat == 0)
-			{ stimeformat = stimeh+stimem; stimeformatw = stimeformat; } 
-		else
-			{ stimeformat = stimei+stimem+sam; stimeformatw = stimeformat; }
-	}
-	else
-	{
-		if(timeformat == 0)
-			{ stimeformat = stimeh+stimem+stimes;  stimeformatw = stimeh+stimem; }
-		else
-			{ stimeformat = stimei+stimem+stimes+sam; stimeformatw = stimei+stimem+sam; }
-	}
+    wxString stimeh = _T( "%H:" );
+    wxString stimei = _T( "%I:" );
+    wxString stimem = _T( "%M" );
+    wxString stimes = _T( ":%S" );
+    wxString sam    = _T( " %p" );
+
+    if ( i )
+    {
+        if ( timeformat == 0 )
+        {
+            stimeformat = stimeh+stimem;
+            stimeformatw = stimeformat;
+        }
+        else
+        {
+            stimeformat = stimei+stimem+sam;
+            stimeformatw = stimeformat;
+        }
+    }
+    else
+    {
+        if ( timeformat == 0 )
+        {
+            stimeformat = stimeh+stimem+stimes;
+            stimeformatw = stimeh+stimem;
+        }
+        else
+        {
+            stimeformat = stimei+stimem+stimes+sam;
+            stimeformatw = stimei+stimem+sam;
+        }
+    }
 }
 
 void Options::setOptionsTimeFormat()
 {
-	wxDateTime sample = wxDateTime::Now();
-	wxString am,pm;
-	sample.GetAmPmStrings(&am,&pm);
-
-	if(am.IsEmpty())
-	{
-		timeformat = 0;
-		hourFormat = true;
-	}
-	else
-	{
-		//timeformat = 1;
-		hourFormat = false;
-	}
+    wxDateTime sample = wxDateTime::Now();
+    wxString am,pm;
+    sample.GetAmPmStrings( &am,&pm );
+
+    if ( am.IsEmpty() )
+    {
+        timeformat = 0;
+        hourFormat = true;
+    }
+    else
+    {
+        //timeformat = 1;
+        hourFormat = false;
+    }
 }
 
 void Options::setDateFormat()
-{	
-	LogbookDialog::setDatePattern();
+{
+    LogbookDialog::setDatePattern();
 
-	wxArrayString sadate;
-	sadate.Add(_T("%m"));
-	sadate.Add(_T("%d"));
-	sadate.Add(_T("%Y"));
-
-	wxArrayString spattern;
-	spattern.Add(_T("mm"));
-	spattern.Add(_T("dd"));
-	spattern.Add(_T("yyyy"));
-
-	wxArrayInt ar;
-
-	if(dateformat == 0)
-	{
-		wxStringTokenizer tkz(LogbookDialog::datePattern,LogbookDialog::dateSeparator);
-
-		wxString tmp = tkz.GetNextToken();
-		if(tmp.Contains(_T("m")))
-			{ sdateformat = sadate[0] + dateseparatorlocale; ar.Add(0); }
-		else if(tmp.Contains(_T("d")))
-			{ sdateformat = sadate[1] + dateseparatorlocale; ar.Add(1); }
-		else if(tmp.Contains(_T("y")))
-			{ sdateformat = sadate[2] + dateseparatorlocale; ar.Add(2); }
-
-		tmp = tkz.GetNextToken();
-		if(tmp.Contains(_T("m")))
-			{ sdateformat += sadate[0] + dateseparatorlocale; ar.Add(0); }
-		else if(tmp.Contains(_T("d")))
-			{ sdateformat += sadate[1] + dateseparatorlocale; ar.Add(1); }
-		else if(tmp.Contains(_T("y")))
-			{ sdateformat += sadate[2] + dateseparatorlocale; ar.Add(2); }
-
-		tmp = tkz.GetNextToken();
-		if(tmp.Contains(_T("m")))
-			{ sdateformat += sadate[0]; ar.Add(0); }
-		else if(tmp.Contains(_T("d")))
-			{ sdateformat += sadate[1]; ar.Add(1); }
-		else if(tmp.Contains(_T("y")))
-			{ sdateformat += sadate[2]; ar.Add(2); }
-
-		wxString sep = dateseparatorlocale;
-		LogbookDialog::datePattern = spattern[ar[0]]+sep+spattern[ar[1]]+sep+spattern[ar[2]];
-	}
-	else
-	{
-		wxString sep = dateseparatorindiv;
-		sdateformat = sadate[date1]+sep+sadate[date2]+sep+sadate[date3];
-		LogbookDialog::datePattern = spattern[date1]+sep+spattern[date2]+sep+spattern[date3];
-	}
+    wxArrayString sadate;
+    sadate.Add( _T( "%m" ) );
+    sadate.Add( _T( "%d" ) );
+    sadate.Add( _T( "%Y" ) );
+
+    wxArrayString spattern;
+    spattern.Add( _T( "mm" ) );
+    spattern.Add( _T( "dd" ) );
+    spattern.Add( _T( "yyyy" ) );
+
+    wxArrayInt ar;
+
+    if ( dateformat == 0 )
+    {
+        wxStringTokenizer tkz( LogbookDialog::datePattern,LogbookDialog::dateSeparator );
+
+        wxString tmp = tkz.GetNextToken();
+        if ( tmp.Contains( _T( "m" ) ) )
+        {
+            sdateformat = sadate[0] + dateseparatorlocale;
+            ar.Add( 0 );
+        }
+        else if ( tmp.Contains( _T( "d" ) ) )
+        {
+            sdateformat = sadate[1] + dateseparatorlocale;
+            ar.Add( 1 );
+        }
+        else if ( tmp.Contains( _T( "y" ) ) )
+        {
+            sdateformat = sadate[2] + dateseparatorlocale;
+            ar.Add( 2 );
+        }
+
+        tmp = tkz.GetNextToken();
+        if ( tmp.Contains( _T( "m" ) ) )
+        {
+            sdateformat += sadate[0] + dateseparatorlocale;
+            ar.Add( 0 );
+        }
+        else if ( tmp.Contains( _T( "d" ) ) )
+        {
+            sdateformat += sadate[1] + dateseparatorlocale;
+            ar.Add( 1 );
+        }
+        else if ( tmp.Contains( _T( "y" ) ) )
+        {
+            sdateformat += sadate[2] + dateseparatorlocale;
+            ar.Add( 2 );
+        }
+
+        tmp = tkz.GetNextToken();
+        if ( tmp.Contains( _T( "m" ) ) )
+        {
+            sdateformat += sadate[0];
+            ar.Add( 0 );
+        }
+        else if ( tmp.Contains( _T( "d" ) ) )
+        {
+            sdateformat += sadate[1];
+            ar.Add( 1 );
+        }
+        else if ( tmp.Contains( _T( "y" ) ) )
+        {
+            sdateformat += sadate[2];
+            ar.Add( 2 );
+        }
+
+        wxString sep = dateseparatorlocale;
+        LogbookDialog::datePattern = spattern[ar[0]]+sep+spattern[ar[1]]+sep+spattern[ar[2]];
+    }
+    else
+    {
+        wxString sep = dateseparatorindiv;
+        sdateformat = sadate[date1]+sep+sadate[date2]+sep+sadate[date3];
+        LogbookDialog::datePattern = spattern[date1]+sep+spattern[date2]+sep+spattern[date3];
+    }
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/Options.h opencpn-plugin-logbookkonni-1.2024/src/Options.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/Options.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/Options.h	2016-02-25 13:06:29.000000000 +0000
@@ -4,34 +4,34 @@
 #include "wx/wxprec.h"
 
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
-#include <wx/dynarray.h> 
+#include <wx/dynarray.h>
 
-WX_DEFINE_ARRAY_INT(int, ArrayOfGridColWidth);
+WX_DEFINE_ARRAY_INT( int, ArrayOfGridColWidth );
 
 class Options
 {
 public:
-	Options(void);
-	~Options(void);
+    Options( void );
+    ~Options( void );
 
-	bool checkStateOfEvents();
-	void stopAllEvents();
-	void setTimeFormat(int i);
-	void setOptionsTimeFormat();
-	void setDateFormat();
-
-	// Global Options
-	bool		firstTime;
-	int			dlgWidth;
-	int			dlgHeight;
-	bool		popup;
-	bool		hourFormat;
-	bool		statusbarGlobal;
+    bool checkStateOfEvents();
+    void stopAllEvents();
+    void setTimeFormat( int i );
+    void setOptionsTimeFormat();
+    void setDateFormat();
+
+    // Global Options
+    bool		firstTime;
+    int			dlgWidth;
+    int			dlgHeight;
+    bool		popup;
+    bool		hourFormat;
+    bool		statusbarGlobal;
     bool		layoutShow;
-	bool		statusbarWatch;
+    bool		statusbarWatch;
     int			engines;
     bool		toggleEngine1;
     bool		toggleEngine2;
@@ -44,89 +44,91 @@
     bool		engineMessageRunning;
     bool		engineAllwaysSailsDown;
     bool        statusbar;
+    bool		windspeeds;
+    bool        overviewlines;
 
-	wxString    layoutPrefix[7];
+    wxString    layoutPrefix[7];
     bool		filterLayout[7];
     bool		noGPS;
-	bool		colouredMaintenance;
-	bool		guardChange;
-	wxString	guardChangeText;
-	bool		waypointArrived;
-	wxString	waypointText;
-	bool		courseChange;
-	wxString	courseChangeDegrees;
-	double		dCourseChangeDegrees;
-	wxString	courseTextAfterMinutes;
-	wxString    courseChangeText;
-	bool		everySM;
-	wxString	everySMAmount;
-	double		dEverySM;
-	wxString    everySMText;
-
-	bool		traditional;
-	bool		modern;
-	bool		showToolTips;
-
-	// Timer 
-	bool		timer;
-	int         timerType;
-	wxString	thour;
-	wxString	tmin;
-	wxString	tsec;
-	wxString	ttext;
-	long		timerSec;
-	
-	// Grid Navigation
-	wxString	Deg;
-	wxString	Min;
-	wxString	Sec;
-
-	wxString	distance;
-	wxString	speed;
-
-	wxString	meter;
-	wxString	feet;
-	wxString	fathom;
-
-	// Grid Weather
-	wxString	baro;
-	wxString    temperature;
-	wxString	windkts;
-	wxString	windmeter;
-	wxString	windkmh;
-
-	// Grid MotorSails
-	wxString	vol;
-	wxString	motorh;
+    bool		colouredMaintenance;
+    bool		guardChange;
+    wxString	guardChangeText;
+    bool		waypointArrived;
+    wxString	waypointText;
+    bool		courseChange;
+    wxString	courseChangeDegrees;
+    double		dCourseChangeDegrees;
+    wxString	courseTextAfterMinutes;
+    wxString    courseChangeText;
+    bool		everySM;
+    wxString	everySMAmount;
+    double		dEverySM;
+    wxString    everySMText;
+
+    bool		traditional;
+    bool		modern;
+    bool		showToolTips;
+
+    // Timer
+    bool		timer;
+    int         timerType;
+    wxString	thour;
+    wxString	tmin;
+    wxString	tsec;
+    wxString	ttext;
+    long		timerSec;
+
+    // Grid Navigation
+    wxString	Deg;
+    wxString	Min;
+    wxString	Sec;
+
+    wxString	distance;
+    wxString	speed;
+
+    wxString	meter;
+    wxString	feet;
+    wxString	fathom;
+
+    // Grid Weather
+    wxString	baro;
+    wxString    temperature;
+    wxString	windkts;
+    wxString	windmeter;
+    wxString	windkmh;
+
+    // Grid MotorSails
+    wxString	vol;
+    wxString	motorh;
     wxString    engine;
     wxString	shaft;
     wxString	rpm;
 
-	//Maintenance
-	wxString	days;
-	wxString	weeks;
-	wxString	month;
-
-	//Paths 
-	wxString    htmlEditor;
-	wxString   	odtEditor;
-	wxString    mailClient;
-	wxString   	dataManager;
-
-	wxString    htmlEditorReset;
-	wxString    odtEditorReset;
-	wxString    mailClientReset;
-	wxString    dataManagerReset;
-
-	//Capacity
-	wxString	fuelTank;
-	wxString	waterTank;
-	wxString	watermaker;
-	wxString	bank1;
-	wxString    bank2;
-	wxString    ampere;
-	wxString    ampereh;
-    
+    //Maintenance
+    wxString	days;
+    wxString	weeks;
+    wxString	month;
+
+    //Paths
+    wxString    htmlEditor;
+    wxString   	odtEditor;
+    wxString    mailClient;
+    wxString   	dataManager;
+
+    wxString    htmlEditorReset;
+    wxString    odtEditorReset;
+    wxString    mailClientReset;
+    wxString    dataManagerReset;
+
+    //Capacity
+    wxString	fuelTank;
+    wxString	waterTank;
+    wxString	watermaker;
+    wxString	bank1;
+    wxString    bank2;
+    wxString    ampere;
+    wxString    ampereh;
+
     // KML
     int			kmlRoute;
     int			kmlTrack;
@@ -162,58 +164,58 @@
     int				rowGap;
     int				colGap;
 
-	//wxChoice
-	int		showDepth;
-	int		showWaveSwell;
-	int		showWindSpeed;
-	int		showWindDir;
-	int		showWindHeading;
-	int		showHeading;
-	
-	bool 		navHTML;
-	bool		crewHTML;
-	bool		boatHTML;
-	bool		overviewHTML;
-	bool		serviceHTML;
-	bool		repairsHTML;
-	bool		buypartsHTML;
-	int         overviewAll;
-
-	int		navGridLayoutChoice;
-	int		crewGridLayoutChoice;
-	int		boatGridLayoutChoice;
-	int		overviewGridLayoutChoice;
-	int		serviceGridLayoutChoice;
-	int		repairsGridLayoutChoice;
-	int		buypartsGridLayoutChoice;
-	
-	int		navGridLayoutChoiceODT;
-	int		crewGridLayoutChoiceODT;
-	int		boatGridLayoutChoiceODT;
-	int		overviewGridLayoutChoiceODT;
-	int		serviceGridLayoutChoiceODT;
-	int		repairsGridLayoutChoiceODT;
-	int		buypartsGridLayoutChoiceODT;	
-
-	bool	local;
-	bool	UTC;
-	bool	gpsAuto;
-	int		tzIndicator;
-	int		tzHour;
-
-	int 	  timeformat;
-	bool	  noseconds;
-	int       dateformat;
-	wxString  dateseparatorlocale;
-	wxString  dateseparatorindiv;
-	wxString  sdateformat;
-	wxString  stimeformat;
-	wxString  stimeformatw;
-	int		  date1;
-	int       date2;
-	int       date3;
+    //wxChoice
+    int		showDepth;
+    int		showWaveSwell;
+    int		showWindSpeed;
+    int		showWindDir;
+    int		showWindHeading;
+    int		showHeading;
+
+    bool 		navHTML;
+    bool		crewHTML;
+    bool		boatHTML;
+    bool		overviewHTML;
+    bool		serviceHTML;
+    bool		repairsHTML;
+    bool		buypartsHTML;
+    int         overviewAll;
+
+    int		navGridLayoutChoice;
+    int		crewGridLayoutChoice;
+    int		boatGridLayoutChoice;
+    int		overviewGridLayoutChoice;
+    int		serviceGridLayoutChoice;
+    int		repairsGridLayoutChoice;
+    int		buypartsGridLayoutChoice;
+
+    int		navGridLayoutChoiceODT;
+    int		crewGridLayoutChoiceODT;
+    int		boatGridLayoutChoiceODT;
+    int		overviewGridLayoutChoiceODT;
+    int		serviceGridLayoutChoiceODT;
+    int		repairsGridLayoutChoiceODT;
+    int		buypartsGridLayoutChoiceODT;
+
+    bool	local;
+    bool	UTC;
+    bool	gpsAuto;
+    int		tzIndicator;
+    int		tzHour;
+
+    int 	  timeformat;
+    bool	  noseconds;
+    int       dateformat;
+    wxString  dateseparatorlocale;
+    wxString  dateseparatorindiv;
+    wxString  sdateformat;
+    wxString  stimeformat;
+    wxString  stimeformatw;
+    int		  date1;
+    int       date2;
+    int       date3;
 
-	ArrayOfGridColWidth		NavColWidth;
+    ArrayOfGridColWidth		NavColWidth;
     ArrayOfGridColWidth		WeatherColWidth;
     ArrayOfGridColWidth		MotorColWidth;
     ArrayOfGridColWidth		CrewColWidth;
@@ -224,6 +226,6 @@
     ArrayOfGridColWidth		RepairsColWidth;
     ArrayOfGridColWidth		BuyPartsColWidth;
 
-	int stateEvents;
+    int stateEvents;
 };
 #endif
\ No newline at end of file
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/OverView.cpp opencpn-plugin-logbookkonni-1.2024/src/OverView.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/OverView.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/OverView.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -10,1238 +10,1375 @@
 #include "Logbook.h"
 
 #include <wx/filename.h>
-#include <wx/txtstrm.h> 
-#include <wx/zipstrm.h> 
+#include <wx/txtstrm.h>
+#include <wx/zipstrm.h>
 #include <wx/generic/gridctrl.h>
 #include <wx/dir.h>
 
 #include <map>
 using namespace std;
-OverView::OverView(LogbookDialog* d, wxString data, wxString lay, wxString layoutODT)
-	: Export(d)
+OverView::OverView( LogbookDialog* d, wxString data, wxString lay, wxString layoutODT )
+    : Export( d )
 {
-	parent = d;
+    parent = d;
 
-	ODTLayout_locn = layoutODT;
-	HTMLLayout_locn = lay;
-	data_locn = data;
-	data_file = data + _T("overview.html");
-	grid = d->m_gridOverview;
-	opt = d->logbookPlugIn->opt;
-	selectedRow = 0;
-	logbook = d->logbook;
-	collection t_coll;
-	setLayoutLocation();
-	loadAllLogbooks();
+    ODTLayout_locn = layoutODT;
+    HTMLLayout_locn = lay;
+    data_locn = data;
+    data_file = data + _T( "overview.html" );
+    grid = d->m_gridOverview;
+    opt = d->logbookPlugIn->opt;
+    selectedRow = 0;
+    logbook = d->logbook;
+    collection t_coll;
+    setLayoutLocation();
+    loadAllLogbooks();
 }
 
-OverView::~OverView(void)
+OverView::~OverView( void )
 {
 }
 
 void OverView::refresh()
 {
-	grid->DeleteRows(0,grid->GetNumberRows());
-	row = -1;
-	if(parent->m_radioBtnActuellLogbook->GetValue())
-		actuellLogbook();
-	else if(parent->m_radioBtnAllLogbooks->GetValue())
-		allLogbooks();
-	else
-		if(parent->m_radioBtnSelectLogbook->GetValue())
-			if(!selectedLogbook.IsEmpty())
-				loadLogbookData(selectedLogbook,false);
+    grid->DeleteRows( 0,grid->GetNumberRows() );
+    row = -1;
+    if ( parent->m_radioBtnActualLogbook->GetValue() )
+        actualLogbook();
+    else if ( parent->m_radioBtnAllLogbooks->GetValue() )
+        allLogbooks();
+    else if ( parent->m_radioBtnSelectLogbook->GetValue() )
+        if ( !selectedLogbook.IsEmpty() )
+            loadLogbookData( selectedLogbook,false );
 }
 
-void OverView::viewODT(wxString path,wxString layout,int mode)
+void OverView::viewODT( wxString path,wxString layout,int mode )
 {
-	wxString fn;
+    wxString fn;
 
-	if(opt->filterLayout[LogbookDialog::OVERVIEW])
-		layout.Prepend(opt->layoutPrefix[LogbookDialog::OVERVIEW]);
+    if ( opt->filterLayout[LogbookDialog::OVERVIEW] )
+        layout.Prepend( opt->layoutPrefix[LogbookDialog::OVERVIEW] );
 
-	fn = toODT(path, layout, mode);
+    fn = toODT( path, layout, mode );
 
-	if(layout != _T(""))
-	{
-		fn.Replace(_T("txt"),_T("odt"));
-		parent->startApplication(fn,_T(".odt"));
-	}
+    if ( layout != _T( "" ) )
+    {
+        fn.Replace( _T( "txt" ),_T( "odt" ) );
+        parent->startApplication( fn,_T( ".odt" ) );
+    }
 }
 
-void OverView::viewHTML(wxString path,wxString layout,int mode)
+void OverView::viewHTML( wxString path,wxString layout,int mode )
 {
-	wxString fn;
+    wxString fn;
 
-	if(opt->filterLayout[LogbookDialog::OVERVIEW])
-		layout.Prepend(opt->layoutPrefix[LogbookDialog::OVERVIEW]);
+    if ( opt->filterLayout[LogbookDialog::OVERVIEW] )
+        layout.Prepend( opt->layoutPrefix[LogbookDialog::OVERVIEW] );
 
-	fn = toHTML(path, layout, mode);
+    fn = toHTML( path, layout, mode );
 
-	if(layout != _T(""))
-	{
-		fn.Replace(_T("txt"),_T("html"));
-		parent->startBrowser(fn);
-	}
+    if ( layout != _T( "" ) )
+    {
+        fn.Replace( _T( "txt" ),_T( "html" ) );
+        parent->startBrowser( fn );
+    }
 }
 
-wxString OverView::toODT(wxString path,wxString layout,int mode)
+wxString OverView::toODT( wxString path,wxString layout,int mode )
 {
-	wxString top;
-	wxString header;
-	wxString middle;
-	wxString bottom;
-	wxString tempPath = data_file;
+    wxString top;
+    wxString header;
+    wxString middle;
+    wxString bottom;
+    wxString tempPath = data_file;
 
-	wxString odt = readLayoutODT(layout_locn,layout);
-	if(!cutInPartsODT( odt, &top, &header,	&middle, &bottom))
-		return _T("");
+    wxString odt = readLayoutODT( layout_locn,layout );
+    if ( !cutInPartsODT( odt, &top, &header,	&middle, &bottom ) )
+        return _T( "" );
 
-	if(mode == 1)
-		tempPath.Replace(_T("html"),_T("txt"));
-	wxTextFile* text = setFiles(path, &tempPath, mode);
-	writeToODT(text,parent->m_gridOverview,tempPath,layout_locn+layout+_T(".odt"), top,header,middle,bottom,mode);
+    if ( mode == 1 )
+        tempPath.Replace( _T( "html" ),_T( "txt" ) );
+    wxTextFile* text = setFiles( path, &tempPath, mode );
+    writeToODT( text,parent->m_gridOverview,tempPath,layout_locn+layout+_T( ".odt" ), top,header,middle,bottom,mode );
 
-	return tempPath;
+    return tempPath;
 }
 
-wxString OverView::toHTML(wxString path,wxString layout,int mode)
+wxString OverView::toHTML( wxString path,wxString layout,int mode )
 {
-	wxString top;
-	wxString header;
-	wxString middle;
-	wxString bottom;
-	wxString tempPath = data_file;
+    wxString top;
+    wxString header;
+    wxString middle;
+    wxString bottom;
+    wxString tempPath = data_file;
 
-	wxString html = readLayoutHTML(layout_locn,layout);
-	if(!cutInPartsHTML( html, &top, &header, &middle, &bottom))
-		return _T("");
+    wxString html = readLayoutHTML( layout_locn,layout );
+    if ( !cutInPartsHTML( html, &top, &header, &middle, &bottom ) )
+        return _T( "" );
 
-	wxTextFile* text = setFiles(path, &tempPath, mode);
-	writeToHTML(text,parent->m_gridOverview,tempPath,layout_locn+layout+_T(".html"), top,header,middle,bottom,mode);
+    wxTextFile* text = setFiles( path, &tempPath, mode );
+    writeToHTML( text,parent->m_gridOverview,tempPath,layout_locn+layout+_T( ".html" ), top,header,middle,bottom,mode );
 
-	return tempPath;
+    return tempPath;
 }
 
 void OverView::loadAllLogbooks()
 {
-	wxArrayString		files;
+    wxArrayString		files;
 
-	logbooks.clear();
-	int i = wxDir::GetAllFiles(data_locn,&files,_T("*logbook*.txt"),wxDIR_FILES);
+    logbooks.clear();
+    int i = wxDir::GetAllFiles( data_locn,&files,_T( "*logbook*.txt" ),wxDIR_FILES );
 
-	for(int f = 0; f < i; f++)
-	{
-		//wxFileName name(files.Item(f));
-		//if(name.GetName().Contains(_T("logbook")))
-		logbooks.Add(files[f]);
-	}
+    for ( int f = 0; f < i; f++ )
+    {
+        //wxFileName name(files.Item(f));
+        //if(name.GetName().Contains(_T("logbook")))
+        logbooks.Add( files[f] );
+    }
 }
 
 void OverView::selectLogbook()
 {
-	wxString path(*parent->pHome_Locn);
-	path = path + wxFileName::GetPathSeparator() + _T("data");
+    SelectLogbook selLogbook( parent,data_locn );
 
-	SelectLogbook selLogbook(parent,path);
+    if ( selLogbook.ShowModal() == wxID_CANCEL )
+        return;
 
-	if(selLogbook.ShowModal() == wxID_CANCEL)
-		return;
+    if ( selLogbook.selRow == -1 ) return;
 
-	if(selLogbook.selRow == -1) return;
-
-	parent->m_radioBtnSelectLogbook->SetValue(true);
-	grid->DeleteRows(0,grid->GetNumberRows());
-	row = -1;
-
-	selectedLogbook = selLogbook.files[selLogbook.selRow];
-	showAllLogbooks = false;
-	loadLogbookData(selectedLogbook,false);
-	opt->overviewAll = 2;
-}
-
-void OverView::actuellLogbook()
-{
-	showAllLogbooks = false;
-	clearGrid();
-	for(unsigned int i=0; i < logbooks.size(); i++)
-		if(!logbooks[i].Contains(_T("until")))
-		{
-			loadLogbookData(logbooks[i],false);
-			break;
-		}
-		opt->overviewAll = 0;
+    parent->m_radioBtnSelectLogbook->SetValue( true );
+    grid->DeleteRows( 0,grid->GetNumberRows() );
+    row = -1;
+
+    selectedLogbook = selLogbook.files[selLogbook.selRow];
+    showAllLogbooks = false;
+    loadLogbookData( selectedLogbook,false );
+    opt->overviewAll = 2;
+}
+
+void OverView::actualLogbook()
+{
+    showAllLogbooks = false;
+    clearGrid();
+    for ( unsigned int i=0; i < logbooks.size(); i++ )
+        if ( !logbooks[i].Contains( _T( "until" ) ) )
+        {
+            loadLogbookData( logbooks[i],false );
+            break;
+        }
+    opt->overviewAll = 0;
 }
 
 void OverView::allLogbooks()
 {
-	showAllLogbooks = true;
-	loadAllLogbooks();
-	clearGrid();
-	for(unsigned int i = 0; i < logbooks.Count(); i++)
-	{
-		if(i % 2)
-			loadLogbookData(logbooks[i],true);
-		else
-			loadLogbookData(logbooks[i],false);
-	}
-	opt->overviewAll = 1;
+    showAllLogbooks = true;
+    loadAllLogbooks();
+    clearGrid();
+    for ( unsigned int i = 0; i < logbooks.Count(); i++ )
+    {
+        if ( i % 2 )
+            loadLogbookData( logbooks[i],true );
+        else
+            loadLogbookData( logbooks[i],false );
+    }
+    opt->overviewAll = 1;
 }
 
 void OverView::clearGrid()
 {
-	if(row != -1)
-		grid->DeleteRows(0,grid->GetNumberRows());
-	row = -1;
-}
-
-void OverView::loadLogbookData(wxString logbook, bool colour)
-{
-	wxString t,s;
-	bool test = true;
-	//	bool write = true;
-	double x = 0;
-	wxStringTokenizer tkz1;
-	wxTimeSpan span;
-	collection::iterator it;
-
-	resetValues();
-
-	wxFileInputStream input( logbook );
-	wxTextInputStream* stream = new wxTextInputStream (input);
-	wxString path = logbook;
-	wxFileName fn(logbook);
-	logbook = fn.GetName();
-	if(logbook == _T("logbook"))
-		logbook = _("Active Logbook");
-	else
-	{
-		wxDateTime dt = parent->getDateTo(logbook);
-		logbook = _("Logbook until ")+dt.FormatDate();
-	}
-
-	int lastrow = 0;
-	oneLogbookTotalReset();
-
-	wxString route = _T("xxx");
-	int rowNewLogbook = -1;
-
-	stream->ReadLine(); // skip line with #1.2#
-	int month = 0,day = 0,year = 0,hour = 0,min = 0,sec = 0;
-
-	while( (!(t = stream->ReadLine()).IsEmpty()))
-	{
-		sign = wxEmptyString;
-		rowNewLogbook++;
-		wxStringTokenizer tkz(t, _T("\t"),wxTOKEN_RET_EMPTY );
-		int c = 0;
-		while ( tkz.HasMoreTokens() )
-		{
-			s = parent->restoreDangerChar(tkz.GetNextToken());
-			s.RemoveLast();
-			s.Replace(_T(","),_T("."));
-
-			switch(c)
-			{
-			case ROUTE:				if(route != s)
-									{
-										//write = true;
-										resetValues();
-										grid->AppendRows();
-										route = s;
-										row++;
-										lastrow = row;
-										test = true;
-										grid->SetCellValue(row,FROUTE,s);
-									}
-									else ;
-									//write = false;
-
-									break;
-			case DATEM:			
-				if(s.IsEmpty())
-					month = -1;
-				else
-					month = wxAtoi(s);
-				break;
-			case DATED:			
-				if(s.IsEmpty())
-					day = -1;
-				else
-					day = wxAtoi(s);
-				break;
-			case DATEY:			{
-				year = wxAtoi(s);
-				if(day == -1 || month == -1) continue;
-
-				wxDateTime tmp;
-				tmp.Set(day,(wxDateTime::Month) month,year);
-				s = tmp.Format(opt->sdateformat);
-
-				if(test)
-				{
-					startdate = s;
-					enddate = s;
-					if(rowNewLogbook == 0)
-						oneLogbookTotal.logbookStart = oneLogbookTotal.logbookEnd = s;
-				}
-				else
-					enddate = s;
-
-				if(etmaldate != s)
-				{
-					etmaldate = s;
-					etmalcount++;
-					bestetmaltemp = 0;
-				}
-
-				date = s;
-								}
-								break;
-			case TIMEH:			if(s.IsEmpty()) 
-									hour = -1;
-								else
-									hour = wxAtoi(s);
-				break;
-			case TIMEM:			if(s.IsEmpty())
-									min = -1;
-								else
-									min = wxAtoi(s);
-				break;
-			case TIMES:			{
-				if(hour == -1 || min == -1) continue;
-				sec = wxAtoi(s);
-				wxDateTime tmp;
-				tmp.Set(hour,min,sec);
-				s = tmp.Format(opt->stimeformat);
-
-				if(test)
-				{
-					starttime = s;
-					endtime = s;
-					if(rowNewLogbook == 0)
-						oneLogbookTotal.logbookTimeStart = oneLogbookTotal.logbookTimeEnd = s;
-				}
-				else
-					endtime = s;
-								}
-								break;
-			case STATUS:
-				sign = s;
-				break;
-			case WATCH:	
-				break;
-			case DISTANCE:			
-				if(!s.IsEmpty() && sign != 'S') break;
-				s.ToDouble(&x);
-
-				distance += x;
-				etmal = distance/etmalcount;
-
-				if(date == etmaldate)
-				{
-					bestetmaltemp += x;
-					if(bestetmaltemp > bestetmal)
-						bestetmal = bestetmaltemp;
-					if(bestetmaltemp > oneLogbookTotal.bestetmal)
-						oneLogbookTotal.bestetmal = bestetmaltemp;
-				}
-				oneLogbookTotal.distance += x;
-				//allLogbooksTotal.distance += x;
-				break;
-			case DISTANCETOTAL:		
-			case POSITION:			
-			case COG:				
-			case HEADING:	
-				break;
-			case SOG:				if(!s.IsEmpty() && sign == _T("S"))
-									{
-										s.ToDouble(&x);
-										speed += x;	oneLogbookTotal.speed += x;
-										speedcount++; oneLogbookTotal.speedcount++;
-										if(x > speedpeak) speedpeak = x;
-										if(x > oneLogbookTotal.speedpeak) oneLogbookTotal.speedpeak = x;
-									}
-									break;
-			case STW:				if(!s.IsEmpty() && sign == _T("S"))
-									{
-										s.ToDouble(&x);
-										speedSTW += x; oneLogbookTotal.speedSTW += x;
-										speedcountSTW++; oneLogbookTotal.speedcountSTW++;
-										if(x > speedpeakSTW) speedpeakSTW = x;
-										if(x > oneLogbookTotal.speedpeakSTW) oneLogbookTotal.speedpeakSTW = x;
-									}
-									break;
-			case DEPTH:				
-			case REMARKS:			
-			case BAROMETER:
-			case HYDRO:
-			case TEMPAIR:
-			case TEMPWATER:
-				break;
-			case WIND:				if(!s.IsEmpty())
-									{
-										s.ToDouble(&x);
-										winddir += x; oneLogbookTotal.winddir += x;
-										windcount++; oneLogbookTotal.windcount++;
-									}
-									break;
-			case WINDFORCE:			if(!s.IsEmpty())
-									{
-										s.ToDouble(&x);
-										wind += x; oneLogbookTotal.wind += x;
-										if(x > windpeak) windpeak = x; 
-										if(x > oneLogbookTotal.windpeak) oneLogbookTotal.windpeak = x;
-									}
-									break;
-			case CURRENT:			if(!s.IsEmpty())
-									{
-										s.ToDouble(&x);
-										currentdir += x; oneLogbookTotal.currentdir += x;
-										currentcount++; oneLogbookTotal.currentcount++;
-									}
-									break;
-			case CURRENTFORCE:		if(!s.IsEmpty())
-									{
-										s.ToDouble(&x);
-										current += x; oneLogbookTotal.current += x;
-										if(x > currentpeak) currentpeak = x; 
-										if(x > oneLogbookTotal.currentpeak) oneLogbookTotal.currentpeak = x;
-									}
-									break;
-			case WAVE:				if(!s.IsEmpty())
-									{
-										s.ToDouble(&x);
-										wave += x; oneLogbookTotal.wave += x;
-										wavecount++; oneLogbookTotal.wavecount++;
-										if(x > wavepeak) wavepeak = x; 
-										if(x > oneLogbookTotal.wavepeak) oneLogbookTotal.wavepeak = x;
-									}
-									break;
-			case SWELL:				if(!s.IsEmpty())
-									{
-										s.ToDouble(&x);
-										swell += x; oneLogbookTotal.swell += x;
-										swellcount++; oneLogbookTotal.swellcount++;
-										if(x > swellpeak) swellpeak = x; 
-										if(x > oneLogbookTotal.swellpeak) oneLogbookTotal.swellpeak = x;
-									}
-									break;
-			case WEATHER:			
-			case CLOUDS:			
-			case VISIBILITY:
-				break;
-			case ENGINE1:			if(s.IsEmpty()) continue;
-
-				tkz1.SetString(s, _T(":"),wxTOKEN_RET_EMPTY );
-				long hours, minutes;
-				tkz1.GetNextToken().ToLong(&hours);
-				tkz1.GetNextToken().ToLong(&minutes);
-				enginehours += hours; enginemin += minutes;
-				if(enginemin >= 60) { enginehours++; enginemin -= 60; }
-				oneLogbookTotal.enginehours += hours; oneLogbookTotal.enginemin += minutes;
-				if(oneLogbookTotal.enginemin >= 60) { oneLogbookTotal.enginehours++; oneLogbookTotal.enginemin -= 60; }
-				break;
-			case ENGINE2:			if(s.IsEmpty()) continue;
-
-									{	tkz1.SetString(s, _T(":"),wxTOKEN_RET_EMPTY );
-									long hours, minutes;
-									tkz1.GetNextToken().ToLong(&hours);
-									tkz1.GetNextToken().ToLong(&minutes);
-									enginehours2 += hours; enginemin2 += minutes;
-									if(enginemin2 >= 60) { enginehours2++; enginemin2 -= 60; }
-									oneLogbookTotal.enginehours2 += hours; oneLogbookTotal.enginemin2 += minutes;
-									if(oneLogbookTotal.enginemin2 >= 60) { oneLogbookTotal.enginehours2++; oneLogbookTotal.enginemin2 -= 60; }
-									}					
-									break;
-			case GENERATOR:			if(s.IsEmpty()) continue;
-
-									{	tkz1.SetString(s, _T(":"),wxTOKEN_RET_EMPTY );
-									long hours, minutes;
-									tkz1.GetNextToken().ToLong(&hours);
-									tkz1.GetNextToken().ToLong(&minutes);
-									generatorhours += hours; generatormin += minutes;
-									if(generatormin >= 60) { generatorhours++; generatormin -= 60; }
-									oneLogbookTotal.generatorhours += hours; oneLogbookTotal.generatormin += minutes;
-									if(oneLogbookTotal.generatormin >= 60) { oneLogbookTotal.generatorhours++; oneLogbookTotal.generatormin -= 60; }
-									}					
-									break;
-			case WATERM:			if(s.IsEmpty()) continue;
-
-									{	tkz1.SetString(s, _T(":"),wxTOKEN_RET_EMPTY );
-									long hours, minutes;
-									tkz1.GetNextToken().ToLong(&hours);
-									tkz1.GetNextToken().ToLong(&minutes);
-									watermhours += hours; watermmin += minutes;
-									if(watermmin >= 60) { watermhours++; watermmin -= 60; }
-									oneLogbookTotal.watermhours += hours; oneLogbookTotal.watermmin += minutes;
-									if(oneLogbookTotal.watermmin >= 60) { oneLogbookTotal.watermhours++; oneLogbookTotal.watermmin -= 60; }
-									}					
-									break;
-			case ENGINE1T:		
-				break;
-			case FUEL:				if(s.IsEmpty()) continue;
-
-				if(s.GetChar(0) == '+') break;									
-				s.ToDouble(&x);
-				if(s.GetChar(0) != '-') s.Prepend(_T("-"));  // version 0.910 has no minus sign
-
-				//	if(x < 0)
-				//	{
-				fuel += x;
-				oneLogbookTotal.fuel += x;
-				//	}
-				break;
-			case WATERMO:			if(s.IsEmpty()) continue;
-				s.ToDouble(&x);
-				//	if(x < 0)
-				//	{
-				watermo += x;
-				oneLogbookTotal.watermo += x;
-				//	}
-				break;
-			case FUELTOTAL:			
-				break;
-			case SAILS:				if(!s.empty())
-									{
-										bool found = false;
-										wxString result;
-										for(it = t_coll.begin(); it != t_coll.end(); ++it)
-										{
-											if( s == it->first)
-											{
-												int a = it->second;
-												it->second = ++a;
-												result += it->first+_T("\n");
-												found = true;
-											}
-										}
-										if(!found)
-										{
-											t_coll.insert(pair(s,1)); 
-											wxString result;
-											for(it = t_coll.begin(); it != t_coll.end(); ++it)
-											{
-												result = it->first;
-											}
-										}
-									}
-									break;
-			case REEF:				
-				break;
-			case WATER:				if(s.IsEmpty()) continue;
-				if(s.GetChar(0) == '+') break;				 // add water used only
-				if(s.GetChar(0) != '-') s.Prepend(_T("-"));  // version 0.910 has no minus sign
-				s.ToDouble(&x);
-
-				x = fabs(x);
-				//	if(x < 0)
-				//	{
-				water += x;
-				oneLogbookTotal.water += x;
-				//	}
-				break;
-			case BANK1:			if(s.IsEmpty()) continue;
-				s.ToDouble(&x);
-				if(x >= 0)
-				{
-					bank1g += x;
-					oneLogbookTotal.bank1g += x;
-				}
-				else
-				{
-					bank1u += fabs(x); 
-					oneLogbookTotal.bank1u += bank1u;
-				}
-				break;
-			case BANK2:			if(s.IsEmpty()) continue;
-				s.ToDouble(&x);
-				if(x >= 0)
-				{
-					bank2g += x;
-					oneLogbookTotal.bank2g += x;
-				}
-				else
-				{
-					bank2u += fabs(x); 
-					oneLogbookTotal.bank2u += bank2u;
-				}
-				break;
-			case WATERTOTAL:		
-				break;
-			case MREMARKS:			
-				break;
-			}
-			c++;
-		}
-		//if(test)
-			writeSumColumn(lastrow, logbook, path, colour);
-		test = false;
-	}
-	if(!showAllLogbooks)
-		writeSumColumnLogbook(oneLogbookTotal,lastrow, logbook, colour);
+    if ( row != -1 )
+        grid->DeleteRows( 0,grid->GetNumberRows() );
+    row = -1;
+}
+
+void OverView::loadLogbookData( wxString logbook, bool colour )
+{
+    wxString t,s,temp;
+    bool test = true;
+    bool overviewflag = false;
+    //	bool write = true;
+    double x = 0;
+    wxStringTokenizer tkz1;
+    wxTimeSpan span;
+    wxDateSpan oneday(0,0,0,1);
+    wxDateTime enddt;
+    
+    collection::iterator it;
+
+    resetValues();
+
+    wxFileInputStream input( logbook );
+    wxTextInputStream* stream = new wxTextInputStream ( input );
+    wxString path = logbook;
+    wxFileName fn( logbook );
+    logbook = fn.GetName();
+    if ( logbook == _T( "logbook" ) )
+        logbook = _( "Active Logbook" );
+    else
+    {
+        wxDateTime dt = parent->getDateTo( logbook );
+        logbook = _( "Logbook until " )+dt.FormatDate();
+    }
+
+    int lastrow = 0;
+    oneLogbookTotalReset();
+
+    wxString route = _T( "xxx" );
+    int rowNewLogbook = -1;
+
+    stream->ReadLine(); // skip line with #1.2#
+    int month = 0,day = 0,year = 0,hour = 0,min = 0,sec = 0;
+
+    while ( ( !( t = stream->ReadLine() ).IsEmpty() ) )
+    {
+        sign = wxEmptyString;
+        rowNewLogbook++;
+        wxStringTokenizer tkz( t, _T( "\t" ),wxTOKEN_RET_EMPTY );
+        int c = 0;
+        while ( tkz.HasMoreTokens() )
+        {
+            s = parent->restoreDangerChar( tkz.GetNextToken() );
+            s.RemoveLast();
+            s.Replace( _T( "," ),_T( "." ) );
+
+            switch ( c )
+            {
+            case ROUTE:
+                if ( route != s )
+                {
+                    //write = true;
+                    resetValues();
+                    grid->AppendRows();
+                    route = s;
+                    row++;
+                    lastrow = row;
+                    test = true;
+                    grid->SetCellValue( row,FROUTE,s );
+                }
+                else ;
+                //write = false;
+
+                break;
+            case DATEM:
+                if ( s.IsEmpty() )
+                    month = -1;
+                else
+                    month = wxAtoi( s );
+                break;
+            case DATED:
+                if ( s.IsEmpty() )
+                    day = -1;
+                else
+                    day = wxAtoi( s );
+                break;
+            case DATEY:
+            {
+                year = wxAtoi( s );
+                if ( day == -1 || month == -1 ) continue;
+
+                wxDateTime tmp;
+                tmp.Set( day,( wxDateTime::Month ) month,year );
+                s = tmp.Format( opt->sdateformat );
+
+                if ( s != startdate && !test && !showAllLogbooks && opt->overviewlines )
+                {
+                    temp = route;
+                    endtime = "00:00";
+                    parent->myParseDate( startdate,enddt );
+                    enddt.Add( oneday );
+                    enddate = enddt.Format(opt->sdateformat);
+                    //write = true;
+                    writeSumColumn( lastrow, logbook, path, colour );
+                    resetValues();
+                    grid->AppendRows();
+                    route = temp;
+                    overviewflag = true;
+                    row++;
+                    lastrow = row;
+                    test = true;
+                    grid->SetCellValue( row,FROUTE,route );
+                }
+
+                if ( test )
+                {
+                    startdate = s;
+                    enddate = s;
+                    if ( rowNewLogbook == 0 )
+                        oneLogbookTotal.logbookStart = oneLogbookTotal.logbookEnd = s;
+                }
+                else
+                    enddate = s;
+
+                if ( etmaldate != s )
+                {
+                    etmaldate = s;
+                    etmalcount++;
+                    bestetmaltemp = 0;
+                }
+
+                date = s;
+            }
+            break;
+            case TIMEH:
+                if ( s.IsEmpty() )
+                    hour = -1;
+                else
+                    hour = wxAtoi( s );
+                break;
+            case TIMEM:
+                if ( s.IsEmpty() )
+                    min = -1;
+                else
+                    min = wxAtoi( s );
+                break;
+            case TIMES:
+            {
+                if ( hour == -1 || min == -1 ) continue;
+                sec = wxAtoi( s );
+                wxDateTime tmp;
+                tmp.Set( hour,min,sec );
+                s = tmp.Format( opt->stimeformat );
+
+                if ( test )
+                {
+                    if ( overviewflag )
+                        starttime = "00:00";
+                    else
+                        starttime = s;
+                    endtime = s;
+                    if ( rowNewLogbook == 0 )
+                        oneLogbookTotal.logbookTimeStart = oneLogbookTotal.logbookTimeEnd = s;
+                }
+                else
+                    endtime = s;
+            }
+            break;
+            case STATUS:
+                sign = s;
+                break;
+            case WATCH:
+                break;
+            case DISTANCE:
+                if ( !s.IsEmpty() && sign != 'S' ) break;
+                s.ToDouble( &x );
+
+                distance += x;
+                etmal = distance/etmalcount;
+
+                if ( date == etmaldate )
+                {
+                    bestetmaltemp += x;
+                    if ( bestetmaltemp > bestetmal )
+                        bestetmal = bestetmaltemp;
+                    if ( bestetmaltemp > oneLogbookTotal.bestetmal )
+                        oneLogbookTotal.bestetmal = bestetmaltemp;
+                }
+                oneLogbookTotal.distance += x;
+                //allLogbooksTotal.distance += x;
+                break;
+            case DISTANCETOTAL:
+            case POSITION:
+            case COG:
+            case HEADING:
+                break;
+            case SOG:
+                if ( !s.IsEmpty() && sign == _T( "S" ) )
+                {
+                    s.ToDouble( &x );
+                    speed += x;
+                    oneLogbookTotal.speed += x;
+                    speedcount++;
+                    oneLogbookTotal.speedcount++;
+                    if ( x > speedpeak ) speedpeak = x;
+                    if ( x > oneLogbookTotal.speedpeak ) oneLogbookTotal.speedpeak = x;
+                }
+                break;
+            case STW:
+                if ( !s.IsEmpty() && sign == _T( "S" ) )
+                {
+                    s.ToDouble( &x );
+                    speedSTW += x;
+                    oneLogbookTotal.speedSTW += x;
+                    speedcountSTW++;
+                    oneLogbookTotal.speedcountSTW++;
+                    if ( x > speedpeakSTW ) speedpeakSTW = x;
+                    if ( x > oneLogbookTotal.speedpeakSTW ) oneLogbookTotal.speedpeakSTW = x;
+                }
+                break;
+            case DEPTH:
+            case REMARKS:
+            case BAROMETER:
+            case HYDRO:
+            case TEMPAIR:
+            case TEMPWATER:
+                break;
+            case WIND:
+                if ( !s.IsEmpty() )
+                {
+                    s.ToDouble( &x );
+                    winddir += x;
+                    oneLogbookTotal.winddir += x;
+                    windcount++;
+                    oneLogbookTotal.windcount++;
+                }
+                break;
+            case WINDFORCE:
+                if ( !s.IsEmpty() )
+                {
+                    if ( s.Length() < 11 )
+                    {
+                        s.ToDouble( &x );
+                        wind += x;
+                        oneLogbookTotal.wind += x;
+                        if ( x > windpeak ) windpeak = x;
+                        if ( x > oneLogbookTotal.windpeak ) oneLogbookTotal.windpeak = x;
+                    }
+                    else
+                    {
+                        wxArrayString WS;
+                        WS = wxStringTokenize( s,_T( "|" ) );
+                        WS[1].ToDouble( &x );
+                        wind += x;
+                        oneLogbookTotal.wind += x;
+                        WS[2].ToDouble( &x );
+                        if ( x > windpeak ) windpeak = x;
+                        if ( x > oneLogbookTotal.windpeak ) oneLogbookTotal.windpeak = x;
+                    }
+                }
+                break;
+            case CURRENT:
+                if ( !s.IsEmpty() )
+                {
+                    s.ToDouble( &x );
+                    currentdir += x;
+                    oneLogbookTotal.currentdir += x;
+                    currentcount++;
+                    oneLogbookTotal.currentcount++;
+                }
+                break;
+            case CURRENTFORCE:
+                if ( !s.IsEmpty() )
+                {
+                    s.ToDouble( &x );
+                    current += x;
+                    oneLogbookTotal.current += x;
+                    if ( x > currentpeak ) currentpeak = x;
+                    if ( x > oneLogbookTotal.currentpeak ) oneLogbookTotal.currentpeak = x;
+                }
+                break;
+            case WAVE:
+                if ( !s.IsEmpty() )
+                {
+                    s.ToDouble( &x );
+                    wave += x;
+                    oneLogbookTotal.wave += x;
+                    wavecount++;
+                    oneLogbookTotal.wavecount++;
+                    if ( x > wavepeak ) wavepeak = x;
+                    if ( x > oneLogbookTotal.wavepeak ) oneLogbookTotal.wavepeak = x;
+                }
+                break;
+            case SWELL:
+                if ( !s.IsEmpty() )
+                {
+                    s.ToDouble( &x );
+                    swell += x;
+                    oneLogbookTotal.swell += x;
+                    swellcount++;
+                    oneLogbookTotal.swellcount++;
+                    if ( x > swellpeak ) swellpeak = x;
+                    if ( x > oneLogbookTotal.swellpeak ) oneLogbookTotal.swellpeak = x;
+                }
+                break;
+            case WEATHER:
+            case CLOUDS:
+            case VISIBILITY:
+                break;
+            case ENGINE1:
+                if ( s.IsEmpty() ) continue;
+
+                tkz1.SetString( s, _T( ":" ),wxTOKEN_RET_EMPTY );
+                long hours, minutes;
+                tkz1.GetNextToken().ToLong( &hours );
+                tkz1.GetNextToken().ToLong( &minutes );
+                enginehours += hours;
+                enginemin += minutes;
+                if ( enginemin >= 60 )
+                {
+                    enginehours++;
+                    enginemin -= 60;
+                }
+                oneLogbookTotal.enginehours += hours;
+                oneLogbookTotal.enginemin += minutes;
+                if ( oneLogbookTotal.enginemin >= 60 )
+                {
+                    oneLogbookTotal.enginehours++;
+                    oneLogbookTotal.enginemin -= 60;
+                }
+                break;
+            case ENGINE2:
+                if ( s.IsEmpty() ) continue;
+
+                {
+                    tkz1.SetString( s, _T( ":" ),wxTOKEN_RET_EMPTY );
+                    long hours, minutes;
+                    tkz1.GetNextToken().ToLong( &hours );
+                    tkz1.GetNextToken().ToLong( &minutes );
+                    enginehours2 += hours;
+                    enginemin2 += minutes;
+                    if ( enginemin2 >= 60 )
+                    {
+                        enginehours2++;
+                        enginemin2 -= 60;
+                    }
+                    oneLogbookTotal.enginehours2 += hours;
+                    oneLogbookTotal.enginemin2 += minutes;
+                    if ( oneLogbookTotal.enginemin2 >= 60 )
+                    {
+                        oneLogbookTotal.enginehours2++;
+                        oneLogbookTotal.enginemin2 -= 60;
+                    }
+                }
+                break;
+            case GENERATOR:
+                if ( s.IsEmpty() ) continue;
+
+                {
+                    tkz1.SetString( s, _T( ":" ),wxTOKEN_RET_EMPTY );
+                    long hours, minutes;
+                    tkz1.GetNextToken().ToLong( &hours );
+                    tkz1.GetNextToken().ToLong( &minutes );
+                    generatorhours += hours;
+                    generatormin += minutes;
+                    if ( generatormin >= 60 )
+                    {
+                        generatorhours++;
+                        generatormin -= 60;
+                    }
+                    oneLogbookTotal.generatorhours += hours;
+                    oneLogbookTotal.generatormin += minutes;
+                    if ( oneLogbookTotal.generatormin >= 60 )
+                    {
+                        oneLogbookTotal.generatorhours++;
+                        oneLogbookTotal.generatormin -= 60;
+                    }
+                }
+                break;
+            case WATERM:
+                if ( s.IsEmpty() ) continue;
+
+                {
+                    tkz1.SetString( s, _T( ":" ),wxTOKEN_RET_EMPTY );
+                    long hours, minutes;
+                    tkz1.GetNextToken().ToLong( &hours );
+                    tkz1.GetNextToken().ToLong( &minutes );
+                    watermhours += hours;
+                    watermmin += minutes;
+                    if ( watermmin >= 60 )
+                    {
+                        watermhours++;
+                        watermmin -= 60;
+                    }
+                    oneLogbookTotal.watermhours += hours;
+                    oneLogbookTotal.watermmin += minutes;
+                    if ( oneLogbookTotal.watermmin >= 60 )
+                    {
+                        oneLogbookTotal.watermhours++;
+                        oneLogbookTotal.watermmin -= 60;
+                    }
+                }
+                break;
+            case ENGINE1T:
+                break;
+            case FUEL:
+                if ( s.IsEmpty() ) continue;
+
+                if ( s.GetChar( 0 ) == '+' ) break;
+                s.ToDouble( &x );
+                if ( s.GetChar( 0 ) != '-' ) s.Prepend( _T( "-" ) ); // version 0.910 has no minus sign
+
+                //	if(x < 0)
+                //	{
+                fuel += x;
+                oneLogbookTotal.fuel += x;
+                //	}
+                break;
+            case WATERMO:
+                if ( s.IsEmpty() ) continue;
+                s.ToDouble( &x );
+                //	if(x < 0)
+                //	{
+                watermo += x;
+                oneLogbookTotal.watermo += x;
+                //	}
+                break;
+            case FUELTOTAL:
+                break;
+            case SAILS:
+                if ( !s.empty() )
+                {
+                    bool found = false;
+                    wxString result;
+                    for ( it = t_coll.begin(); it != t_coll.end(); ++it )
+                    {
+                        if ( s == it->first )
+                        {
+                            int a = it->second;
+                            it->second = ++a;
+                            result += it->first+_T( "\n" );
+                            found = true;
+                        }
+                    }
+                    if ( !found )
+                    {
+                        t_coll.insert( pair( s,1 ) );
+                        wxString result;
+                        for ( it = t_coll.begin(); it != t_coll.end(); ++it )
+                        {
+                            result = it->first;
+                        }
+                    }
+                }
+                break;
+            case REEF:
+                break;
+            case WATER:
+                if ( s.IsEmpty() ) continue;
+                if ( s.GetChar( 0 ) == '+' ) break;				 // add water used only
+                if ( s.GetChar( 0 ) != '-' ) s.Prepend( _T( "-" ) ); // version 0.910 has no minus sign
+                s.ToDouble( &x );
+
+                x = fabs( x );
+                //	if(x < 0)
+                //	{
+                water += x;
+                oneLogbookTotal.water += x;
+                //	}
+                break;
+            case BANK1:
+                if ( s.IsEmpty() ) continue;
+                s.ToDouble( &x );
+                if ( x >= 0 )
+                {
+                    bank1g += x;
+                    oneLogbookTotal.bank1g += x;
+                }
+                else
+                {
+                    bank1u += fabs( x );
+                    oneLogbookTotal.bank1u += bank1u;
+                }
+                break;
+            case BANK2:
+                if ( s.IsEmpty() ) continue;
+                s.ToDouble( &x );
+                if ( x >= 0 )
+                {
+                    bank2g += x;
+                    oneLogbookTotal.bank2g += x;
+                }
+                else
+                {
+                    bank2u += fabs( x );
+                    oneLogbookTotal.bank2u += bank2u;
+                }
+                break;
+            case WATERTOTAL:
+                break;
+            case MREMARKS:
+                break;
+            }
+            c++;
+        }
+        //if(test)
+        writeSumColumn( lastrow, logbook, path, colour );
+        test = false;
+        overviewflag = false;
+    }
+    if ( !showAllLogbooks )
+        writeSumColumnLogbook( oneLogbookTotal,lastrow, logbook, colour );
 }
 
 void OverView::resetValues()
 {
-	startdate =_T("");
-	enddate = _T("");
-	starttime =_T("");
-	endtime = _T("");
-	etmaldate = _T("");
-	etmal = 0;
-	bestetmal = 0;
-	bestetmaltemp = 0;
-	enginehours = 0;
-	enginemin = 0;
-	enginehours2 = 0;
-	enginemin2 = 0;
-	watermhours = 0;
-	watermmin = 0;
-	watermo = 0;
-	generatorhours = 0;
-	generatormin = 0;
-	bank1u = 0;
-	bank2u = 0;
-	bank1g = 0;
-	bank2g = 0;
-	distance = 0;
-	speed = 0;
-	speedpeak = 0;
-	speedSTW = 0;
-	speedpeakSTW = 0;
-	water = 0;
-	fuel = 0;
-	wind = 0;
-	winddir = 0;
-	wave = 0;
-	current = 0;
-	currentdir=0;
-	swell = 0;
-	windpeak = 0;
-	wavepeak = 0;
-	currentpeak = 0;
-	swellpeak = 0;
-
-	windcount = 0;
-	wavecount = 0;
-	swellcount = 0;
-	currentcount = 0;
-	etmalcount = 0;
-	speedcount = 0;
-	speedcountSTW = 0;
-	t_coll.clear();
+    startdate =_T( "" );
+    enddate = _T( "" );
+    starttime =_T( "" );
+    endtime = _T( "" );
+    etmaldate = _T( "" );
+    etmal = 0;
+    bestetmal = 0;
+    bestetmaltemp = 0;
+    enginehours = 0;
+    enginemin = 0;
+    enginehours2 = 0;
+    enginemin2 = 0;
+    watermhours = 0;
+    watermmin = 0;
+    watermo = 0;
+    generatorhours = 0;
+    generatormin = 0;
+    bank1u = 0;
+    bank2u = 0;
+    bank1g = 0;
+    bank2g = 0;
+    distance = 0;
+    speed = 0;
+    speedpeak = 0;
+    speedSTW = 0;
+    speedpeakSTW = 0;
+    water = 0;
+    fuel = 0;
+    wind = 0;
+    winddir = 0;
+    wave = 0;
+    current = 0;
+    currentdir=0;
+    swell = 0;
+    windpeak = 0;
+    wavepeak = 0;
+    currentpeak = 0;
+    swellpeak = 0;
+
+    windcount = 0;
+    wavecount = 0;
+    swellcount = 0;
+    currentcount = 0;
+    etmalcount = 0;
+    speedcount = 0;
+    speedcountSTW = 0;
+    t_coll.clear();
 
-	sign = wxEmptyString;
+    sign = wxEmptyString;
 }
 
 void OverView::oneLogbookTotalReset()
 {
-	oneLogbookTotal.sails.Clear();
+    oneLogbookTotal.sails.Clear();
 
-	oneLogbookTotal.logbookStart = wxEmptyString;
-	oneLogbookTotal.logbookEnd = wxEmptyString;
-	oneLogbookTotal.logbookTimeStart = wxEmptyString;
-	oneLogbookTotal.logbookTimeEnd = wxEmptyString;
-	oneLogbookTotal.distance = 0;
-	oneLogbookTotal.bestetmal = 0;
-	oneLogbookTotal.speed = 0;
-	oneLogbookTotal.speedpeak = 0;
-	oneLogbookTotal.speedSTW = 0;
-	oneLogbookTotal.speedpeakSTW = 0;
-	oneLogbookTotal.enginehours = 0;
-	oneLogbookTotal.enginemin = 0;
-	oneLogbookTotal.enginehours2 = 0;
-	oneLogbookTotal.enginemin2 = 0;
-	oneLogbookTotal.watermhours = 0;
-	oneLogbookTotal.watermmin = 0;
-	oneLogbookTotal.watermo = 0;
-	oneLogbookTotal.generatorhours = 0;
-	oneLogbookTotal.generatormin = 0;
-	oneLogbookTotal.bank1u = 0;
-	oneLogbookTotal.bank2u = 0;
-	oneLogbookTotal.bank1g = 0;
-	oneLogbookTotal.bank2g = 0;
-	oneLogbookTotal.fuel = 0;
-	oneLogbookTotal.water = 0;
-	oneLogbookTotal.winddir = 0;
-	oneLogbookTotal.wind = 0;
-	oneLogbookTotal.wave = 0;
-	oneLogbookTotal.swell = 0;
-	oneLogbookTotal.current = 0;
-	oneLogbookTotal.currentdir = 0;
-	oneLogbookTotal.windpeak = 0;
-	oneLogbookTotal.wavepeak = 0;
-	oneLogbookTotal.swellpeak = 0;
-	oneLogbookTotal.currentpeak = 0;
-
-	oneLogbookTotal.windcount = 0;
-	oneLogbookTotal.currentcount = 0;
-	oneLogbookTotal.wavecount = 0;
-	oneLogbookTotal.swellcount = 0;
-	oneLogbookTotal.etmalcount = 0;
-	oneLogbookTotal.speedcount = 0;
-	oneLogbookTotal.speedcountSTW = 0;
-}
-
-void OverView::writeSumColumn(int row, wxString logbook, wxString path, bool colour)
-{
-	wxString d, sail;
-	wxString nothing = _T("-----");
-
-	switch(opt->showWaveSwell)
-	{
-	case 0:	d = opt->meter; break;
-	case 1: d = opt->feet; break;
-	case 2: d = opt->fathom; break;
-	}
-
-	grid->SetCellAlignment(row,FLOG,wxALIGN_LEFT, wxALIGN_TOP);
-	grid->SetCellAlignment(row,FROUTE,wxALIGN_LEFT, wxALIGN_TOP);
-	grid->SetCellAlignment(row,FSAILS,wxALIGN_LEFT, wxALIGN_TOP);
-
-	grid->SetCellValue(row,FLOG,logbook);
-	grid->SetCellValue(row,FSTART,startdate);
-	grid->SetCellValue(row,FEND,enddate);
-
-	wxString temp = wxString::Format(_T("%6.2f %s"),distance,opt->distance.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FDISTANCE,temp);
-	temp = wxString::Format(_T("%6.2f %s"),etmal,opt->distance.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FETMAL,temp);
-	temp = wxString::Format(_T("%6.2f %s"),bestetmal,opt->distance.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBESTETMAL,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),fabs(fuel),opt->vol.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FFUEL,temp);
-	temp = wxString::Format(_T("%6.2f %s"),fabs(water),opt->vol.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWATER,temp);
-
-	temp = wxString::Format(_T("%3.2f %s"),bank1u,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK1U,temp);
-	temp = wxString::Format(_T("%3.2f %s"),bank1g,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK1G,temp);
-	temp = wxString::Format(_T("%3.2f %s"),bank2u,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK2U,temp);
-	temp = wxString::Format(_T("%3.2f %s"),bank2g,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK2G,temp);
-
-	if(windcount)
-		temp = wxString::Format(_T("%6.2f %s"),wind/windcount,_T("kts"));
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWIND,temp);
-
-	if(windcount)
-		temp = wxString::Format(_T("%6.2f %s"),winddir/windcount,opt->Deg.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWINDDIR,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),windpeak,_T("kts"));
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWINDPEAK,temp);
-
-	if(wavecount)
-		temp = wxString::Format(_T("%6.2f %s"),wave/wavecount,d.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWAVE,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),wavepeak,d.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWAVEPEAK,temp);
-
-	if(swellcount)
-		temp = wxString::Format(_T("%6.2f %s"),swell/swellcount,d.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FSWELL,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),swellpeak,d.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FSWELLPEAK,temp);
-
-	if(currentcount)
-		temp = wxString::Format(_T("%6.2f %s"),currentdir/currentcount,opt->Deg.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FCURRENTDIR,temp);
-
-	if(currentcount)
-		temp = wxString::Format(_T("%6.2f %s"),current/currentcount,opt->speed.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FCURRENT,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),currentpeak,opt->speed.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FCURRENTPEAK,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),enginehours,enginemin,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FENGINE1,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),enginehours2,enginemin2,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FENGINE2,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),generatorhours,generatormin,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FGENERATOR,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),watermhours,watermmin,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWATERM,temp);
-
-	temp = wxString::Format(_T("%3.2f %s"),watermo,opt->vol.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWATERMO,temp);
-
-
-	if(speedcount)
-		temp = wxString::Format(_T("%6.2f %s"),speed/speedcount,opt->speed.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FSPEED,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),speedpeak,opt->speed.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBSPEED,temp);
-
-	//	if(speedcountSTW)
-	//		temp = wxString::Format(_T("%6.2f %s"),speedSTW/speedcountSTW,opt->speed.c_str());
-	//	else
-	//		temp = nothing;
-	//	temp.Replace(_T("."),parent->decimalPoint);
-	//	grid->SetCellValue(row,FSPEEDSTW,temp);
-
-	//	temp = wxString::Format(_T("%6.2f %s"),speedpeakSTW,opt->speed.c_str());
-	//	temp.Replace(_T("."),parent->decimalPoint);
-	//	grid->SetCellValue(row,FBSPEEDSTW,temp);
-
-	grid->SetCellValue(row,FPATH,path);
-
-	wxDateTime startdt, enddt, timet;
-
-	if((startdate.IsEmpty() || enddate.IsEmpty()) ||
-		(starttime.IsEmpty() || endtime.IsEmpty()))
-		return;
-
-	parent->myParseTime(starttime,timet);
-	wxTimeSpan timesp(timet.GetHour(),timet.GetMinute());
-	parent->myParseDate(startdate,startdt);
-	startdt.Add(timesp);
-
-	parent->myParseTime(endtime,timet);
-	wxTimeSpan timespe(timet.GetHour(),timet.GetMinute());
-	parent->myParseDate(enddate,enddt);
-	enddt.Add(timespe);
-
-	wxTimeSpan journey = enddt.Subtract(startdt);
-	wxTimeSpan time;
-	if(journey.GetDays() > 0)
-	{
-		journey.GetMinutes();
-		wxTimeSpan t(0,journey.GetMinutes()-(journey.GetDays()*24*60));
-		time = t;
-	}
-	else
-	{
-		wxTimeSpan t(0,journey.GetMinutes());
-		time = t;
-	}
-	grid->SetCellValue(row,FJOURNEY,wxString::Format(_T("%s %s %s %s"),
-		journey.Format(_T("%D")).c_str(),opt->days.c_str(),time.Format(_T("%H:%M")).c_str(),opt->motorh.c_str()));
-
-	int max = 0; 
-	wxString result;
-	collection::iterator it;
-
-	for(it = t_coll.begin(); it != t_coll.end(); ++it)
-		if(it->second >= max)  { sail = it->first; max = it->second; }
-		grid->SetCellValue(row,FSAILS,sail);
-
-		if(colour)
-			for(int i = 0; i < grid->GetCols(); i++)
-				grid->SetCellBackgroundColour(row,i,wxColour(230,230,230));
-}
-
-void OverView::writeSumColumnLogbook(total data, int row, wxString logbook, bool colour)
-{
-	wxString nothing = _T("-----");
-
-	parent->m_gridOverview->AppendRows();
-	row = parent->m_gridOverview->GetRows()-1;
-	for(int i= 0; i < parent->m_gridOverview->GetNumberCols(); i++)
-		grid->SetCellBackgroundColour(row,i,wxColour(156,156,156));
-
-	wxString d, sail;
-	switch(opt->showWaveSwell)
-	{
-	case 0:	d = opt->meter; break;
-	case 1: d = opt->feet; break;
-	case 2: d = opt->fathom; break;
-	}
-
-	grid->SetCellAlignment(row,FLOG,wxALIGN_LEFT, wxALIGN_TOP);
-	grid->SetCellAlignment(row,FROUTE,wxALIGN_LEFT, wxALIGN_TOP);
-	grid->SetCellAlignment(row,FSAILS,wxALIGN_LEFT, wxALIGN_TOP);
-
-	grid->SetCellValue(row,FLOG,_("Logbook Total"));
-	grid->SetCellValue(row,FSTART,data.logbookStart);
-	grid->SetCellValue(row,FEND,enddate);
-
-	wxString temp = wxString::Format(_T("%6.2f %s"),data.distance,opt->distance.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FDISTANCE,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),data.bestetmal,opt->distance.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBESTETMAL,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),fabs(data.fuel),opt->vol.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FFUEL,temp);
-	temp = wxString::Format(_T("%6.2f %s"),fabs(data.water),opt->vol.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWATER,temp);
-
-	temp = wxString::Format(_T("%3.2f %s"),data.bank1u,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK1U,temp);
-	temp = wxString::Format(_T("%3.2f %s"),data.bank1g,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK1G,temp);
-	temp = wxString::Format(_T("%3.2f %s"),data.bank2u,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK2U,temp);
-	temp = wxString::Format(_T("%3.2f %s"),data.bank2g,opt->ampereh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBANK2G,temp);
-
-	if(data.windcount)
-		temp = wxString::Format(_T("%6.2f %s"),data.wind/data.windcount,_T("kts"));
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWIND,temp);
-
-	if(data.windcount)
-		temp = wxString::Format(_T("%6.2f %s"),data.winddir/data.windcount,opt->Deg.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWINDDIR,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),data.windpeak,_T("kts"));
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWINDPEAK,temp);
-
-	if(data.wavecount)
-		temp = wxString::Format(_T("%6.2f %s"),data.wave/data.wavecount,d.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWAVE,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),data.wavepeak,d.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWAVEPEAK,temp);
-
-	if(data.swellcount)
-		temp = wxString::Format(_T("%6.2f %s"),data.swell/data.swellcount,d.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FSWELL,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),data.swellpeak,d.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FSWELLPEAK,temp);
-
-	if(data.currentcount)
-		wxString::Format(_T("%6.2f %s"),data.currentdir/data.currentcount,opt->Deg.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FCURRENTDIR,temp);
-
-	if(data.currentcount)
-		temp = wxString::Format(_T("%6.2f %s"),data.current/data.currentcount,d.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FCURRENT,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),data.currentpeak,d.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FCURRENTPEAK,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),data.enginehours,data.enginemin,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FENGINE1,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),data.enginehours2,data.enginemin2,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FENGINE2,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),data.generatorhours,data.generatormin,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FGENERATOR,temp);
-
-	temp = wxString::Format(_T("%0002i:%02i %s"),data.watermhours,data.watermmin,opt->motorh.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWATERM,temp);
-
-	temp = wxString::Format(_T("%3.2f %s"),data.watermo,opt->vol.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FWATERMO,temp);
-
-	if(data.speedcount)
-		temp = wxString::Format(_T("%6.2f %s"),data.speed/data.speedcount,opt->speed.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FSPEED,temp);
-
-	temp = wxString::Format(_T("%6.2f %s"),data.speedpeak,opt->speed.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-	grid->SetCellValue(row,FBSPEED,temp);
-
-	if(data.speedcountSTW)
-		temp = wxString::Format(_T("%6.2f %s"),data.speedSTW/data.speedcountSTW,opt->speed.c_str());
-	else
-		temp = nothing;
-	temp.Replace(_T("."),parent->decimalPoint);
-
-	temp = wxString::Format(_T("%6.2f %s"),data.speedpeakSTW,opt->speed.c_str());
-	temp.Replace(_T("."),parent->decimalPoint);
-
-	wxDateTime startdt, enddt, startdtd, enddtd, time;
-
-	if((data.logbookStart.IsEmpty() || enddate.IsEmpty()) ||
-		(data.logbookTimeStart.IsEmpty() || endtime.IsEmpty()))
-		return;
-	
-	parent->myParseTime(data.logbookTimeStart,time);
-	wxTimeSpan timesp(time.GetHour(),time.GetMinute());
-	parent->myParseDate(data.logbookStart,startdt);
-	startdt.Add(timesp);
-
-	parent->myParseTime(endtime,time);
-	wxTimeSpan timespe(time.GetHour(),time.GetMinute());
-	parent->myParseDate(enddate,enddt);
-	enddt.Add(timespe);
-
-	wxTimeSpan journey = enddt.Subtract(startdt);
-	if(journey.GetWeeks() > 3)
-	{
-		int years = 0;
-		int month;
-		int days;
-
-		//years = journey.GetDays() / 365 ;
-
-
-		years = enddt.GetYear()-startdt.GetYear();
-
-		int bd = startdt.GetDay(), bm = startdt.GetMonth() ,by = startdt.GetYear(),
-			cd = enddt.GetDay(),cm = enddt.GetMonth(),cy = enddt.GetYear(),ad,am,ay;
-		if(cd<bd)
-		{
-			cm=cm-1;
-			cd=cd+startdt.GetLastMonthDay().GetDay();
-		}
-		if(cm<bm)
-		{
-			cy=cy-1;
-			cm=cm+12;
-		}
-		ad=cd-bd;
-		am=cm-bm;
-		ay=cy-by;
-
-		month = startdt.GetMonth()-enddt.GetMonth();
-		if(month < 0 && startdt.GetYear() != enddt.GetYear())
-		{
-			month = 12 + month;
-			years--;
-		}
-		else
-			month = enddt.GetMonth()-startdt.GetMonth();
-
-		days = enddt.GetDay() - startdt.GetDay();
-		if(days < 0)
-		{
-			days = startdt.GetDay() - days;
-			month --;
-		}
-		/*		else
-		{
-		month--;
-		days = enddt.GetLastMonthDay((wxDateTime::Month)month).GetDay() - (startdt.GetDay() - enddt.GetDay());
-		}
-		*/
-		grid->SetCellValue(row,FJOURNEY,wxString::Format(_("%i Year(s) %i Month(s) %i Day(s)"),ay,am,ad));
-	}
-	else
-		grid->SetCellValue(row,FJOURNEY,journey.Format(_("%E Week(s) %D Day(s) %H:%M "))+opt->motorh);
-
-	int max = 0; 
-	wxString result;
-	collection::iterator it;
-
-	for(it = t_coll.begin(); it != t_coll.end(); ++it)
-		if(it->second >= max)  { sail = it->first; max = it->second; }
-		grid->SetCellValue(row,FSAILS,sail);
-
-		if(colour)
-			for(int i = 0; i < grid->GetCols(); i++)
-				grid->SetCellBackgroundColour(row,i,wxColour(230,230,230));
+    oneLogbookTotal.logbookStart = wxEmptyString;
+    oneLogbookTotal.logbookEnd = wxEmptyString;
+    oneLogbookTotal.logbookTimeStart = wxEmptyString;
+    oneLogbookTotal.logbookTimeEnd = wxEmptyString;
+    oneLogbookTotal.distance = 0;
+    oneLogbookTotal.bestetmal = 0;
+    oneLogbookTotal.speed = 0;
+    oneLogbookTotal.speedpeak = 0;
+    oneLogbookTotal.speedSTW = 0;
+    oneLogbookTotal.speedpeakSTW = 0;
+    oneLogbookTotal.enginehours = 0;
+    oneLogbookTotal.enginemin = 0;
+    oneLogbookTotal.enginehours2 = 0;
+    oneLogbookTotal.enginemin2 = 0;
+    oneLogbookTotal.watermhours = 0;
+    oneLogbookTotal.watermmin = 0;
+    oneLogbookTotal.watermo = 0;
+    oneLogbookTotal.generatorhours = 0;
+    oneLogbookTotal.generatormin = 0;
+    oneLogbookTotal.bank1u = 0;
+    oneLogbookTotal.bank2u = 0;
+    oneLogbookTotal.bank1g = 0;
+    oneLogbookTotal.bank2g = 0;
+    oneLogbookTotal.fuel = 0;
+    oneLogbookTotal.water = 0;
+    oneLogbookTotal.winddir = 0;
+    oneLogbookTotal.wind = 0;
+    oneLogbookTotal.wave = 0;
+    oneLogbookTotal.swell = 0;
+    oneLogbookTotal.current = 0;
+    oneLogbookTotal.currentdir = 0;
+    oneLogbookTotal.windpeak = 0;
+    oneLogbookTotal.wavepeak = 0;
+    oneLogbookTotal.swellpeak = 0;
+    oneLogbookTotal.currentpeak = 0;
+
+    oneLogbookTotal.windcount = 0;
+    oneLogbookTotal.currentcount = 0;
+    oneLogbookTotal.wavecount = 0;
+    oneLogbookTotal.swellcount = 0;
+    oneLogbookTotal.etmalcount = 0;
+    oneLogbookTotal.speedcount = 0;
+    oneLogbookTotal.speedcountSTW = 0;
+}
+
+void OverView::writeSumColumn( int row, wxString logbook, wxString path, bool colour )
+{
+    wxString d, sail;
+    wxString nothing = _T( "-----" );
+
+    switch ( opt->showWaveSwell )
+    {
+    case 0:
+        d = opt->meter;
+        break;
+    case 1:
+        d = opt->feet;
+        break;
+    case 2:
+        d = opt->fathom;
+        break;
+    }
+
+    grid->SetCellAlignment( row,FLOG,wxALIGN_LEFT, wxALIGN_TOP );
+    grid->SetCellAlignment( row,FROUTE,wxALIGN_LEFT, wxALIGN_TOP );
+    grid->SetCellAlignment( row,FSAILS,wxALIGN_LEFT, wxALIGN_TOP );
+
+    grid->SetCellValue( row,FLOG,logbook );
+    grid->SetCellValue( row,FSTART,startdate );
+    grid->SetCellValue( row,FEND,enddate );
+
+    wxString temp = wxString::Format( _T( "%6.2f %s" ),distance,opt->distance.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FDISTANCE,temp );
+    temp = wxString::Format( _T( "%6.2f %s" ),etmal,opt->distance.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FETMAL,temp );
+    temp = wxString::Format( _T( "%6.2f %s" ),bestetmal,opt->distance.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBESTETMAL,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),fabs( fuel ),opt->vol.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FFUEL,temp );
+    temp = wxString::Format( _T( "%6.2f %s" ),fabs( water ),opt->vol.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWATER,temp );
+
+    temp = wxString::Format( _T( "%3.2f %s" ),bank1u,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK1U,temp );
+    temp = wxString::Format( _T( "%3.2f %s" ),bank1g,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK1G,temp );
+    temp = wxString::Format( _T( "%3.2f %s" ),bank2u,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK2U,temp );
+    temp = wxString::Format( _T( "%3.2f %s" ),bank2g,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK2G,temp );
+
+    if ( windcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),wind/windcount,_T( "kts" ) );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWIND,temp );
+
+    if ( windcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),winddir/windcount,opt->Deg.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWINDDIR,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),windpeak,_T( "kts" ) );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWINDPEAK,temp );
+
+    if ( wavecount )
+        temp = wxString::Format( _T( "%6.2f %s" ),wave/wavecount,d.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWAVE,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),wavepeak,d.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWAVEPEAK,temp );
+
+    if ( swellcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),swell/swellcount,d.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FSWELL,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),swellpeak,d.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FSWELLPEAK,temp );
+
+    if ( currentcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),currentdir/currentcount,opt->Deg.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FCURRENTDIR,temp );
+
+    if ( currentcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),current/currentcount,opt->speed.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FCURRENT,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),currentpeak,opt->speed.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FCURRENTPEAK,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),enginehours,enginemin,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FENGINE1,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),enginehours2,enginemin2,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FENGINE2,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),generatorhours,generatormin,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FGENERATOR,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),watermhours,watermmin,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWATERM,temp );
+
+    temp = wxString::Format( _T( "%3.2f %s" ),watermo,opt->vol.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWATERMO,temp );
+
+
+    if ( speedcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),speed/speedcount,opt->speed.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FSPEED,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),speedpeak,opt->speed.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBSPEED,temp );
+
+    //	if(speedcountSTW)
+    //		temp = wxString::Format(_T("%6.2f %s"),speedSTW/speedcountSTW,opt->speed.c_str());
+    //	else
+    //		temp = nothing;
+    //	temp.Replace(_T("."),parent->decimalPoint);
+    //	grid->SetCellValue(row,FSPEEDSTW,temp);
+
+    //	temp = wxString::Format(_T("%6.2f %s"),speedpeakSTW,opt->speed.c_str());
+    //	temp.Replace(_T("."),parent->decimalPoint);
+    //	grid->SetCellValue(row,FBSPEEDSTW,temp);
+
+    grid->SetCellValue( row,FPATH,path );
+
+    wxDateTime startdt, enddt, timet;
+
+    if ( ( startdate.IsEmpty() || enddate.IsEmpty() ) ||
+            ( starttime.IsEmpty() || endtime.IsEmpty() ) )
+        return;
+
+    parent->myParseTime( starttime,timet );
+    wxTimeSpan timesp( timet.GetHour(),timet.GetMinute() );
+    parent->myParseDate( startdate,startdt );
+    startdt.Add( timesp );
+
+    parent->myParseTime( endtime,timet );
+    wxTimeSpan timespe( timet.GetHour(),timet.GetMinute() );
+    parent->myParseDate( enddate,enddt );
+    enddt.Add( timespe );
+
+    wxTimeSpan journey = enddt.Subtract( startdt );
+    wxTimeSpan time;
+    if ( journey.GetDays() > 0 )
+    {
+        journey.GetMinutes();
+        wxTimeSpan t( 0,journey.GetMinutes()-( journey.GetDays()*24*60 ) );
+        time = t;
+    }
+    else
+    {
+        wxTimeSpan t( 0,journey.GetMinutes() );
+        time = t;
+    }
+    grid->SetCellValue( row,FJOURNEY,wxString::Format( _T( "%s %s %s %s" ),
+                        journey.Format( _T( "%D" ) ).c_str(),opt->days.c_str(),time.Format( _T( "%H:%M" ) ).c_str(),opt->motorh.c_str() ) );
+
+    int max = 0;
+    wxString result;
+    collection::iterator it;
+
+    for ( it = t_coll.begin(); it != t_coll.end(); ++it )
+        if ( it->second >= max )
+        {
+            sail = it->first;
+            max = it->second;
+        }
+    grid->SetCellValue( row,FSAILS,sail );
+
+    if ( colour )
+        for ( int i = 0; i < grid->GetCols(); i++ )
+            grid->SetCellBackgroundColour( row,i,wxColour( 230,230,230 ) );
+}
+
+void OverView::writeSumColumnLogbook( total data, int row, wxString logbook, bool colour )
+{
+    wxString nothing = _T( "-----" );
+
+    parent->m_gridOverview->AppendRows();
+    row = parent->m_gridOverview->GetRows()-1;
+    for ( int i= 0; i < parent->m_gridOverview->GetNumberCols(); i++ )
+        grid->SetCellBackgroundColour( row,i,wxColour( 156,156,156 ) );
+
+    wxString d, sail;
+    switch ( opt->showWaveSwell )
+    {
+    case 0:
+        d = opt->meter;
+        break;
+    case 1:
+        d = opt->feet;
+        break;
+    case 2:
+        d = opt->fathom;
+        break;
+    }
+
+    grid->SetCellAlignment( row,FLOG,wxALIGN_LEFT, wxALIGN_TOP );
+    grid->SetCellAlignment( row,FROUTE,wxALIGN_LEFT, wxALIGN_TOP );
+    grid->SetCellAlignment( row,FSAILS,wxALIGN_LEFT, wxALIGN_TOP );
+
+    grid->SetCellValue( row,FLOG,_( "Logbook Total" ) );
+    grid->SetCellValue( row,FSTART,data.logbookStart );
+    grid->SetCellValue( row,FEND,enddate );
+
+    wxString temp = wxString::Format( _T( "%6.2f %s" ),data.distance,opt->distance.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FDISTANCE,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),data.bestetmal,opt->distance.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBESTETMAL,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),fabs( data.fuel ),opt->vol.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FFUEL,temp );
+    temp = wxString::Format( _T( "%6.2f %s" ),fabs( data.water ),opt->vol.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWATER,temp );
+
+    temp = wxString::Format( _T( "%3.2f %s" ),data.bank1u,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK1U,temp );
+    temp = wxString::Format( _T( "%3.2f %s" ),data.bank1g,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK1G,temp );
+    temp = wxString::Format( _T( "%3.2f %s" ),data.bank2u,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK2U,temp );
+    temp = wxString::Format( _T( "%3.2f %s" ),data.bank2g,opt->ampereh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBANK2G,temp );
+
+    if ( data.windcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.wind/data.windcount,_T( "kts" ) );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWIND,temp );
+
+    if ( data.windcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.winddir/data.windcount,opt->Deg.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWINDDIR,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),data.windpeak,_T( "kts" ) );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWINDPEAK,temp );
+
+    if ( data.wavecount )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.wave/data.wavecount,d.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWAVE,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),data.wavepeak,d.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWAVEPEAK,temp );
+
+    if ( data.swellcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.swell/data.swellcount,d.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FSWELL,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),data.swellpeak,d.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FSWELLPEAK,temp );
+
+    if ( data.currentcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.currentdir/data.currentcount,opt->Deg.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FCURRENTDIR,temp );
+
+    if ( data.currentcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.current/data.currentcount,opt->speed.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FCURRENT,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),data.currentpeak,opt->speed.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FCURRENTPEAK,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),data.enginehours,data.enginemin,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FENGINE1,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),data.enginehours2,data.enginemin2,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FENGINE2,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),data.generatorhours,data.generatormin,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FGENERATOR,temp );
+
+    temp = wxString::Format( _T( "%0002i:%02i %s" ),data.watermhours,data.watermmin,opt->motorh.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWATERM,temp );
+
+    temp = wxString::Format( _T( "%3.2f %s" ),data.watermo,opt->vol.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FWATERMO,temp );
+
+    if ( data.speedcount )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.speed/data.speedcount,opt->speed.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FSPEED,temp );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),data.speedpeak,opt->speed.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+    grid->SetCellValue( row,FBSPEED,temp );
+
+    if ( data.speedcountSTW )
+        temp = wxString::Format( _T( "%6.2f %s" ),data.speedSTW/data.speedcountSTW,opt->speed.c_str() );
+    else
+        temp = nothing;
+    temp.Replace( _T( "." ),parent->decimalPoint );
+
+    temp = wxString::Format( _T( "%6.2f %s" ),data.speedpeakSTW,opt->speed.c_str() );
+    temp.Replace( _T( "." ),parent->decimalPoint );
+
+    wxDateTime startdt, enddt, startdtd, enddtd, time;
+
+    if ( ( data.logbookStart.IsEmpty() || enddate.IsEmpty() ) ||
+            ( data.logbookTimeStart.IsEmpty() || endtime.IsEmpty() ) )
+        return;
+
+    parent->myParseTime( data.logbookTimeStart,time );
+    wxTimeSpan timesp( time.GetHour(),time.GetMinute() );
+    parent->myParseDate( data.logbookStart,startdt );
+    startdt.Add( timesp );
+
+    parent->myParseTime( endtime,time );
+    wxTimeSpan timespe( time.GetHour(),time.GetMinute() );
+    parent->myParseDate( enddate,enddt );
+    enddt.Add( timespe );
+
+    wxTimeSpan journey = enddt.Subtract( startdt );
+    if ( journey.GetWeeks() > 3 )
+    {
+        int years = 0;
+        int month;
+        int days;
+
+        //years = journey.GetDays() / 365 ;
+
+
+        years = enddt.GetYear()-startdt.GetYear();
+
+        int bd = startdt.GetDay(), bm = startdt.GetMonth() ,by = startdt.GetYear(),
+            cd = enddt.GetDay(),cm = enddt.GetMonth(),cy = enddt.GetYear(),ad,am,ay;
+        if ( cd<bd )
+        {
+            cm=cm-1;
+            cd=cd+startdt.GetLastMonthDay().GetDay();
+        }
+        if ( cm<bm )
+        {
+            cy=cy-1;
+            cm=cm+12;
+        }
+        ad=cd-bd;
+        am=cm-bm;
+        ay=cy-by;
+
+        month = startdt.GetMonth()-enddt.GetMonth();
+        if ( month < 0 && startdt.GetYear() != enddt.GetYear() )
+        {
+            month = 12 + month;
+            years--;
+        }
+        else
+            month = enddt.GetMonth()-startdt.GetMonth();
+
+        days = enddt.GetDay() - startdt.GetDay();
+        if ( days < 0 )
+        {
+            days = startdt.GetDay() - days;
+            month --;
+        }
+        /*		else
+        {
+        month--;
+        days = enddt.GetLastMonthDay((wxDateTime::Month)month).GetDay() - (startdt.GetDay() - enddt.GetDay());
+        }
+        */
+        grid->SetCellValue( row,FJOURNEY,wxString::Format( _( "%i Year(s) %i Month(s) %i Day(s)" ),ay,am,ad ) );
+    }
+    else
+        grid->SetCellValue( row,FJOURNEY,journey.Format( _( "%E Week(s) %D Day(s) %H:%M " ) )+opt->motorh );
+
+    int max = 0;
+    wxString result;
+    collection::iterator it;
+
+    for ( it = t_coll.begin(); it != t_coll.end(); ++it )
+        if ( it->second >= max )
+        {
+            sail = it->first;
+            max = it->second;
+        }
+    grid->SetCellValue( row,FSAILS,sail );
+
+    if ( colour )
+        for ( int i = 0; i < grid->GetCols(); i++ )
+            grid->SetCellBackgroundColour( row,i,wxColour( 230,230,230 ) );
 }
 
 void OverView::setLayoutLocation()
 {
-	bool radio = parent->m_radioBtnHTMLOverview->GetValue();
-	if(radio)
-		layout_locn = HTMLLayout_locn;
-	else
-		layout_locn = ODTLayout_locn;
-	this->layout_locn = layout_locn;
-
-	this->layout_locn.Append(_T("overview"));
-	parent->appendOSDirSlash(&layout_locn);
-
-	parent->loadLayoutChoice(LogbookDialog::OVERVIEW,layout_locn,parent->overviewChoice,opt->layoutPrefix[LogbookDialog::OVERVIEW]);
-	if(radio)
-		parent->overviewChoice->SetSelection(opt->overviewGridLayoutChoice);
-	else
-		parent->overviewChoice->SetSelection(opt->overviewGridLayoutChoiceODT);
+    bool radio = parent->m_radioBtnHTMLOverview->GetValue();
+    if ( radio )
+        layout_locn = HTMLLayout_locn;
+    else
+        layout_locn = ODTLayout_locn;
+    this->layout_locn = layout_locn;
+
+    this->layout_locn.Append( _T( "overview" ) );
+    parent->appendOSDirSlash( &layout_locn );
+
+    parent->loadLayoutChoice( LogbookDialog::OVERVIEW,layout_locn,parent->overviewChoice,opt->layoutPrefix[LogbookDialog::OVERVIEW] );
+    if ( radio )
+        parent->overviewChoice->SetSelection( opt->overviewGridLayoutChoice );
+    else
+        parent->overviewChoice->SetSelection( opt->overviewGridLayoutChoiceODT );
 }
 
-void OverView::setSelectedRow(int row)
+void OverView::setSelectedRow( int row )
 {
-	selectedRow = row;
+    selectedRow = row;
 }
 
 void OverView::gotoRoute()
 {
-	wxString file = grid->GetCellValue(selectedRow,FLOG);
-	wxString route =  grid->GetCellValue(selectedRow,FROUTE);
-	wxString date =  grid->GetCellValue(selectedRow,FSTART);
-	wxString path  =  grid->GetCellValue(selectedRow,FPATH);
-
-	if(logbook->data_locn != path)
-	{
-		logbook->data_locn = path;
-		logbook->loadSelectedData(path);
-	}
-
-	int i;
-	for(i = 0; i < parent->m_gridGlobal->GetNumberRows(); i++)
-	{
-		if(parent->m_gridGlobal->GetCellValue(i,0) == route &&
-			parent->m_gridGlobal->GetCellValue(i,1) == date)
-			break;
-	}
-
-	parent->m_gridGlobal->MakeCellVisible(i,0);
-	parent->m_gridGlobal->SelectRow(i);
-	parent->m_gridWeather->MakeCellVisible(i,0);
-	parent->m_gridWeather->SelectRow(i);
-	parent->m_gridMotorSails->MakeCellVisible(i,0);
-	parent->m_gridMotorSails->SelectRow(i);
-
-	parent->m_logbook->SetSelection(0);
-
-}
-
-wxString OverView::setPlaceHolders(int mode, wxGrid *grid, int row, wxString middle)
-{
-	wxString newMiddleODT = middle;
-
-	newMiddleODT.Replace(wxT("#FLOG#"),replaceNewLine(mode,grid->GetCellValue(row,FLOG),false));
-	newMiddleODT.Replace(wxT("#LLOG#"),grid->GetTable()->GetColLabelValue(FLOG));
-	newMiddleODT.Replace(wxT("#FROUTE#"),replaceNewLine(mode,grid->GetCellValue(row,FROUTE),false));
-	newMiddleODT.Replace(wxT("#LROUTE#"),grid->GetTable()->GetColLabelValue(FROUTE));
-	newMiddleODT.Replace(wxT("#FSTART#"),replaceNewLine(mode,grid->GetCellValue(row,FSTART),false));
-	newMiddleODT.Replace(wxT("#LSTART#"),grid->GetTable()->GetColLabelValue(FSTART));
-	newMiddleODT.Replace(wxT("#FEND#"),replaceNewLine(mode,grid->GetCellValue(row,FEND),false));
-	newMiddleODT.Replace(wxT("#LEND#"),grid->GetTable()->GetColLabelValue(FEND));
-	newMiddleODT.Replace(wxT("#FJOURNEY#"),replaceNewLine(mode,grid->GetCellValue(row,FJOURNEY),false));
-	newMiddleODT.Replace(wxT("#LJOURNEY#"),grid->GetTable()->GetColLabelValue(FJOURNEY));
-	newMiddleODT.Replace(wxT("#FDISTANCE#"),replaceNewLine(mode,grid->GetCellValue(row,FDISTANCE),false));
-	newMiddleODT.Replace(wxT("#LDISTANCE#"),grid->GetTable()->GetColLabelValue(FDISTANCE));
-	newMiddleODT.Replace(wxT("#FETMAL#"),replaceNewLine(mode,grid->GetCellValue(row,FETMAL),false));
-	newMiddleODT.Replace(wxT("#LETMAL#"),grid->GetTable()->GetColLabelValue(FETMAL));
-	newMiddleODT.Replace(wxT("#FBESTETMAL#"),replaceNewLine(mode,grid->GetCellValue(row,FBESTETMAL),false));
-	newMiddleODT.Replace(wxT("#LBESTETMAL#"),grid->GetTable()->GetColLabelValue(FBESTETMAL));
-	newMiddleODT.Replace(wxT("#FSPEED#"),replaceNewLine(mode,grid->GetCellValue(row,FSPEED),false));
-	newMiddleODT.Replace(wxT("#LSPEED#"),grid->GetTable()->GetColLabelValue(FSPEED));
-	newMiddleODT.Replace(wxT("#FBSPEED#"),replaceNewLine(mode,grid->GetCellValue(row,FBSPEED),false));
-	newMiddleODT.Replace(wxT("#LBSPEED#"),grid->GetTable()->GetColLabelValue(FBSPEED));
-	newMiddleODT.Replace(wxT("#FENGINE1#"),replaceNewLine(mode,grid->GetCellValue(row,FENGINE2),false));
-	newMiddleODT.Replace(wxT("#LENGINE1#"),grid->GetTable()->GetColLabelValue(FENGINE2));
-	newMiddleODT.Replace(wxT("#FGENERATOR#"),replaceNewLine(mode,grid->GetCellValue(row,FGENERATOR),false));
-	newMiddleODT.Replace(wxT("#LGENERATOR#"),grid->GetTable()->GetColLabelValue(FGENERATOR));
-	newMiddleODT.Replace(wxT("#FWATERM#"),replaceNewLine(mode,grid->GetCellValue(row,FWATERM),false));
-	newMiddleODT.Replace(wxT("#LWATERM#"),grid->GetTable()->GetColLabelValue(FWATERM));
-	newMiddleODT.Replace(wxT("#FWATERMO#"),replaceNewLine(mode,grid->GetCellValue(row,FWATERMO),false));
-	newMiddleODT.Replace(wxT("#LWATERMO#"),grid->GetTable()->GetColLabelValue(FWATERMO));
-	newMiddleODT.Replace(wxT("#FBANK1G#"),replaceNewLine(mode,grid->GetCellValue(row,FBANK1G),false));
-	newMiddleODT.Replace(wxT("#LBANK1G#"),grid->GetTable()->GetColLabelValue(FBANK1G));
-	newMiddleODT.Replace(wxT("#FBANK1U#"),replaceNewLine(mode,grid->GetCellValue(row,FBANK1U),false));
-	newMiddleODT.Replace(wxT("#LBANK1U#"),grid->GetTable()->GetColLabelValue(FBANK1U));
-	newMiddleODT.Replace(wxT("#FBANK2G#"),replaceNewLine(mode,grid->GetCellValue(row,FBANK2G),false));
-	newMiddleODT.Replace(wxT("#LBANK2G#"),grid->GetTable()->GetColLabelValue(FBANK2G));
-	newMiddleODT.Replace(wxT("#FBANK2U#"),replaceNewLine(mode,grid->GetCellValue(row,FBANK2U),false));
-	newMiddleODT.Replace(wxT("#LBANK2U#"),grid->GetTable()->GetColLabelValue(FBANK2U));
-
-	newMiddleODT.Replace(wxT("#FENGINE#"),replaceNewLine(mode,grid->GetCellValue(row,FENGINE1),false));
-	newMiddleODT.Replace(wxT("#LENGINE#"),grid->GetTable()->GetColLabelValue(FENGINE1));
-	newMiddleODT.Replace(wxT("#FFUEL#"),replaceNewLine(mode,grid->GetCellValue(row,FFUEL),false));
-	newMiddleODT.Replace(wxT("#LFUEL#"),grid->GetTable()->GetColLabelValue(FFUEL));
-	newMiddleODT.Replace(wxT("#FWATER#"),replaceNewLine(mode,grid->GetCellValue(row,FWATER),false));
-	newMiddleODT.Replace(wxT("#LWATER#"),grid->GetTable()->GetColLabelValue(FWATER));
-	newMiddleODT.Replace(wxT("#FWINDDIR#"),replaceNewLine(mode,grid->GetCellValue(row,FWINDDIR),false));
-	newMiddleODT.Replace(wxT("#LWINDDIR#"),grid->GetTable()->GetColLabelValue(FWINDDIR));
-	newMiddleODT.Replace(wxT("#FWIND#"),replaceNewLine(mode,grid->GetCellValue(row,FWIND),false));
-	newMiddleODT.Replace(wxT("#LWIND#"),grid->GetTable()->GetColLabelValue(FWIND));
-	newMiddleODT.Replace(wxT("#FWINDPEAK#"),replaceNewLine(mode,grid->GetCellValue(row,FWINDPEAK),false));
-	newMiddleODT.Replace(wxT("#LWINDPEAK#"),grid->GetTable()->GetColLabelValue(FWINDPEAK));
-	newMiddleODT.Replace(wxT("#FCURRENTDIR#"),replaceNewLine(mode,grid->GetCellValue(row,FCURRENTDIR),false));
-	newMiddleODT.Replace(wxT("#LCURRENTDIR#"),grid->GetTable()->GetColLabelValue(FCURRENTDIR));
-
-	newMiddleODT.Replace(wxT("#FCURRENT#"),replaceNewLine(mode,grid->GetCellValue(row,FCURRENT),false));
-	newMiddleODT.Replace(wxT("#LCURRENT#"),grid->GetTable()->GetColLabelValue(FCURRENT));
-	newMiddleODT.Replace(wxT("#FCURRENTPEAK#"),replaceNewLine(mode,grid->GetCellValue(row,FCURRENTPEAK),false));
-	newMiddleODT.Replace(wxT("#LCURRENTPEAK#"),grid->GetTable()->GetColLabelValue(FCURRENTPEAK));
-	newMiddleODT.Replace(wxT("#FWAVE#"),replaceNewLine(mode,grid->GetCellValue(row,FWAVE),false));
-	newMiddleODT.Replace(wxT("#LWAVE#"),grid->GetTable()->GetColLabelValue(FWAVE));
-	newMiddleODT.Replace(wxT("#FWAVEPEAK#"),replaceNewLine(mode,grid->GetCellValue(row,FWAVEPEAK),false));
-	newMiddleODT.Replace(wxT("#LWAVEPEAK#"),grid->GetTable()->GetColLabelValue(FWAVEPEAK));
-	newMiddleODT.Replace(wxT("#FSWELL#"),replaceNewLine(mode,grid->GetCellValue(row,FSWELL),false));
-	newMiddleODT.Replace(wxT("#LSWELL#"),grid->GetTable()->GetColLabelValue(FSWELL));
-	newMiddleODT.Replace(wxT("#FSWELLPEAK#"),replaceNewLine(mode,grid->GetCellValue(row,FSWELLPEAK),false));
-	newMiddleODT.Replace(wxT("#LSWELLPEAK#"),grid->GetTable()->GetColLabelValue(FSWELLPEAK));
-	newMiddleODT.Replace(wxT("#FSAILS#"),replaceNewLine(mode,grid->GetCellValue(row,FSAILS),false));
-	newMiddleODT.Replace(wxT("#LSAILS#"),grid->GetTable()->GetColLabelValue(FSAILS));
+    wxString file = grid->GetCellValue( selectedRow,FLOG );
+    wxString route =  grid->GetCellValue( selectedRow,FROUTE );
+    wxString date =  grid->GetCellValue( selectedRow,FSTART );
+    wxString path  =  grid->GetCellValue( selectedRow,FPATH );
+
+    if ( logbook->data_locn != path )
+    {
+        logbook->data_locn = path;
+        logbook->loadSelectedData( path );
+    }
+
+    int i;
+    for ( i = 0; i < parent->m_gridGlobal->GetNumberRows(); i++ )
+    {
+        if ( parent->m_gridGlobal->GetCellValue( i,0 ) == route &&
+                parent->m_gridGlobal->GetCellValue( i,1 ) == date )
+            break;
+    }
+
+    parent->m_gridGlobal->MakeCellVisible( i,0 );
+    parent->m_gridGlobal->SelectRow( i );
+    parent->m_gridWeather->MakeCellVisible( i,0 );
+    parent->m_gridWeather->SelectRow( i );
+    parent->m_gridMotorSails->MakeCellVisible( i,0 );
+    parent->m_gridMotorSails->SelectRow( i );
+
+    parent->m_logbook->SetSelection( 0 );
+
+}
+
+wxString OverView::setPlaceHolders( int mode, wxGrid *grid, int row, wxString middle )
+{
+    wxString newMiddleODT = middle;
+
+    newMiddleODT.Replace( wxT( "#FLOG#" ),replaceNewLine( mode,grid->GetCellValue( row,FLOG ),false ) );
+    newMiddleODT.Replace( wxT( "#LLOG#" ),grid->GetTable()->GetColLabelValue( FLOG ) );
+    newMiddleODT.Replace( wxT( "#FROUTE#" ),replaceNewLine( mode,grid->GetCellValue( row,FROUTE ),false ) );
+    newMiddleODT.Replace( wxT( "#LROUTE#" ),grid->GetTable()->GetColLabelValue( FROUTE ) );
+    newMiddleODT.Replace( wxT( "#FSTART#" ),replaceNewLine( mode,grid->GetCellValue( row,FSTART ),false ) );
+    newMiddleODT.Replace( wxT( "#LSTART#" ),grid->GetTable()->GetColLabelValue( FSTART ) );
+    newMiddleODT.Replace( wxT( "#FEND#" ),replaceNewLine( mode,grid->GetCellValue( row,FEND ),false ) );
+    newMiddleODT.Replace( wxT( "#LEND#" ),grid->GetTable()->GetColLabelValue( FEND ) );
+    newMiddleODT.Replace( wxT( "#FJOURNEY#" ),replaceNewLine( mode,grid->GetCellValue( row,FJOURNEY ),false ) );
+    newMiddleODT.Replace( wxT( "#LJOURNEY#" ),grid->GetTable()->GetColLabelValue( FJOURNEY ) );
+    newMiddleODT.Replace( wxT( "#FDISTANCE#" ),replaceNewLine( mode,grid->GetCellValue( row,FDISTANCE ),false ) );
+    newMiddleODT.Replace( wxT( "#LDISTANCE#" ),grid->GetTable()->GetColLabelValue( FDISTANCE ) );
+    newMiddleODT.Replace( wxT( "#FETMAL#" ),replaceNewLine( mode,grid->GetCellValue( row,FETMAL ),false ) );
+    newMiddleODT.Replace( wxT( "#LETMAL#" ),grid->GetTable()->GetColLabelValue( FETMAL ) );
+    newMiddleODT.Replace( wxT( "#FBESTETMAL#" ),replaceNewLine( mode,grid->GetCellValue( row,FBESTETMAL ),false ) );
+    newMiddleODT.Replace( wxT( "#LBESTETMAL#" ),grid->GetTable()->GetColLabelValue( FBESTETMAL ) );
+    newMiddleODT.Replace( wxT( "#FSPEED#" ),replaceNewLine( mode,grid->GetCellValue( row,FSPEED ),false ) );
+    newMiddleODT.Replace( wxT( "#LSPEED#" ),grid->GetTable()->GetColLabelValue( FSPEED ) );
+    newMiddleODT.Replace( wxT( "#FBSPEED#" ),replaceNewLine( mode,grid->GetCellValue( row,FBSPEED ),false ) );
+    newMiddleODT.Replace( wxT( "#LBSPEED#" ),grid->GetTable()->GetColLabelValue( FBSPEED ) );
+    newMiddleODT.Replace( wxT( "#FENGINE1#" ),replaceNewLine( mode,grid->GetCellValue( row,FENGINE2 ),false ) );
+    newMiddleODT.Replace( wxT( "#LENGINE1#" ),grid->GetTable()->GetColLabelValue( FENGINE2 ) );
+    newMiddleODT.Replace( wxT( "#FGENERATOR#" ),replaceNewLine( mode,grid->GetCellValue( row,FGENERATOR ),false ) );
+    newMiddleODT.Replace( wxT( "#LGENERATOR#" ),grid->GetTable()->GetColLabelValue( FGENERATOR ) );
+    newMiddleODT.Replace( wxT( "#FWATERM#" ),replaceNewLine( mode,grid->GetCellValue( row,FWATERM ),false ) );
+    newMiddleODT.Replace( wxT( "#LWATERM#" ),grid->GetTable()->GetColLabelValue( FWATERM ) );
+    newMiddleODT.Replace( wxT( "#FWATERMO#" ),replaceNewLine( mode,grid->GetCellValue( row,FWATERMO ),false ) );
+    newMiddleODT.Replace( wxT( "#LWATERMO#" ),grid->GetTable()->GetColLabelValue( FWATERMO ) );
+    newMiddleODT.Replace( wxT( "#FBANK1G#" ),replaceNewLine( mode,grid->GetCellValue( row,FBANK1G ),false ) );
+    newMiddleODT.Replace( wxT( "#LBANK1G#" ),grid->GetTable()->GetColLabelValue( FBANK1G ) );
+    newMiddleODT.Replace( wxT( "#FBANK1U#" ),replaceNewLine( mode,grid->GetCellValue( row,FBANK1U ),false ) );
+    newMiddleODT.Replace( wxT( "#LBANK1U#" ),grid->GetTable()->GetColLabelValue( FBANK1U ) );
+    newMiddleODT.Replace( wxT( "#FBANK2G#" ),replaceNewLine( mode,grid->GetCellValue( row,FBANK2G ),false ) );
+    newMiddleODT.Replace( wxT( "#LBANK2G#" ),grid->GetTable()->GetColLabelValue( FBANK2G ) );
+    newMiddleODT.Replace( wxT( "#FBANK2U#" ),replaceNewLine( mode,grid->GetCellValue( row,FBANK2U ),false ) );
+    newMiddleODT.Replace( wxT( "#LBANK2U#" ),grid->GetTable()->GetColLabelValue( FBANK2U ) );
+
+    newMiddleODT.Replace( wxT( "#FENGINE#" ),replaceNewLine( mode,grid->GetCellValue( row,FENGINE1 ),false ) );
+    newMiddleODT.Replace( wxT( "#LENGINE#" ),grid->GetTable()->GetColLabelValue( FENGINE1 ) );
+    newMiddleODT.Replace( wxT( "#FFUEL#" ),replaceNewLine( mode,grid->GetCellValue( row,FFUEL ),false ) );
+    newMiddleODT.Replace( wxT( "#LFUEL#" ),grid->GetTable()->GetColLabelValue( FFUEL ) );
+    newMiddleODT.Replace( wxT( "#FWATER#" ),replaceNewLine( mode,grid->GetCellValue( row,FWATER ),false ) );
+    newMiddleODT.Replace( wxT( "#LWATER#" ),grid->GetTable()->GetColLabelValue( FWATER ) );
+    newMiddleODT.Replace( wxT( "#FWINDDIR#" ),replaceNewLine( mode,grid->GetCellValue( row,FWINDDIR ),false ) );
+    newMiddleODT.Replace( wxT( "#LWINDDIR#" ),grid->GetTable()->GetColLabelValue( FWINDDIR ) );
+    newMiddleODT.Replace( wxT( "#FWIND#" ),replaceNewLine( mode,grid->GetCellValue( row,FWIND ),false ) );
+    newMiddleODT.Replace( wxT( "#LWIND#" ),grid->GetTable()->GetColLabelValue( FWIND ) );
+    newMiddleODT.Replace( wxT( "#FWINDPEAK#" ),replaceNewLine( mode,grid->GetCellValue( row,FWINDPEAK ),false ) );
+    newMiddleODT.Replace( wxT( "#LWINDPEAK#" ),grid->GetTable()->GetColLabelValue( FWINDPEAK ) );
+    newMiddleODT.Replace( wxT( "#FCURRENTDIR#" ),replaceNewLine( mode,grid->GetCellValue( row,FCURRENTDIR ),false ) );
+    newMiddleODT.Replace( wxT( "#LCURRENTDIR#" ),grid->GetTable()->GetColLabelValue( FCURRENTDIR ) );
+
+    newMiddleODT.Replace( wxT( "#FCURRENT#" ),replaceNewLine( mode,grid->GetCellValue( row,FCURRENT ),false ) );
+    newMiddleODT.Replace( wxT( "#LCURRENT#" ),grid->GetTable()->GetColLabelValue( FCURRENT ) );
+    newMiddleODT.Replace( wxT( "#FCURRENTPEAK#" ),replaceNewLine( mode,grid->GetCellValue( row,FCURRENTPEAK ),false ) );
+    newMiddleODT.Replace( wxT( "#LCURRENTPEAK#" ),grid->GetTable()->GetColLabelValue( FCURRENTPEAK ) );
+    newMiddleODT.Replace( wxT( "#FWAVE#" ),replaceNewLine( mode,grid->GetCellValue( row,FWAVE ),false ) );
+    newMiddleODT.Replace( wxT( "#LWAVE#" ),grid->GetTable()->GetColLabelValue( FWAVE ) );
+    newMiddleODT.Replace( wxT( "#FWAVEPEAK#" ),replaceNewLine( mode,grid->GetCellValue( row,FWAVEPEAK ),false ) );
+    newMiddleODT.Replace( wxT( "#LWAVEPEAK#" ),grid->GetTable()->GetColLabelValue( FWAVEPEAK ) );
+    newMiddleODT.Replace( wxT( "#FSWELL#" ),replaceNewLine( mode,grid->GetCellValue( row,FSWELL ),false ) );
+    newMiddleODT.Replace( wxT( "#LSWELL#" ),grid->GetTable()->GetColLabelValue( FSWELL ) );
+    newMiddleODT.Replace( wxT( "#FSWELLPEAK#" ),replaceNewLine( mode,grid->GetCellValue( row,FSWELLPEAK ),false ) );
+    newMiddleODT.Replace( wxT( "#LSWELLPEAK#" ),grid->GetTable()->GetColLabelValue( FSWELLPEAK ) );
+    newMiddleODT.Replace( wxT( "#FSAILS#" ),replaceNewLine( mode,grid->GetCellValue( row,FSAILS ),false ) );
+    newMiddleODT.Replace( wxT( "#LSAILS#" ),grid->GetTable()->GetColLabelValue( FSAILS ) );
 
-	return newMiddleODT;
+    return newMiddleODT;
 }
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/OverView.h opencpn-plugin-logbookkonni-1.2024/src/OverView.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/OverView.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/OverView.h	2016-02-25 13:06:29.000000000 +0000
@@ -3,14 +3,14 @@
 #define _OVERVIEW_H_
 
 #ifndef  WX_PRECOMP
-  #include "wx/wx.h"
+#include "wx/wx.h"
 #endif //precompiled headers
 
 #include "wx/generic/gridctrl.h"
 #include <wx/textfile.h>
 #include <wx/tokenzr.h>
-#include <wx/wfstream.h> 
-#include <wx/txtstrm.h> 
+#include <wx/wfstream.h>
+#include <wx/txtstrm.h>
 
 #include "Export.h"
 
@@ -23,162 +23,165 @@
 
 using namespace std;
 
-struct total{
-	wxArrayString		sails;
+struct total
+{
+    wxArrayString		sails;
 
-	wxString			logbookStart;
-	wxString			logbookEnd;
-	wxString			logbookTimeStart;
-	wxString			logbookTimeEnd;
-	double				distance;
-	double				bestetmal;
-	double				speed;
-	double				speedpeak;
-	double				speedSTW;
-	double				speedpeakSTW;
-	int					enginehours;
-	int					enginemin;
-	int					enginehours2;
-	int					enginemin2;
-	int					watermhours;
-	int					watermmin;
-	double              watermo;
-	int					generatorhours;
-	int					generatormin;
-	double				bank1u;
-	double				bank2u;
-	double				bank1g;
-	double				bank2g;
-	double				fuel;
-	double				water;
-	double				winddir;
-	double				wind;
-	double				wave;
-	double				swell;
-	double				current;
-	double				currentdir;
-	double				windpeak;
-	double				wavepeak;
-	double				swellpeak;
-	double				currentpeak;
-
-	int					windcount;
-	int					currentcount;
-	int					wavecount;
-	int					swellcount;
-	int					etmalcount;
-	int					speedcount;
-	int					speedcountSTW;
+    wxString			logbookStart;
+    wxString			logbookEnd;
+    wxString			logbookTimeStart;
+    wxString			logbookTimeEnd;
+    double				distance;
+    double				bestetmal;
+    double				speed;
+    double				speedpeak;
+    double				speedSTW;
+    double				speedpeakSTW;
+    int					enginehours;
+    int					enginemin;
+    int					enginehours2;
+    int					enginemin2;
+    int					watermhours;
+    int					watermmin;
+    double              watermo;
+    int					generatorhours;
+    int					generatormin;
+    double				bank1u;
+    double				bank2u;
+    double				bank1g;
+    double				bank2g;
+    double				fuel;
+    double				water;
+    double				winddir;
+    double				wind;
+    double				wave;
+    double				swell;
+    double				current;
+    double				currentdir;
+    double				windpeak;
+    double				wavepeak;
+    double				swellpeak;
+    double				currentpeak;
+
+    int					windcount;
+    int					currentcount;
+    int					wavecount;
+    int					swellcount;
+    int					etmalcount;
+    int					speedcount;
+    int					speedcountSTW;
 };
 
 class OverView : public Export
 {
 public:
-	enum gridfields{FLOG, FROUTE, FSTART, FEND, FJOURNEY, FDISTANCE, FETMAL, FBESTETMAL, FSPEED, FBSPEED,/* FSPEEDSTW, FBSPEEDSTW,*/ FENGINE1, FENGINE2,FFUEL, 
-		            FGENERATOR,FBANK1G,FBANK1U,FBANK2G,FBANK2U,FWATERM,FWATERMO,FWATER, FWINDDIR, FWIND, FWINDPEAK, 
-					FCURRENTDIR, FCURRENT, FCURRENTPEAK, FWAVE, FWAVEPEAK, FSWELL, FSWELLPEAK, FSAILS, FPATH };
-	OverView(LogbookDialog* d, wxString data, wxString lay, wxString layoutODT);
-	~OverView(void);
-
-	void refresh();
-	void actuellLogbook();
-	void allLogbooks();
-	void selectLogbook();
-	void setSelectedRow(int row);
-	void gotoRoute();
-	void setLayoutLocation();
-	void viewODT(wxString path,wxString layout,int mode);
-	void viewHTML(wxString path,wxString layout,int mode);
-	wxString toODT(wxString path,wxString layout,int mode);
-	wxString toHTML(wxString path,wxString layout,int mode);
+    enum gridfields {FLOG, FROUTE, FSTART, FEND, FJOURNEY, FDISTANCE, FETMAL, FBESTETMAL, FSPEED, FBSPEED,/* FSPEEDSTW, FBSPEEDSTW,*/ FENGINE1, FENGINE2,FFUEL,
+                     FGENERATOR,FBANK1G,FBANK1U,FBANK2G,FBANK2U,FWATERM,FWATERMO,FWATER, FWINDDIR, FWIND, FWINDPEAK,
+                     FCURRENTDIR, FCURRENT, FCURRENTPEAK, FWAVE, FWAVEPEAK, FSWELL, FSWELLPEAK, FSAILS, FPATH
+                    };
+    OverView( LogbookDialog* d, wxString data, wxString lay, wxString layoutODT );
+    ~OverView( void );
+
+    void refresh();
+    void actualLogbook();
+    void allLogbooks();
+    void selectLogbook();
+    void setSelectedRow( int row );
+    void gotoRoute();
+    void setLayoutLocation();
+    void viewODT( wxString path,wxString layout,int mode );
+    void viewHTML( wxString path,wxString layout,int mode );
+    wxString toODT( wxString path,wxString layout,int mode );
+    wxString toHTML( wxString path,wxString layout,int mode );
 
-	wxString			layout_locn;
-	struct total		oneLogbookTotal;
+    wxString			layout_locn;
+    struct total		oneLogbookTotal;
 
 private:
-	enum logfields{ROUTE,DATEM, DATED, DATEY,TIMEH, TIMEM, TIMES, STATUS, WATCH, DISTANCE, DISTANCETOTAL, POSITION, COG, HEADING, SOG, STW, DEPTH, REMARKS, 
-		           BAROMETER, WIND, WINDFORCE, CURRENT, CURRENTFORCE, WAVE, SWELL, WEATHER,	CLOUDS, VISIBILITY, 
-				   ENGINE1, ENGINE1T,FUEL, FUELTOTAL,  SAILS, REEF, WATER, WATERTOTAL, MREMARKS, 
-				   HYDRO, TEMPAIR, TEMPWATER, ENGINE2, ENGINE2T, GENERATOR, GENERATORT, BANK1, BANK1T, BANK2, BANK2T,
-	               WATERM, WATERMT, WATERMO};
-
-	void loadLogbookData(wxString filename, bool colour);
-	void loadAllLogbooks();
-	void writeSumColumn(int row, wxString logbook, wxString path, bool colour);
-	void writeSumColumnLogbook(total data, int row, wxString logbook, bool colour);
-	void resetValues();
-	void clearGrid();
-	wxString setPlaceHolders(int mode, wxGrid *grid, int row, wxString middle);
-	void oneLogbookTotalReset();
-
-	LogbookDialog*		parent;
-	wxGrid*				grid;
-	Options*			opt;
-	Logbook*			logbook;
-	wxString			selectedLogbook;
-
-	int					row;
-	int					selectedRow;
-
-	wxString			ODTLayout_locn;
-	wxString			HTMLLayout_locn;
-	wxString			data_locn;
-	wxString			data_file;
-	wxArrayString		logbooks;
-	wxArrayString		sails;
-
-	wxString			startdate;
-	wxString			enddate;
-	wxString			starttime;
-	wxString			endtime;
-	wxString			date;
-	wxString			etmaldate;
-	double				distance;
-	double				etmal;
-	double				bestetmal;
-	double				bestetmaltemp;
-	double				speed;
-	double				speedpeak;
-	double				speedSTW;
-	double				speedpeakSTW;
-	int					enginehours;
-	int					enginemin;
-	int					enginehours2;
-	int					enginemin2;
-	int					watermhours;
-	int					watermmin;
-	double              watermo;
-	int					generatorhours;
-	int					generatormin;
-	double				bank1u;
-	double				bank2u;
-	double				bank1g;
-	double				bank2g;
-	double				fuel;
-	double				water;
-	double				winddir;
-	double				wind;
-	double				wave;
-	double				swell;
-	double				current;
-	double				currentdir;
-	double				windpeak;
-	double				wavepeak;
-	double				swellpeak;
-	double				currentpeak;
-
-	int					windcount;
-	int					currentcount;
-	int					wavecount;
-	int					swellcount;
-	int					etmalcount;
-	int					speedcount;
-	int					speedcountSTW;
-	wxString			sign;
-	bool				showAllLogbooks;
-
-	typedef std::map<wxString, int> collection;
-	typedef std::pair<wxString, int> pair;
-	collection t_coll;
+    enum logfields {ROUTE,DATEM, DATED, DATEY,TIMEH, TIMEM, TIMES, STATUS, WATCH, DISTANCE, DISTANCETOTAL, POSITION, COG, HEADING, SOG, STW, DEPTH, REMARKS,
+                    BAROMETER, WIND, WINDFORCE, CURRENT, CURRENTFORCE, WAVE, SWELL, WEATHER,	CLOUDS, VISIBILITY,
+                    ENGINE1, ENGINE1T,FUEL, FUELTOTAL,  SAILS, REEF, WATER, WATERTOTAL, MREMARKS,
+                    HYDRO, TEMPAIR, TEMPWATER, ENGINE2, ENGINE2T, GENERATOR, GENERATORT, BANK1, BANK1T, BANK2, BANK2T,
+                    WATERM, WATERMT, WATERMO
+                   };
+
+    void loadLogbookData( wxString filename, bool colour );
+    void loadAllLogbooks();
+    void writeSumColumn( int row, wxString logbook, wxString path, bool colour );
+    void writeSumColumnLogbook( total data, int row, wxString logbook, bool colour );
+    void resetValues();
+    void clearGrid();
+    wxString setPlaceHolders( int mode, wxGrid *grid, int row, wxString middle );
+    void oneLogbookTotalReset();
+
+    LogbookDialog*		parent;
+    wxGrid*				grid;
+    Options*			opt;
+    Logbook*			logbook;
+    wxString			selectedLogbook;
+
+    int					row;
+    int					selectedRow;
+
+    wxString			ODTLayout_locn;
+    wxString			HTMLLayout_locn;
+    wxString			data_locn;
+    wxString			data_file;
+    wxArrayString		logbooks;
+    wxArrayString		sails;
+
+    wxString			startdate;
+    wxString			enddate;
+    wxString			starttime;
+    wxString			endtime;
+    wxString			date;
+    wxString			etmaldate;
+    double				distance;
+    double				etmal;
+    double				bestetmal;
+    double				bestetmaltemp;
+    double				speed;
+    double				speedpeak;
+    double				speedSTW;
+    double				speedpeakSTW;
+    int					enginehours;
+    int					enginemin;
+    int					enginehours2;
+    int					enginemin2;
+    int					watermhours;
+    int					watermmin;
+    double              watermo;
+    int					generatorhours;
+    int					generatormin;
+    double				bank1u;
+    double				bank2u;
+    double				bank1g;
+    double				bank2g;
+    double				fuel;
+    double				water;
+    double				winddir;
+    double				wind;
+    double				wave;
+    double				swell;
+    double				current;
+    double				currentdir;
+    double				windpeak;
+    double				wavepeak;
+    double				swellpeak;
+    double				currentpeak;
+
+    int					windcount;
+    int					currentcount;
+    int					wavecount;
+    int					swellcount;
+    int					etmalcount;
+    int					speedcount;
+    int					speedcountSTW;
+    wxString			sign;
+    bool				showAllLogbooks;
+
+    typedef std::map<wxString, int> collection;
+    typedef std::pair<wxString, int> pair;
+    collection t_coll;
 };
 #endif
\ No newline at end of file
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinystr.cpp opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinystr.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinystr.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinystr.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -27,84 +27,84 @@
 #include "tinystr.h"
 
 // Error value for find primitive
-const TiXmlString::size_type TiXmlString::npos = static_cast< TiXmlString::size_type >(-1);
+const TiXmlString::size_type TiXmlString::npos = static_cast< TiXmlString::size_type >( -1 );
 
 
 // Null rep.
 TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, { '\0' } };
 
 
-void TiXmlString::reserve (size_type cap)
+void TiXmlString::reserve ( size_type cap )
 {
-	if (cap > capacity())
-	{
-		TiXmlString tmp;
-		tmp.init(length(), cap);
-		memcpy(tmp.start(), data(), length());
-		swap(tmp);
-	}
+    if ( cap > capacity() )
+    {
+        TiXmlString tmp;
+        tmp.init( length(), cap );
+        memcpy( tmp.start(), data(), length() );
+        swap( tmp );
+    }
 }
 
 
-TiXmlString& TiXmlString::assign(const char* str, size_type len)
+TiXmlString& TiXmlString::assign( const char* str, size_type len )
 {
-	size_type cap = capacity();
-	if (len > cap || cap > 3*(len + 8))
-	{
-		TiXmlString tmp;
-		tmp.init(len);
-		memcpy(tmp.start(), str, len);
-		swap(tmp);
-	}
-	else
-	{
-		memmove(start(), str, len);
-		set_size(len);
-	}
-	return *this;
+    size_type cap = capacity();
+    if ( len > cap || cap > 3*( len + 8 ) )
+    {
+        TiXmlString tmp;
+        tmp.init( len );
+        memcpy( tmp.start(), str, len );
+        swap( tmp );
+    }
+    else
+    {
+        memmove( start(), str, len );
+        set_size( len );
+    }
+    return *this;
 }
 
 
-TiXmlString& TiXmlString::append(const char* str, size_type len)
+TiXmlString& TiXmlString::append( const char* str, size_type len )
 {
-	size_type newsize = length() + len;
-	if (newsize > capacity())
-	{
-		reserve (newsize + capacity());
-	}
-	memmove(finish(), str, len);
-	set_size(newsize);
-	return *this;
+    size_type newsize = length() + len;
+    if ( newsize > capacity() )
+    {
+        reserve ( newsize + capacity() );
+    }
+    memmove( finish(), str, len );
+    set_size( newsize );
+    return *this;
 }
 
 
-TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
+TiXmlString operator + ( const TiXmlString & a, const TiXmlString & b )
 {
-	TiXmlString tmp;
-	tmp.reserve(a.length() + b.length());
-	tmp += a;
-	tmp += b;
-	return tmp;
+    TiXmlString tmp;
+    tmp.reserve( a.length() + b.length() );
+    tmp += a;
+    tmp += b;
+    return tmp;
 }
 
-TiXmlString operator + (const TiXmlString & a, const char* b)
+TiXmlString operator + ( const TiXmlString & a, const char* b )
 {
-	TiXmlString tmp;
-	TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen(b) );
-	tmp.reserve(a.length() + b_len);
-	tmp += a;
-	tmp.append(b, b_len);
-	return tmp;
+    TiXmlString tmp;
+    TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen( b ) );
+    tmp.reserve( a.length() + b_len );
+    tmp += a;
+    tmp.append( b, b_len );
+    return tmp;
 }
 
-TiXmlString operator + (const char* a, const TiXmlString & b)
+TiXmlString operator + ( const char* a, const TiXmlString & b )
 {
-	TiXmlString tmp;
-	TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen(a) );
-	tmp.reserve(a_len + b.length());
-	tmp.append(a, a_len);
-	tmp += b;
-	return tmp;
+    TiXmlString tmp;
+    TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen( a ) );
+    tmp.reserve( a_len + b.length() );
+    tmp.append( a, a_len );
+    tmp += b;
+    return tmp;
 }
 
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinystr.h opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinystr.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinystr.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinystr.h	2016-02-25 13:06:29.000000000 +0000
@@ -35,13 +35,13 @@
 	used. Be nice to old compilers and macro it here:
 */
 #if defined(_MSC_VER) && (_MSC_VER >= 1200 )
-	// Microsoft visual studio, version 6 and higher.
-	#define TIXML_EXPLICIT explicit
+// Microsoft visual studio, version 6 and higher.
+#define TIXML_EXPLICIT explicit
 #elif defined(__GNUC__) && (__GNUC__ >= 3 )
-	// GCC version 3 and higher.s
-	#define TIXML_EXPLICIT explicit
+// GCC version 3 and higher.s
+#define TIXML_EXPLICIT explicit
 #else
-	#define TIXML_EXPLICIT
+#define TIXML_EXPLICIT
 #endif
 
 
@@ -54,227 +54,281 @@
 */
 class TiXmlString
 {
-  public :
-	// The size type used
-  	typedef size_t size_type;
-
-	// Error value for find primitive
-	static const size_type npos; // = -1;
-
-
-	// TiXmlString empty constructor
-	TiXmlString () : rep_(&nullrep_)
-	{
-	}
-
-	// TiXmlString copy constructor
-	TiXmlString ( const TiXmlString & copy) : rep_(0)
-	{
-		init(copy.length());
-		memcpy(start(), copy.data(), length());
-	}
-
-	// TiXmlString constructor, based on a string
-	TIXML_EXPLICIT TiXmlString ( const char * copy) : rep_(0)
-	{
-		init( static_cast<size_type>( strlen(copy) ));
-		memcpy(start(), copy, length());
-	}
-
-	// TiXmlString constructor, based on a string
-	TIXML_EXPLICIT TiXmlString ( const char * str, size_type len) : rep_(0)
-	{
-		init(len);
-		memcpy(start(), str, len);
-	}
-
-	// TiXmlString destructor
-	~TiXmlString ()
-	{
-		quit();
-	}
-
-	TiXmlString& operator = (const char * copy)
-	{
-		return assign( copy, (size_type)strlen(copy));
-	}
-
-	TiXmlString& operator = (const TiXmlString & copy)
-	{
-		return assign(copy.start(), copy.length());
-	}
-
-
-	// += operator. Maps to append
-	TiXmlString& operator += (const char * suffix)
-	{
-		return append(suffix, static_cast<size_type>( strlen(suffix) ));
-	}
-
-	// += operator. Maps to append
-	TiXmlString& operator += (char single)
-	{
-		return append(&single, 1);
-	}
-
-	// += operator. Maps to append
-	TiXmlString& operator += (const TiXmlString & suffix)
-	{
-		return append(suffix.data(), suffix.length());
-	}
-
-
-	// Convert a TiXmlString into a null-terminated char *
-	const char * c_str () const { return rep_->str; }
-
-	// Convert a TiXmlString into a char * (need not be null terminated).
-	const char * data () const { return rep_->str; }
-
-	// Return the length of a TiXmlString
-	size_type length () const { return rep_->size; }
-
-	// Alias for length()
-	size_type size () const { return rep_->size; }
-
-	// Checks if a TiXmlString is empty
-	bool empty () const { return rep_->size == 0; }
-
-	// Return capacity of string
-	size_type capacity () const { return rep_->capacity; }
-
-
-	// single char extraction
-	const char& at (size_type index) const
-	{
-		assert( index < length() );
-		return rep_->str[ index ];
-	}
-
-	// [] operator
-	char& operator [] (size_type index) const
-	{
-		assert( index < length() );
-		return rep_->str[ index ];
-	}
-
-	// find a char in a string. Return TiXmlString::npos if not found
-	size_type find (char lookup) const
-	{
-		return find(lookup, 0);
-	}
-
-	// find a char in a string from an offset. Return TiXmlString::npos if not found
-	size_type find (char tofind, size_type offset) const
-	{
-		if (offset >= length()) return npos;
-
-		for (const char* p = c_str() + offset; *p != '\0'; ++p)
-		{
-		   if (*p == tofind) return static_cast< size_type >( p - c_str() );
-		}
-		return npos;
-	}
-
-	void clear ()
-	{
-		//Lee:
-		//The original was just too strange, though correct:
-		//	TiXmlString().swap(*this);
-		//Instead use the quit & re-init:
-		quit();
-		init(0,0);
-	}
-
-	/*	Function to reserve a big amount of data when we know we'll need it. Be aware that this
-		function DOES NOT clear the content of the TiXmlString if any exists.
-	*/
-	void reserve (size_type cap);
-
-	TiXmlString& assign (const char* str, size_type len);
-
-	TiXmlString& append (const char* str, size_type len);
-
-	void swap (TiXmlString& other)
-	{
-		Rep* r = rep_;
-		rep_ = other.rep_;
-		other.rep_ = r;
-	}
-
-  private:
-
-	void init(size_type sz) { init(sz, sz); }
-	void set_size(size_type sz) { rep_->str[ rep_->size = sz ] = '\0'; }
-	char* start() const { return rep_->str; }
-	char* finish() const { return rep_->str + rep_->size; }
-
-	struct Rep
-	{
-		size_type size, capacity;
-		char str[1];
-	};
-
-	void init(size_type sz, size_type cap)
-	{
-		if (cap)
-		{
-			// Lee: the original form:
-			//	rep_ = static_cast<Rep*>(operator new(sizeof(Rep) + cap));
-			// doesn't work in some cases of new being overloaded. Switching
-			// to the normal allocation, although use an 'int' for systems
-			// that are overly picky about structure alignment.
-			const size_type bytesNeeded = sizeof(Rep) + cap;
-			const size_type intsNeeded = ( bytesNeeded + sizeof(int) - 1 ) / sizeof( int ); 
-			rep_ = reinterpret_cast<Rep*>( new int[ intsNeeded ] );
-
-			rep_->str[ rep_->size = sz ] = '\0';
-			rep_->capacity = cap;
-		}
-		else
-		{
-			rep_ = &nullrep_;
-		}
-	}
-
-	void quit()
-	{
-		if (rep_ != &nullrep_)
-		{
-			// The rep_ is really an array of ints. (see the allocator, above).
-			// Cast it back before delete, so the compiler won't incorrectly call destructors.
-			delete [] ( reinterpret_cast<int*>( rep_ ) );
-		}
-	}
+public :
+    // The size type used
+    typedef size_t size_type;
+
+    // Error value for find primitive
+    static const size_type npos; // = -1;
+
 
-	Rep * rep_;
-	static Rep nullrep_;
+    // TiXmlString empty constructor
+    TiXmlString () : rep_( &nullrep_ )
+    {
+    }
+
+    // TiXmlString copy constructor
+    TiXmlString ( const TiXmlString & copy ) : rep_( 0 )
+    {
+        init( copy.length() );
+        memcpy( start(), copy.data(), length() );
+    }
+
+    // TiXmlString constructor, based on a string
+    TIXML_EXPLICIT TiXmlString ( const char * copy ) : rep_( 0 )
+    {
+        init( static_cast<size_type>( strlen( copy ) ) );
+        memcpy( start(), copy, length() );
+    }
+
+    // TiXmlString constructor, based on a string
+    TIXML_EXPLICIT TiXmlString ( const char * str, size_type len ) : rep_( 0 )
+    {
+        init( len );
+        memcpy( start(), str, len );
+    }
+
+    // TiXmlString destructor
+    ~TiXmlString ()
+    {
+        quit();
+    }
+
+    TiXmlString& operator = ( const char * copy )
+    {
+        return assign( copy, ( size_type )strlen( copy ) );
+    }
+
+    TiXmlString& operator = ( const TiXmlString & copy )
+    {
+        return assign( copy.start(), copy.length() );
+    }
+
+
+    // += operator. Maps to append
+    TiXmlString& operator += ( const char * suffix )
+    {
+        return append( suffix, static_cast<size_type>( strlen( suffix ) ) );
+    }
+
+    // += operator. Maps to append
+    TiXmlString& operator += ( char single )
+    {
+        return append( &single, 1 );
+    }
+
+    // += operator. Maps to append
+    TiXmlString& operator += ( const TiXmlString & suffix )
+    {
+        return append( suffix.data(), suffix.length() );
+    }
+
+
+    // Convert a TiXmlString into a null-terminated char *
+    const char * c_str () const
+    {
+        return rep_->str;
+    }
+
+    // Convert a TiXmlString into a char * (need not be null terminated).
+    const char * data () const
+    {
+        return rep_->str;
+    }
+
+    // Return the length of a TiXmlString
+    size_type length () const
+    {
+        return rep_->size;
+    }
+
+    // Alias for length()
+    size_type size () const
+    {
+        return rep_->size;
+    }
+
+    // Checks if a TiXmlString is empty
+    bool empty () const
+    {
+        return rep_->size == 0;
+    }
+
+    // Return capacity of string
+    size_type capacity () const
+    {
+        return rep_->capacity;
+    }
+
+
+    // single char extraction
+    const char& at ( size_type index ) const
+    {
+        assert( index < length() );
+        return rep_->str[ index ];
+    }
+
+    // [] operator
+    char& operator [] ( size_type index ) const
+    {
+        assert( index < length() );
+        return rep_->str[ index ];
+    }
+
+    // find a char in a string. Return TiXmlString::npos if not found
+    size_type find ( char lookup ) const
+    {
+        return find( lookup, 0 );
+    }
+
+    // find a char in a string from an offset. Return TiXmlString::npos if not found
+    size_type find ( char tofind, size_type offset ) const
+    {
+        if ( offset >= length() ) return npos;
+
+        for ( const char* p = c_str() + offset; *p != '\0'; ++p )
+        {
+            if ( *p == tofind ) return static_cast< size_type >( p - c_str() );
+        }
+        return npos;
+    }
+
+    void clear ()
+    {
+        //Lee:
+        //The original was just too strange, though correct:
+        //	TiXmlString().swap(*this);
+        //Instead use the quit & re-init:
+        quit();
+        init( 0,0 );
+    }
+
+    /*	Function to reserve a big amount of data when we know we'll need it. Be aware that this
+    	function DOES NOT clear the content of the TiXmlString if any exists.
+    */
+    void reserve ( size_type cap );
+
+    TiXmlString& assign ( const char* str, size_type len );
+
+    TiXmlString& append ( const char* str, size_type len );
+
+    void swap ( TiXmlString& other )
+    {
+        Rep* r = rep_;
+        rep_ = other.rep_;
+        other.rep_ = r;
+    }
+
+private:
+
+    void init( size_type sz )
+    {
+        init( sz, sz );
+    }
+    void set_size( size_type sz )
+    {
+        rep_->str[ rep_->size = sz ] = '\0';
+    }
+    char* start() const
+    {
+        return rep_->str;
+    }
+    char* finish() const
+    {
+        return rep_->str + rep_->size;
+    }
+
+    struct Rep
+    {
+        size_type size, capacity;
+        char str[1];
+    };
+
+    void init( size_type sz, size_type cap )
+    {
+        if ( cap )
+        {
+            // Lee: the original form:
+            //	rep_ = static_cast<Rep*>(operator new(sizeof(Rep) + cap));
+            // doesn't work in some cases of new being overloaded. Switching
+            // to the normal allocation, although use an 'int' for systems
+            // that are overly picky about structure alignment.
+            const size_type bytesNeeded = sizeof( Rep ) + cap;
+            const size_type intsNeeded = ( bytesNeeded + sizeof( int ) - 1 ) / sizeof( int );
+            rep_ = reinterpret_cast<Rep*>( new int[ intsNeeded ] );
+
+            rep_->str[ rep_->size = sz ] = '\0';
+            rep_->capacity = cap;
+        }
+        else
+        {
+            rep_ = &nullrep_;
+        }
+    }
+
+    void quit()
+    {
+        if ( rep_ != &nullrep_ )
+        {
+            // The rep_ is really an array of ints. (see the allocator, above).
+            // Cast it back before delete, so the compiler won't incorrectly call destructors.
+            delete [] ( reinterpret_cast<int*>( rep_ ) );
+        }
+    }
+
+    Rep * rep_;
+    static Rep nullrep_;
 
 } ;
 
 
-inline bool operator == (const TiXmlString & a, const TiXmlString & b)
+inline bool operator == ( const TiXmlString & a, const TiXmlString & b )
+{
+    return    ( a.length() == b.length() )				// optimization on some platforms
+              && ( strcmp( a.c_str(), b.c_str() ) == 0 );	// actual compare
+}
+inline bool operator < ( const TiXmlString & a, const TiXmlString & b )
+{
+    return strcmp( a.c_str(), b.c_str() ) < 0;
+}
+
+inline bool operator != ( const TiXmlString & a, const TiXmlString & b )
+{
+    return !( a == b );
+}
+inline bool operator >  ( const TiXmlString & a, const TiXmlString & b )
+{
+    return b < a;
+}
+inline bool operator <= ( const TiXmlString & a, const TiXmlString & b )
+{
+    return !( b < a );
+}
+inline bool operator >= ( const TiXmlString & a, const TiXmlString & b )
+{
+    return !( a < b );
+}
+
+inline bool operator == ( const TiXmlString & a, const char* b )
+{
+    return strcmp( a.c_str(), b ) == 0;
+}
+inline bool operator == ( const char* a, const TiXmlString & b )
+{
+    return b == a;
+}
+inline bool operator != ( const TiXmlString & a, const char* b )
 {
-	return    ( a.length() == b.length() )				// optimization on some platforms
-	       && ( strcmp(a.c_str(), b.c_str()) == 0 );	// actual compare
+    return !( a == b );
 }
-inline bool operator < (const TiXmlString & a, const TiXmlString & b)
+inline bool operator != ( const char* a, const TiXmlString & b )
 {
-	return strcmp(a.c_str(), b.c_str()) < 0;
+    return !( b == a );
 }
 
-inline bool operator != (const TiXmlString & a, const TiXmlString & b) { return !(a == b); }
-inline bool operator >  (const TiXmlString & a, const TiXmlString & b) { return b < a; }
-inline bool operator <= (const TiXmlString & a, const TiXmlString & b) { return !(b < a); }
-inline bool operator >= (const TiXmlString & a, const TiXmlString & b) { return !(a < b); }
-
-inline bool operator == (const TiXmlString & a, const char* b) { return strcmp(a.c_str(), b) == 0; }
-inline bool operator == (const char* a, const TiXmlString & b) { return b == a; }
-inline bool operator != (const TiXmlString & a, const char* b) { return !(a == b); }
-inline bool operator != (const char* a, const TiXmlString & b) { return !(b == a); }
-
-TiXmlString operator + (const TiXmlString & a, const TiXmlString & b);
-TiXmlString operator + (const TiXmlString & a, const char* b);
-TiXmlString operator + (const char* a, const TiXmlString & b);
+TiXmlString operator + ( const TiXmlString & a, const TiXmlString & b );
+TiXmlString operator + ( const TiXmlString & a, const char* b );
+TiXmlString operator + ( const char* a, const TiXmlString & b );
 
 
 /*
@@ -285,19 +339,19 @@
 {
 public :
 
-	// TiXmlOutStream << operator.
-	TiXmlOutStream & operator << (const TiXmlString & in)
-	{
-		*this += in;
-		return *this;
-	}
-
-	// TiXmlOutStream << operator.
-	TiXmlOutStream & operator << (const char * in)
-	{
-		*this += in;
-		return *this;
-	}
+    // TiXmlOutStream << operator.
+    TiXmlOutStream & operator << ( const TiXmlString & in )
+    {
+        *this += in;
+        return *this;
+    }
+
+    // TiXmlOutStream << operator.
+    TiXmlOutStream & operator << ( const char * in )
+    {
+        *this += in;
+        return *this;
+    }
 
 } ;
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxml.cpp opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxml.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxml.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxml.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -38,670 +38,682 @@
 // Microsoft compiler security
 FILE* TiXmlFOpen( const char* filename, const char* mode )
 {
-	#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
-		FILE* fp = 0;
-		errno_t err = fopen_s( &fp, filename, mode );
-		if ( !err && fp )
-			return fp;
-		return 0;
-	#else
-		return fopen( filename, mode );
-	#endif
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+    FILE* fp = 0;
+    errno_t err = fopen_s( &fp, filename, mode );
+    if ( !err && fp )
+        return fp;
+    return 0;
+#else
+    return fopen( filename, mode );
+#endif
 }
 
 void TiXmlBase::EncodeString( const TIXML_STRING& str, TIXML_STRING* outString )
 {
-	int i=0;
+    int i=0;
+
+    while ( i<( int )str.length() )
+    {
+        unsigned char c = ( unsigned char ) str[i];
+
+        if (    c == '&'
+                && i < ( ( int )str.length() - 2 )
+                && str[i+1] == '#'
+                && str[i+2] == 'x' )
+        {
+            // Hexadecimal character reference.
+            // Pass through unchanged.
+            // &#xA9;	-- copyright symbol, for example.
+            //
+            // The -1 is a bug fix from Rob Laveaux. It keeps
+            // an overflow from happening if there is no ';'.
+            // There are actually 2 ways to exit this loop -
+            // while fails (error case) and break (semicolon found).
+            // However, there is no mechanism (currently) for
+            // this function to return an error.
+            while ( i<( int )str.length()-1 )
+            {
+                outString->append( str.c_str() + i, 1 );
+                ++i;
+                if ( str[i] == ';' )
+                    break;
+            }
+        }
+        else if ( c == '&' )
+        {
+            outString->append( entity[0].str, entity[0].strLength );
+            ++i;
+        }
+        else if ( c == '<' )
+        {
+            outString->append( entity[1].str, entity[1].strLength );
+            ++i;
+        }
+        else if ( c == '>' )
+        {
+            outString->append( entity[2].str, entity[2].strLength );
+            ++i;
+        }
+        else if ( c == '\"' )
+        {
+            outString->append( entity[3].str, entity[3].strLength );
+            ++i;
+        }
+        else if ( c == '\'' )
+        {
+            outString->append( entity[4].str, entity[4].strLength );
+            ++i;
+        }
+        else if ( c < 32 )
+        {
+            // Easy pass at non-alpha/numeric/symbol
+            // Below 32 is symbolic.
+            char buf[ 32 ];
+
+#if defined(TIXML_SNPRINTF)
+            TIXML_SNPRINTF( buf, sizeof( buf ), "&#x%02X;", ( unsigned ) ( c & 0xff ) );
+#else
+            sprintf( buf, "&#x%02X;", ( unsigned ) ( c & 0xff ) );
+#endif
 
-	while( i<(int)str.length() )
-	{
-		unsigned char c = (unsigned char) str[i];
-
-		if (    c == '&' 
-		     && i < ( (int)str.length() - 2 )
-			 && str[i+1] == '#'
-			 && str[i+2] == 'x' )
-		{
-			// Hexadecimal character reference.
-			// Pass through unchanged.
-			// &#xA9;	-- copyright symbol, for example.
-			//
-			// The -1 is a bug fix from Rob Laveaux. It keeps
-			// an overflow from happening if there is no ';'.
-			// There are actually 2 ways to exit this loop -
-			// while fails (error case) and break (semicolon found).
-			// However, there is no mechanism (currently) for
-			// this function to return an error.
-			while ( i<(int)str.length()-1 )
-			{
-				outString->append( str.c_str() + i, 1 );
-				++i;
-				if ( str[i] == ';' )
-					break;
-			}
-		}
-		else if ( c == '&' )
-		{
-			outString->append( entity[0].str, entity[0].strLength );
-			++i;
-		}
-		else if ( c == '<' )
-		{
-			outString->append( entity[1].str, entity[1].strLength );
-			++i;
-		}
-		else if ( c == '>' )
-		{
-			outString->append( entity[2].str, entity[2].strLength );
-			++i;
-		}
-		else if ( c == '\"' )
-		{
-			outString->append( entity[3].str, entity[3].strLength );
-			++i;
-		}
-		else if ( c == '\'' )
-		{
-			outString->append( entity[4].str, entity[4].strLength );
-			++i;
-		}
-		else if ( c < 32 )
-		{
-			// Easy pass at non-alpha/numeric/symbol
-			// Below 32 is symbolic.
-			char buf[ 32 ];
-			
-			#if defined(TIXML_SNPRINTF)		
-				TIXML_SNPRINTF( buf, sizeof(buf), "&#x%02X;", (unsigned) ( c & 0xff ) );
-			#else
-				sprintf( buf, "&#x%02X;", (unsigned) ( c & 0xff ) );
-			#endif		
-
-			//*ME:	warning C4267: convert 'size_t' to 'int'
-			//*ME:	Int-Cast to make compiler happy ...
-			outString->append( buf, (int)strlen( buf ) );
-			++i;
-		}
-		else
-		{
-			//char realc = (char) c;
-			//outString->append( &realc, 1 );
-			*outString += (char) c;	// somewhat more efficient function call.
-			++i;
-		}
-	}
+            //*ME:	warning C4267: convert 'size_t' to 'int'
+            //*ME:	Int-Cast to make compiler happy ...
+            outString->append( buf, ( int )strlen( buf ) );
+            ++i;
+        }
+        else
+        {
+            //char realc = (char) c;
+            //outString->append( &realc, 1 );
+            *outString += ( char ) c;	// somewhat more efficient function call.
+            ++i;
+        }
+    }
 }
 
 
 TiXmlNode::TiXmlNode( NodeType _type ) : TiXmlBase()
 {
-	parent = 0;
-	type = _type;
-	firstChild = 0;
-	lastChild = 0;
-	prev = 0;
-	next = 0;
+    parent = 0;
+    type = _type;
+    firstChild = 0;
+    lastChild = 0;
+    prev = 0;
+    next = 0;
 }
 
 
 TiXmlNode::~TiXmlNode()
 {
-	TiXmlNode* node = firstChild;
-	TiXmlNode* temp = 0;
+    TiXmlNode* node = firstChild;
+    TiXmlNode* temp = 0;
 
-	while ( node )
-	{
-		temp = node;
-		node = node->next;
-		delete temp;
-	}	
+    while ( node )
+    {
+        temp = node;
+        node = node->next;
+        delete temp;
+    }
 }
 
 
 void TiXmlNode::CopyTo( TiXmlNode* target ) const
 {
-	target->SetValue (value.c_str() );
-	target->userData = userData; 
-	target->location = location;
+    target->SetValue ( value.c_str() );
+    target->userData = userData;
+    target->location = location;
 }
 
 
 void TiXmlNode::Clear()
 {
-	TiXmlNode* node = firstChild;
-	TiXmlNode* temp = 0;
+    TiXmlNode* node = firstChild;
+    TiXmlNode* temp = 0;
 
-	while ( node )
-	{
-		temp = node;
-		node = node->next;
-		delete temp;
-	}	
+    while ( node )
+    {
+        temp = node;
+        node = node->next;
+        delete temp;
+    }
 
-	firstChild = 0;
-	lastChild = 0;
+    firstChild = 0;
+    lastChild = 0;
 }
 
 
 TiXmlNode* TiXmlNode::LinkEndChild( TiXmlNode* node )
 {
-	assert( node->parent == 0 || node->parent == this );
-	assert( node->GetDocument() == 0 || node->GetDocument() == this->GetDocument() );
-
-	if ( node->Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		delete node;
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	node->parent = this;
-
-	node->prev = lastChild;
-	node->next = 0;
+    assert( node->parent == 0 || node->parent == this );
+    assert( node->GetDocument() == 0 || node->GetDocument() == this->GetDocument() );
 
-	if ( lastChild )
-		lastChild->next = node;
-	else
-		firstChild = node;			// it was an empty list.
+    if ( node->Type() == TiXmlNode::TINYXML_DOCUMENT )
+    {
+        delete node;
+        if ( GetDocument() )
+            GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return 0;
+    }
+
+    node->parent = this;
+
+    node->prev = lastChild;
+    node->next = 0;
+
+    if ( lastChild )
+        lastChild->next = node;
+    else
+        firstChild = node;			// it was an empty list.
 
-	lastChild = node;
-	return node;
+    lastChild = node;
+    return node;
 }
 
 
 TiXmlNode* TiXmlNode::InsertEndChild( const TiXmlNode& addThis )
 {
-	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
+    if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
+    {
+        if ( GetDocument() )
+            GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return 0;
+    }
+    TiXmlNode* node = addThis.Clone();
+    if ( !node )
+        return 0;
 
-	return LinkEndChild( node );
+    return LinkEndChild( node );
 }
 
 
 TiXmlNode* TiXmlNode::InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis )
-{	
-	if ( !beforeThis || beforeThis->parent != this ) {
-		return 0;
-	}
-	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-	node->parent = this;
-
-	node->next = beforeThis;
-	node->prev = beforeThis->prev;
-	if ( beforeThis->prev )
-	{
-		beforeThis->prev->next = node;
-	}
-	else
-	{
-		assert( firstChild == beforeThis );
-		firstChild = node;
-	}
-	beforeThis->prev = node;
-	return node;
+{
+    if ( !beforeThis || beforeThis->parent != this )
+    {
+        return 0;
+    }
+    if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
+    {
+        if ( GetDocument() )
+            GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return 0;
+    }
+
+    TiXmlNode* node = addThis.Clone();
+    if ( !node )
+        return 0;
+    node->parent = this;
+
+    node->next = beforeThis;
+    node->prev = beforeThis->prev;
+    if ( beforeThis->prev )
+    {
+        beforeThis->prev->next = node;
+    }
+    else
+    {
+        assert( firstChild == beforeThis );
+        firstChild = node;
+    }
+    beforeThis->prev = node;
+    return node;
 }
 
 
 TiXmlNode* TiXmlNode::InsertAfterChild( TiXmlNode* afterThis, const TiXmlNode& addThis )
 {
-	if ( !afterThis || afterThis->parent != this ) {
-		return 0;
-	}
-	if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
-	{
-		if ( GetDocument() ) 
-			GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-	node->parent = this;
-
-	node->prev = afterThis;
-	node->next = afterThis->next;
-	if ( afterThis->next )
-	{
-		afterThis->next->prev = node;
-	}
-	else
-	{
-		assert( lastChild == afterThis );
-		lastChild = node;
-	}
-	afterThis->next = node;
-	return node;
+    if ( !afterThis || afterThis->parent != this )
+    {
+        return 0;
+    }
+    if ( addThis.Type() == TiXmlNode::TINYXML_DOCUMENT )
+    {
+        if ( GetDocument() )
+            GetDocument()->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return 0;
+    }
+
+    TiXmlNode* node = addThis.Clone();
+    if ( !node )
+        return 0;
+    node->parent = this;
+
+    node->prev = afterThis;
+    node->next = afterThis->next;
+    if ( afterThis->next )
+    {
+        afterThis->next->prev = node;
+    }
+    else
+    {
+        assert( lastChild == afterThis );
+        lastChild = node;
+    }
+    afterThis->next = node;
+    return node;
 }
 
 
 TiXmlNode* TiXmlNode::ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis )
 {
-	if ( !replaceThis )
-		return 0;
+    if ( !replaceThis )
+        return 0;
 
-	if ( replaceThis->parent != this )
-		return 0;
+    if ( replaceThis->parent != this )
+        return 0;
 
-	if ( withThis.ToDocument() ) {
-		// A document can never be a child.	Thanks to Noam.
-		TiXmlDocument* document = GetDocument();
-		if ( document ) 
-			document->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	TiXmlNode* node = withThis.Clone();
-	if ( !node )
-		return 0;
-
-	node->next = replaceThis->next;
-	node->prev = replaceThis->prev;
-
-	if ( replaceThis->next )
-		replaceThis->next->prev = node;
-	else
-		lastChild = node;
-
-	if ( replaceThis->prev )
-		replaceThis->prev->next = node;
-	else
-		firstChild = node;
-
-	delete replaceThis;
-	node->parent = this;
-	return node;
+    if ( withThis.ToDocument() )
+    {
+        // A document can never be a child.	Thanks to Noam.
+        TiXmlDocument* document = GetDocument();
+        if ( document )
+            document->SetError( TIXML_ERROR_DOCUMENT_TOP_ONLY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return 0;
+    }
+
+    TiXmlNode* node = withThis.Clone();
+    if ( !node )
+        return 0;
+
+    node->next = replaceThis->next;
+    node->prev = replaceThis->prev;
+
+    if ( replaceThis->next )
+        replaceThis->next->prev = node;
+    else
+        lastChild = node;
+
+    if ( replaceThis->prev )
+        replaceThis->prev->next = node;
+    else
+        firstChild = node;
+
+    delete replaceThis;
+    node->parent = this;
+    return node;
 }
 
 
 bool TiXmlNode::RemoveChild( TiXmlNode* removeThis )
 {
-	if ( !removeThis ) {
-		return false;
-	}
-
-	if ( removeThis->parent != this )
-	{	
-		assert( 0 );
-		return false;
-	}
-
-	if ( removeThis->next )
-		removeThis->next->prev = removeThis->prev;
-	else
-		lastChild = removeThis->prev;
-
-	if ( removeThis->prev )
-		removeThis->prev->next = removeThis->next;
-	else
-		firstChild = removeThis->next;
+    if ( !removeThis )
+    {
+        return false;
+    }
+
+    if ( removeThis->parent != this )
+    {
+        assert( 0 );
+        return false;
+    }
+
+    if ( removeThis->next )
+        removeThis->next->prev = removeThis->prev;
+    else
+        lastChild = removeThis->prev;
+
+    if ( removeThis->prev )
+        removeThis->prev->next = removeThis->next;
+    else
+        firstChild = removeThis->next;
 
-	delete removeThis;
-	return true;
+    delete removeThis;
+    return true;
 }
 
 const TiXmlNode* TiXmlNode::FirstChild( const char * _value ) const
 {
-	const TiXmlNode* node;
-	for ( node = firstChild; node; node = node->next )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
+    const TiXmlNode* node;
+    for ( node = firstChild; node; node = node->next )
+    {
+        if ( strcmp( node->Value(), _value ) == 0 )
+            return node;
+    }
+    return 0;
 }
 
 
 const TiXmlNode* TiXmlNode::LastChild( const char * _value ) const
 {
-	const TiXmlNode* node;
-	for ( node = lastChild; node; node = node->prev )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
+    const TiXmlNode* node;
+    for ( node = lastChild; node; node = node->prev )
+    {
+        if ( strcmp( node->Value(), _value ) == 0 )
+            return node;
+    }
+    return 0;
 }
 
 
 const TiXmlNode* TiXmlNode::IterateChildren( const TiXmlNode* previous ) const
 {
-	if ( !previous )
-	{
-		return FirstChild();
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling();
-	}
+    if ( !previous )
+    {
+        return FirstChild();
+    }
+    else
+    {
+        assert( previous->parent == this );
+        return previous->NextSibling();
+    }
 }
 
 
 const TiXmlNode* TiXmlNode::IterateChildren( const char * val, const TiXmlNode* previous ) const
 {
-	if ( !previous )
-	{
-		return FirstChild( val );
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling( val );
-	}
+    if ( !previous )
+    {
+        return FirstChild( val );
+    }
+    else
+    {
+        assert( previous->parent == this );
+        return previous->NextSibling( val );
+    }
 }
 
 
-const TiXmlNode* TiXmlNode::NextSibling( const char * _value ) const 
-{
-	const TiXmlNode* node;
-	for ( node = next; node; node = node->next )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
+const TiXmlNode* TiXmlNode::NextSibling( const char * _value ) const
+{
+    const TiXmlNode* node;
+    for ( node = next; node; node = node->next )
+    {
+        if ( strcmp( node->Value(), _value ) == 0 )
+            return node;
+    }
+    return 0;
 }
 
 
 const TiXmlNode* TiXmlNode::PreviousSibling( const char * _value ) const
 {
-	const TiXmlNode* node;
-	for ( node = prev; node; node = node->prev )
-	{
-		if ( strcmp( node->Value(), _value ) == 0 )
-			return node;
-	}
-	return 0;
+    const TiXmlNode* node;
+    for ( node = prev; node; node = node->prev )
+    {
+        if ( strcmp( node->Value(), _value ) == 0 )
+            return node;
+    }
+    return 0;
 }
 
 
 void TiXmlElement::RemoveAttribute( const char * name )
 {
-    #ifdef TIXML_USE_STL
-	TIXML_STRING str( name );
-	TiXmlAttribute* node = attributeSet.Find( str );
-	#else
-	TiXmlAttribute* node = attributeSet.Find( name );
-	#endif
-	if ( node )
-	{
-		attributeSet.Remove( node );
-		delete node;
-	}
+#ifdef TIXML_USE_STL
+    TIXML_STRING str( name );
+    TiXmlAttribute* node = attributeSet.Find( str );
+#else
+    TiXmlAttribute* node = attributeSet.Find( name );
+#endif
+    if ( node )
+    {
+        attributeSet.Remove( node );
+        delete node;
+    }
 }
 
 const TiXmlElement* TiXmlNode::FirstChildElement() const
 {
-	const TiXmlNode* node;
+    const TiXmlNode* node;
 
-	for (	node = FirstChild();
-			node;
-			node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
+    for (	node = FirstChild();
+            node;
+            node = node->NextSibling() )
+    {
+        if ( node->ToElement() )
+            return node->ToElement();
+    }
+    return 0;
 }
 
 
 const TiXmlElement* TiXmlNode::FirstChildElement( const char * _value ) const
 {
-	const TiXmlNode* node;
+    const TiXmlNode* node;
 
-	for (	node = FirstChild( _value );
-			node;
-			node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
+    for (	node = FirstChild( _value );
+            node;
+            node = node->NextSibling( _value ) )
+    {
+        if ( node->ToElement() )
+            return node->ToElement();
+    }
+    return 0;
 }
 
 
 const TiXmlElement* TiXmlNode::NextSiblingElement() const
 {
-	const TiXmlNode* node;
+    const TiXmlNode* node;
 
-	for (	node = NextSibling();
-			node;
-			node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
+    for (	node = NextSibling();
+            node;
+            node = node->NextSibling() )
+    {
+        if ( node->ToElement() )
+            return node->ToElement();
+    }
+    return 0;
 }
 
 
 const TiXmlElement* TiXmlNode::NextSiblingElement( const char * _value ) const
 {
-	const TiXmlNode* node;
+    const TiXmlNode* node;
 
-	for (	node = NextSibling( _value );
-			node;
-			node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
+    for (	node = NextSibling( _value );
+            node;
+            node = node->NextSibling( _value ) )
+    {
+        if ( node->ToElement() )
+            return node->ToElement();
+    }
+    return 0;
 }
 
 
 const TiXmlDocument* TiXmlNode::GetDocument() const
 {
-	const TiXmlNode* node;
+    const TiXmlNode* node;
 
-	for( node = this; node; node = node->parent )
-	{
-		if ( node->ToDocument() )
-			return node->ToDocument();
-	}
-	return 0;
+    for ( node = this; node; node = node->parent )
+    {
+        if ( node->ToDocument() )
+            return node->ToDocument();
+    }
+    return 0;
 }
 
 
-TiXmlElement::TiXmlElement (const char * _value)
-	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
+TiXmlElement::TiXmlElement ( const char * _value )
+    : TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
 {
-	firstChild = lastChild = 0;
-	value = _value;
+    firstChild = lastChild = 0;
+    value = _value;
 }
 
 
 #ifdef TIXML_USE_STL
-TiXmlElement::TiXmlElement( const std::string& _value ) 
-	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
+TiXmlElement::TiXmlElement( const std::string& _value )
+    : TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
 {
-	firstChild = lastChild = 0;
-	value = _value;
+    firstChild = lastChild = 0;
+    value = _value;
 }
 #endif
 
 
-TiXmlElement::TiXmlElement( const TiXmlElement& copy)
-	: TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
+TiXmlElement::TiXmlElement( const TiXmlElement& copy )
+    : TiXmlNode( TiXmlNode::TINYXML_ELEMENT )
 {
-	firstChild = lastChild = 0;
-	copy.CopyTo( this );	
+    firstChild = lastChild = 0;
+    copy.CopyTo( this );
 }
 
 
 TiXmlElement& TiXmlElement::operator=( const TiXmlElement& base )
 {
-	ClearThis();
-	base.CopyTo( this );
-	return *this;
+    ClearThis();
+    base.CopyTo( this );
+    return *this;
 }
 
 
 TiXmlElement::~TiXmlElement()
 {
-	ClearThis();
+    ClearThis();
 }
 
 
 void TiXmlElement::ClearThis()
 {
-	Clear();
-	while( attributeSet.First() )
-	{
-		TiXmlAttribute* node = attributeSet.First();
-		attributeSet.Remove( node );
-		delete node;
-	}
+    Clear();
+    while ( attributeSet.First() )
+    {
+        TiXmlAttribute* node = attributeSet.First();
+        attributeSet.Remove( node );
+        delete node;
+    }
 }
 
 
 const char* TiXmlElement::Attribute( const char* name ) const
 {
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( node )
-		return node->Value();
-	return 0;
+    const TiXmlAttribute* node = attributeSet.Find( name );
+    if ( node )
+        return node->Value();
+    return 0;
 }
 
 
 #ifdef TIXML_USE_STL
 const std::string* TiXmlElement::Attribute( const std::string& name ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( attrib )
-		return &attrib->ValueStr();
-	return 0;
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    if ( attrib )
+        return &attrib->ValueStr();
+    return 0;
 }
 #endif
 
 
 const char* TiXmlElement::Attribute( const char* name, int* i ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const char* result = 0;
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    const char* result = 0;
 
-	if ( attrib ) {
-		result = attrib->Value();
-		if ( i ) {
-			attrib->QueryIntValue( i );
-		}
-	}
-	return result;
+    if ( attrib )
+    {
+        result = attrib->Value();
+        if ( i )
+        {
+            attrib->QueryIntValue( i );
+        }
+    }
+    return result;
 }
 
 
 #ifdef TIXML_USE_STL
 const std::string* TiXmlElement::Attribute( const std::string& name, int* i ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const std::string* result = 0;
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    const std::string* result = 0;
 
-	if ( attrib ) {
-		result = &attrib->ValueStr();
-		if ( i ) {
-			attrib->QueryIntValue( i );
-		}
-	}
-	return result;
+    if ( attrib )
+    {
+        result = &attrib->ValueStr();
+        if ( i )
+        {
+            attrib->QueryIntValue( i );
+        }
+    }
+    return result;
 }
 #endif
 
 
 const char* TiXmlElement::Attribute( const char* name, double* d ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const char* result = 0;
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    const char* result = 0;
 
-	if ( attrib ) {
-		result = attrib->Value();
-		if ( d ) {
-			attrib->QueryDoubleValue( d );
-		}
-	}
-	return result;
+    if ( attrib )
+    {
+        result = attrib->Value();
+        if ( d )
+        {
+            attrib->QueryDoubleValue( d );
+        }
+    }
+    return result;
 }
 
 
 #ifdef TIXML_USE_STL
 const std::string* TiXmlElement::Attribute( const std::string& name, double* d ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	const std::string* result = 0;
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    const std::string* result = 0;
 
-	if ( attrib ) {
-		result = &attrib->ValueStr();
-		if ( d ) {
-			attrib->QueryDoubleValue( d );
-		}
-	}
-	return result;
+    if ( attrib )
+    {
+        result = &attrib->ValueStr();
+        if ( d )
+        {
+            attrib->QueryDoubleValue( d );
+        }
+    }
+    return result;
 }
 #endif
 
 
 int TiXmlElement::QueryIntAttribute( const char* name, int* ival ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryIntValue( ival );
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    if ( !attrib )
+        return TIXML_NO_ATTRIBUTE;
+    return attrib->QueryIntValue( ival );
 }
 
 
 int TiXmlElement::QueryUnsignedAttribute( const char* name, unsigned* value ) const
 {
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( !node )
-		return TIXML_NO_ATTRIBUTE;
-
-	int ival = 0;
-	int result = node->QueryIntValue( &ival );
-	*value = (unsigned)ival;
-	return result;
+    const TiXmlAttribute* node = attributeSet.Find( name );
+    if ( !node )
+        return TIXML_NO_ATTRIBUTE;
+
+    int ival = 0;
+    int result = node->QueryIntValue( &ival );
+    *value = ( unsigned )ival;
+    return result;
 }
 
 
 int TiXmlElement::QueryBoolAttribute( const char* name, bool* bval ) const
 {
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( !node )
-		return TIXML_NO_ATTRIBUTE;
-	
-	int result = TIXML_WRONG_TYPE;
-	if (    StringEqual( node->Value(), "true", true, TIXML_ENCODING_UNKNOWN ) 
-		 || StringEqual( node->Value(), "yes", true, TIXML_ENCODING_UNKNOWN ) 
-		 || StringEqual( node->Value(), "1", true, TIXML_ENCODING_UNKNOWN ) ) 
-	{
-		*bval = true;
-		result = TIXML_SUCCESS;
-	}
-	else if (    StringEqual( node->Value(), "false", true, TIXML_ENCODING_UNKNOWN ) 
-			  || StringEqual( node->Value(), "no", true, TIXML_ENCODING_UNKNOWN ) 
-			  || StringEqual( node->Value(), "0", true, TIXML_ENCODING_UNKNOWN ) ) 
-	{
-		*bval = false;
-		result = TIXML_SUCCESS;
-	}
-	return result;
+    const TiXmlAttribute* node = attributeSet.Find( name );
+    if ( !node )
+        return TIXML_NO_ATTRIBUTE;
+
+    int result = TIXML_WRONG_TYPE;
+    if (    StringEqual( node->Value(), "true", true, TIXML_ENCODING_UNKNOWN )
+            || StringEqual( node->Value(), "yes", true, TIXML_ENCODING_UNKNOWN )
+            || StringEqual( node->Value(), "1", true, TIXML_ENCODING_UNKNOWN ) )
+    {
+        *bval = true;
+        result = TIXML_SUCCESS;
+    }
+    else if (    StringEqual( node->Value(), "false", true, TIXML_ENCODING_UNKNOWN )
+                 || StringEqual( node->Value(), "no", true, TIXML_ENCODING_UNKNOWN )
+                 || StringEqual( node->Value(), "0", true, TIXML_ENCODING_UNKNOWN ) )
+    {
+        *bval = false;
+        result = TIXML_SUCCESS;
+    }
+    return result;
 }
 
 
@@ -709,471 +721,486 @@
 #ifdef TIXML_USE_STL
 int TiXmlElement::QueryIntAttribute( const std::string& name, int* ival ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryIntValue( ival );
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    if ( !attrib )
+        return TIXML_NO_ATTRIBUTE;
+    return attrib->QueryIntValue( ival );
 }
 #endif
 
 
 int TiXmlElement::QueryDoubleAttribute( const char* name, double* dval ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryDoubleValue( dval );
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    if ( !attrib )
+        return TIXML_NO_ATTRIBUTE;
+    return attrib->QueryDoubleValue( dval );
 }
 
 
 #ifdef TIXML_USE_STL
 int TiXmlElement::QueryDoubleAttribute( const std::string& name, double* dval ) const
 {
-	const TiXmlAttribute* attrib = attributeSet.Find( name );
-	if ( !attrib )
-		return TIXML_NO_ATTRIBUTE;
-	return attrib->QueryDoubleValue( dval );
+    const TiXmlAttribute* attrib = attributeSet.Find( name );
+    if ( !attrib )
+        return TIXML_NO_ATTRIBUTE;
+    return attrib->QueryDoubleValue( dval );
 }
 #endif
 
 
 void TiXmlElement::SetAttribute( const char * name, int val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetIntValue( val );
-	}
+{
+    TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+    if ( attrib )
+    {
+        attrib->SetIntValue( val );
+    }
 }
 
 
 #ifdef TIXML_USE_STL
 void TiXmlElement::SetAttribute( const std::string& name, int val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetIntValue( val );
-	}
+{
+    TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+    if ( attrib )
+    {
+        attrib->SetIntValue( val );
+    }
 }
 #endif
 
 
 void TiXmlElement::SetDoubleAttribute( const char * name, double val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetDoubleValue( val );
-	}
+{
+    TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+    if ( attrib )
+    {
+        attrib->SetDoubleValue( val );
+    }
 }
 
 
 #ifdef TIXML_USE_STL
 void TiXmlElement::SetDoubleAttribute( const std::string& name, double val )
-{	
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
-	if ( attrib ) {
-		attrib->SetDoubleValue( val );
-	}
+{
+    TiXmlAttribute* attrib = attributeSet.FindOrCreate( name );
+    if ( attrib )
+    {
+        attrib->SetDoubleValue( val );
+    }
 }
-#endif 
+#endif
 
 
 void TiXmlElement::SetAttribute( const char * cname, const char * cvalue )
 {
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( cname );
-	if ( attrib ) {
-		attrib->SetValue( cvalue );
-	}
+    TiXmlAttribute* attrib = attributeSet.FindOrCreate( cname );
+    if ( attrib )
+    {
+        attrib->SetValue( cvalue );
+    }
 }
 
 
 #ifdef TIXML_USE_STL
 void TiXmlElement::SetAttribute( const std::string& _name, const std::string& _value )
 {
-	TiXmlAttribute* attrib = attributeSet.FindOrCreate( _name );
-	if ( attrib ) {
-		attrib->SetValue( _value );
-	}
+    TiXmlAttribute* attrib = attributeSet.FindOrCreate( _name );
+    if ( attrib )
+    {
+        attrib->SetValue( _value );
+    }
 }
 #endif
 
 
 void TiXmlElement::Print( FILE* cfile, int depth ) const
 {
-	int i;
-	assert( cfile );
-	for ( i=0; i<depth; i++ ) {
-		fprintf( cfile, "    " );
-	}
-
-	fprintf( cfile, "<%s", value.c_str() );
-
-	const TiXmlAttribute* attrib;
-	for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() )
-	{
-		fprintf( cfile, " " );
-		attrib->Print( cfile, depth );
-	}
-
-	// There are 3 different formatting approaches:
-	// 1) An element without children is printed as a <foo /> node
-	// 2) An element with only a text child is printed as <foo> text </foo>
-	// 3) An element with children is printed on multiple lines.
-	TiXmlNode* node;
-	if ( !firstChild )
-	{
-		fprintf( cfile, " />" );
-	}
-	else if ( firstChild == lastChild && firstChild->ToText() )
-	{
-		fprintf( cfile, ">" );
-		firstChild->Print( cfile, depth + 1 );
-		fprintf( cfile, "</%s>", value.c_str() );
-	}
-	else
-	{
-		fprintf( cfile, ">" );
-
-		for ( node = firstChild; node; node=node->NextSibling() )
-		{
-			if ( !node->ToText() )
-			{
-				fprintf( cfile, "\n" );
-			}
-			node->Print( cfile, depth+1 );
-		}
-		fprintf( cfile, "\n" );
-		for( i=0; i<depth; ++i ) {
-			fprintf( cfile, "    " );
-		}
-		fprintf( cfile, "</%s>", value.c_str() );
-	}
+    int i;
+    assert( cfile );
+    for ( i=0; i<depth; i++ )
+    {
+        fprintf( cfile, "    " );
+    }
+
+    fprintf( cfile, "<%s", value.c_str() );
+
+    const TiXmlAttribute* attrib;
+    for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() )
+    {
+        fprintf( cfile, " " );
+        attrib->Print( cfile, depth );
+    }
+
+    // There are 3 different formatting approaches:
+    // 1) An element without children is printed as a <foo /> node
+    // 2) An element with only a text child is printed as <foo> text </foo>
+    // 3) An element with children is printed on multiple lines.
+    TiXmlNode* node;
+    if ( !firstChild )
+    {
+        fprintf( cfile, " />" );
+    }
+    else if ( firstChild == lastChild && firstChild->ToText() )
+    {
+        fprintf( cfile, ">" );
+        firstChild->Print( cfile, depth + 1 );
+        fprintf( cfile, "</%s>", value.c_str() );
+    }
+    else
+    {
+        fprintf( cfile, ">" );
+
+        for ( node = firstChild; node; node=node->NextSibling() )
+        {
+            if ( !node->ToText() )
+            {
+                fprintf( cfile, "\n" );
+            }
+            node->Print( cfile, depth+1 );
+        }
+        fprintf( cfile, "\n" );
+        for ( i=0; i<depth; ++i )
+        {
+            fprintf( cfile, "    " );
+        }
+        fprintf( cfile, "</%s>", value.c_str() );
+    }
 }
 
 
 void TiXmlElement::CopyTo( TiXmlElement* target ) const
 {
-	// superclass:
-	TiXmlNode::CopyTo( target );
+    // superclass:
+    TiXmlNode::CopyTo( target );
 
-	// Element class: 
-	// Clone the attributes, then clone the children.
-	const TiXmlAttribute* attribute = 0;
-	for(	attribute = attributeSet.First();
-	attribute;
-	attribute = attribute->Next() )
-	{
-		target->SetAttribute( attribute->Name(), attribute->Value() );
-	}
-
-	TiXmlNode* node = 0;
-	for ( node = firstChild; node; node = node->NextSibling() )
-	{
-		target->LinkEndChild( node->Clone() );
-	}
+    // Element class:
+    // Clone the attributes, then clone the children.
+    const TiXmlAttribute* attribute = 0;
+    for (	attribute = attributeSet.First();
+            attribute;
+            attribute = attribute->Next() )
+    {
+        target->SetAttribute( attribute->Name(), attribute->Value() );
+    }
+
+    TiXmlNode* node = 0;
+    for ( node = firstChild; node; node = node->NextSibling() )
+    {
+        target->LinkEndChild( node->Clone() );
+    }
 }
 
 bool TiXmlElement::Accept( TiXmlVisitor* visitor ) const
 {
-	if ( visitor->VisitEnter( *this, attributeSet.First() ) ) 
-	{
-		for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
-		{
-			if ( !node->Accept( visitor ) )
-				break;
-		}
-	}
-	return visitor->VisitExit( *this );
+    if ( visitor->VisitEnter( *this, attributeSet.First() ) )
+    {
+        for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
+        {
+            if ( !node->Accept( visitor ) )
+                break;
+        }
+    }
+    return visitor->VisitExit( *this );
 }
 
 
 TiXmlNode* TiXmlElement::Clone() const
 {
-	TiXmlElement* clone = new TiXmlElement( Value() );
-	if ( !clone )
-		return 0;
+    TiXmlElement* clone = new TiXmlElement( Value() );
+    if ( !clone )
+        return 0;
 
-	CopyTo( clone );
-	return clone;
+    CopyTo( clone );
+    return clone;
 }
 
 
 const char* TiXmlElement::GetText() const
 {
-	const TiXmlNode* child = this->FirstChild();
-	if ( child ) {
-		const TiXmlText* childText = child->ToText();
-		if ( childText ) {
-			return childText->Value();
-		}
-	}
-	return 0;
+    const TiXmlNode* child = this->FirstChild();
+    if ( child )
+    {
+        const TiXmlText* childText = child->ToText();
+        if ( childText )
+        {
+            return childText->Value();
+        }
+    }
+    return 0;
 }
 
 
 TiXmlDocument::TiXmlDocument() : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
 {
-	tabsize = 4;
-	useMicrosoftBOM = false;
-	ClearError();
+    tabsize = 4;
+    useMicrosoftBOM = false;
+    ClearError();
 }
 
 TiXmlDocument::TiXmlDocument( const char * documentName ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
 {
-	tabsize = 4;
-	useMicrosoftBOM = false;
-	value = documentName;
-	ClearError();
+    tabsize = 4;
+    useMicrosoftBOM = false;
+    value = documentName;
+    ClearError();
 }
 
 
 #ifdef TIXML_USE_STL
 TiXmlDocument::TiXmlDocument( const std::string& documentName ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
 {
-	tabsize = 4;
-	useMicrosoftBOM = false;
+    tabsize = 4;
+    useMicrosoftBOM = false;
     value = documentName;
-	ClearError();
+    ClearError();
 }
 #endif
 
 
 TiXmlDocument::TiXmlDocument( const TiXmlDocument& copy ) : TiXmlNode( TiXmlNode::TINYXML_DOCUMENT )
 {
-	copy.CopyTo( this );
+    copy.CopyTo( this );
 }
 
 
 TiXmlDocument& TiXmlDocument::operator=( const TiXmlDocument& copy )
 {
-	Clear();
-	copy.CopyTo( this );
-	return *this;
+    Clear();
+    copy.CopyTo( this );
+    return *this;
 }
 
 
 bool TiXmlDocument::LoadFile( TiXmlEncoding encoding )
 {
-	return LoadFile( Value(), encoding );
+    return LoadFile( Value(), encoding );
 }
 
 
 bool TiXmlDocument::SaveFile() const
 {
-	return SaveFile( Value() );
+    return SaveFile( Value() );
 }
 
 bool TiXmlDocument::LoadFile( const char* _filename, TiXmlEncoding encoding )
 {
-	TIXML_STRING filename( _filename );
-	value = filename;
+    TIXML_STRING filename( _filename );
+    value = filename;
 
-	// reading in binary mode so that tinyxml can normalize the EOL
-	FILE* file = TiXmlFOpen( value.c_str (), "rb" );	
+    // reading in binary mode so that tinyxml can normalize the EOL
+    FILE* file = TiXmlFOpen( value.c_str (), "rb" );
 
-	if ( file )
-	{
-		bool result = LoadFile( file, encoding );
-		fclose( file );
-		return result;
-	}
-	else
-	{
-		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
+    if ( file )
+    {
+        bool result = LoadFile( file, encoding );
+        fclose( file );
+        return result;
+    }
+    else
+    {
+        SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return false;
+    }
 }
 
 bool TiXmlDocument::LoadFile( FILE* file, TiXmlEncoding encoding )
 {
-	if ( !file ) 
-	{
-		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
-
-	// Delete the existing data:
-	Clear();
-	location.Clear();
-
-	// Get the file size, so we can pre-allocate the string. HUGE speed impact.
-	long length = 0;
-	fseek( file, 0, SEEK_END );
-	length = ftell( file );
-	fseek( file, 0, SEEK_SET );
-
-	// Strange case, but good to handle up front.
-	if ( length <= 0 )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
-
-	// Subtle bug here. TinyXml did use fgets. But from the XML spec:
-	// 2.11 End-of-Line Handling
-	// <snip>
-	// <quote>
-	// ...the XML processor MUST behave as if it normalized all line breaks in external 
-	// parsed entities (including the document entity) on input, before parsing, by translating 
-	// both the two-character sequence #xD #xA and any #xD that is not followed by #xA to 
-	// a single #xA character.
-	// </quote>
-	//
-	// It is not clear fgets does that, and certainly isn't clear it works cross platform. 
-	// Generally, you expect fgets to translate from the convention of the OS to the c/unix
-	// convention, and not work generally.
-
-	/*
-	while( fgets( buf, sizeof(buf), file ) )
-	{
-		data += buf;
-	}
-	*/
-
-	char* buf = new char[ length+1 ];
-	buf[0] = 0;
-
-	if ( fread( buf, length, 1, file ) != 1 ) {
-		delete [] buf;
-		SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return false;
-	}
-
-	// Process the buffer in place to normalize new lines. (See comment above.)
-	// Copies from the 'p' to 'q' pointer, where p can advance faster if
-	// a newline-carriage return is hit.
-	//
-	// Wikipedia:
-	// Systems based on ASCII or a compatible character set use either LF  (Line feed, '\n', 0x0A, 10 in decimal) or 
-	// CR (Carriage return, '\r', 0x0D, 13 in decimal) individually, or CR followed by LF (CR+LF, 0x0D 0x0A)...
-	//		* LF:    Multics, Unix and Unix-like systems (GNU/Linux, AIX, Xenix, Mac OS X, FreeBSD, etc.), BeOS, Amiga, RISC OS, and others
+    if ( !file )
+    {
+        SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return false;
+    }
+
+    // Delete the existing data:
+    Clear();
+    location.Clear();
+
+    // Get the file size, so we can pre-allocate the string. HUGE speed impact.
+    long length = 0;
+    fseek( file, 0, SEEK_END );
+    length = ftell( file );
+    fseek( file, 0, SEEK_SET );
+
+    // Strange case, but good to handle up front.
+    if ( length <= 0 )
+    {
+        SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return false;
+    }
+
+    // Subtle bug here. TinyXml did use fgets. But from the XML spec:
+    // 2.11 End-of-Line Handling
+    // <snip>
+    // <quote>
+    // ...the XML processor MUST behave as if it normalized all line breaks in external
+    // parsed entities (including the document entity) on input, before parsing, by translating
+    // both the two-character sequence #xD #xA and any #xD that is not followed by #xA to
+    // a single #xA character.
+    // </quote>
+    //
+    // It is not clear fgets does that, and certainly isn't clear it works cross platform.
+    // Generally, you expect fgets to translate from the convention of the OS to the c/unix
+    // convention, and not work generally.
+
+    /*
+    while( fgets( buf, sizeof(buf), file ) )
+    {
+    	data += buf;
+    }
+    */
+
+    char* buf = new char[ length+1 ];
+    buf[0] = 0;
+
+    if ( fread( buf, length, 1, file ) != 1 )
+    {
+        delete [] buf;
+        SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return false;
+    }
+
+    // Process the buffer in place to normalize new lines. (See comment above.)
+    // Copies from the 'p' to 'q' pointer, where p can advance faster if
+    // a newline-carriage return is hit.
+    //
+    // Wikipedia:
+    // Systems based on ASCII or a compatible character set use either LF  (Line feed, '\n', 0x0A, 10 in decimal) or
+    // CR (Carriage return, '\r', 0x0D, 13 in decimal) individually, or CR followed by LF (CR+LF, 0x0D 0x0A)...
+    //		* LF:    Multics, Unix and Unix-like systems (GNU/Linux, AIX, Xenix, Mac OS X, FreeBSD, etc.), BeOS, Amiga, RISC OS, and others
     //		* CR+LF: DEC RT-11 and most other early non-Unix, non-IBM OSes, CP/M, MP/M, DOS, OS/2, Microsoft Windows, Symbian OS
     //		* CR:    Commodore 8-bit machines, Apple II family, Mac OS up to version 9 and OS-9
 
-	const char* p = buf;	// the read head
-	char* q = buf;			// the write head
-	const char CR = 0x0d;
-	const char LF = 0x0a;
-
-	buf[length] = 0;
-	while( *p ) {
-		assert( p < (buf+length) );
-		assert( q <= (buf+length) );
-		assert( q <= p );
-
-		if ( *p == CR ) {
-			*q++ = LF;
-			p++;
-			if ( *p == LF ) {		// check for CR+LF (and skip LF)
-				p++;
-			}
-		}
-		else {
-			*q++ = *p++;
-		}
-	}
-	assert( q <= (buf+length) );
-	*q = 0;
+    const char* p = buf;	// the read head
+    char* q = buf;			// the write head
+    const char CR = 0x0d;
+    const char LF = 0x0a;
+
+    buf[length] = 0;
+    while ( *p )
+    {
+        assert( p < ( buf+length ) );
+        assert( q <= ( buf+length ) );
+        assert( q <= p );
+
+        if ( *p == CR )
+        {
+            *q++ = LF;
+            p++;
+            if ( *p == LF )  		// check for CR+LF (and skip LF)
+            {
+                p++;
+            }
+        }
+        else
+        {
+            *q++ = *p++;
+        }
+    }
+    assert( q <= ( buf+length ) );
+    *q = 0;
 
-	Parse( buf, 0, encoding );
+    Parse( buf, 0, encoding );
 
-	delete [] buf;
-	return !Error();
+    delete [] buf;
+    return !Error();
 }
 
 
 bool TiXmlDocument::SaveFile( const char * filename ) const
 {
-	// The old c stuff lives on...
-	FILE* fp = TiXmlFOpen( filename, "w" );
-	if ( fp )
-	{
-		bool result = SaveFile( fp );
-		fclose( fp );
-		return result;
-	}
-	return false;
+    // The old c stuff lives on...
+    FILE* fp = TiXmlFOpen( filename, "w" );
+    if ( fp )
+    {
+        bool result = SaveFile( fp );
+        fclose( fp );
+        return result;
+    }
+    return false;
 }
 
 
 bool TiXmlDocument::SaveFile( FILE* fp ) const
 {
-	if ( useMicrosoftBOM ) 
-	{
-		const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
-		const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
-		const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
-
-		fputc( TIXML_UTF_LEAD_0, fp );
-		fputc( TIXML_UTF_LEAD_1, fp );
-		fputc( TIXML_UTF_LEAD_2, fp );
-	}
-	Print( fp, 0 );
-	return (ferror(fp) == 0);
+    if ( useMicrosoftBOM )
+    {
+        const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
+        const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
+        const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
+
+        fputc( TIXML_UTF_LEAD_0, fp );
+        fputc( TIXML_UTF_LEAD_1, fp );
+        fputc( TIXML_UTF_LEAD_2, fp );
+    }
+    Print( fp, 0 );
+    return ( ferror( fp ) == 0 );
 }
 
 
 void TiXmlDocument::CopyTo( TiXmlDocument* target ) const
 {
-	TiXmlNode::CopyTo( target );
+    TiXmlNode::CopyTo( target );
 
-	target->error = error;
-	target->errorId = errorId;
-	target->errorDesc = errorDesc;
-	target->tabsize = tabsize;
-	target->errorLocation = errorLocation;
-	target->useMicrosoftBOM = useMicrosoftBOM;
-
-	TiXmlNode* node = 0;
-	for ( node = firstChild; node; node = node->NextSibling() )
-	{
-		target->LinkEndChild( node->Clone() );
-	}	
+    target->error = error;
+    target->errorId = errorId;
+    target->errorDesc = errorDesc;
+    target->tabsize = tabsize;
+    target->errorLocation = errorLocation;
+    target->useMicrosoftBOM = useMicrosoftBOM;
+
+    TiXmlNode* node = 0;
+    for ( node = firstChild; node; node = node->NextSibling() )
+    {
+        target->LinkEndChild( node->Clone() );
+    }
 }
 
 
 TiXmlNode* TiXmlDocument::Clone() const
 {
-	TiXmlDocument* clone = new TiXmlDocument();
-	if ( !clone )
-		return 0;
+    TiXmlDocument* clone = new TiXmlDocument();
+    if ( !clone )
+        return 0;
 
-	CopyTo( clone );
-	return clone;
+    CopyTo( clone );
+    return clone;
 }
 
 
 void TiXmlDocument::Print( FILE* cfile, int depth ) const
 {
-	assert( cfile );
-	for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
-	{
-		node->Print( cfile, depth );
-		fprintf( cfile, "\n" );
-	}
+    assert( cfile );
+    for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
+    {
+        node->Print( cfile, depth );
+        fprintf( cfile, "\n" );
+    }
 }
 
 
 bool TiXmlDocument::Accept( TiXmlVisitor* visitor ) const
 {
-	if ( visitor->VisitEnter( *this ) )
-	{
-		for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
-		{
-			if ( !node->Accept( visitor ) )
-				break;
-		}
-	}
-	return visitor->VisitExit( *this );
+    if ( visitor->VisitEnter( *this ) )
+    {
+        for ( const TiXmlNode* node=FirstChild(); node; node=node->NextSibling() )
+        {
+            if ( !node->Accept( visitor ) )
+                break;
+        }
+    }
+    return visitor->VisitExit( *this );
 }
 
 
 const TiXmlAttribute* TiXmlAttribute::Next() const
 {
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( next->value.empty() && next->name.empty() )
-		return 0;
-	return next;
+    // We are using knowledge of the sentinel. The sentinel
+    // have a value or name.
+    if ( next->value.empty() && next->name.empty() )
+        return 0;
+    return next;
 }
 
 /*
@@ -1189,11 +1216,11 @@
 
 const TiXmlAttribute* TiXmlAttribute::Previous() const
 {
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( prev->value.empty() && prev->name.empty() )
-		return 0;
-	return prev;
+    // We are using knowledge of the sentinel. The sentinel
+    // have a value or name.
+    if ( prev->value.empty() && prev->name.empty() )
+        return 0;
+    return prev;
 }
 
 /*
@@ -1209,678 +1236,711 @@
 
 void TiXmlAttribute::Print( FILE* cfile, int /*depth*/, TIXML_STRING* str ) const
 {
-	TIXML_STRING n, v;
+    TIXML_STRING n, v;
 
-	EncodeString( name, &n );
-	EncodeString( value, &v );
+    EncodeString( name, &n );
+    EncodeString( value, &v );
 
-	if (value.find ('\"') == TIXML_STRING::npos) {
-		if ( cfile ) {
-			fprintf (cfile, "%s=\"%s\"", n.c_str(), v.c_str() );
-		}
-		if ( str ) {
-			(*str) += n; (*str) += "=\""; (*str) += v; (*str) += "\"";
-		}
-	}
-	else {
-		if ( cfile ) {
-			fprintf (cfile, "%s='%s'", n.c_str(), v.c_str() );
-		}
-		if ( str ) {
-			(*str) += n; (*str) += "='"; (*str) += v; (*str) += "'";
-		}
-	}
+    if ( value.find ( '\"' ) == TIXML_STRING::npos )
+    {
+        if ( cfile )
+        {
+            fprintf ( cfile, "%s=\"%s\"", n.c_str(), v.c_str() );
+        }
+        if ( str )
+        {
+            ( *str ) += n;
+            ( *str ) += "=\"";
+            ( *str ) += v;
+            ( *str ) += "\"";
+        }
+    }
+    else
+    {
+        if ( cfile )
+        {
+            fprintf ( cfile, "%s='%s'", n.c_str(), v.c_str() );
+        }
+        if ( str )
+        {
+            ( *str ) += n;
+            ( *str ) += "='";
+            ( *str ) += v;
+            ( *str ) += "'";
+        }
+    }
 }
 
 
 int TiXmlAttribute::QueryIntValue( int* ival ) const
 {
-	if ( TIXML_SSCANF( value.c_str(), "%d", ival ) == 1 )
-		return TIXML_SUCCESS;
-	return TIXML_WRONG_TYPE;
+    if ( TIXML_SSCANF( value.c_str(), "%d", ival ) == 1 )
+        return TIXML_SUCCESS;
+    return TIXML_WRONG_TYPE;
 }
 
 int TiXmlAttribute::QueryDoubleValue( double* dval ) const
 {
-	if ( TIXML_SSCANF( value.c_str(), "%lf", dval ) == 1 )
-		return TIXML_SUCCESS;
-	return TIXML_WRONG_TYPE;
+    if ( TIXML_SSCANF( value.c_str(), "%lf", dval ) == 1 )
+        return TIXML_SUCCESS;
+    return TIXML_WRONG_TYPE;
 }
 
 void TiXmlAttribute::SetIntValue( int _value )
 {
-	char buf [64];
-	#if defined(TIXML_SNPRINTF)		
-		TIXML_SNPRINTF(buf, sizeof(buf), "%d", _value);
-	#else
-		sprintf (buf, "%d", _value);
-	#endif
-	SetValue (buf);
+    char buf [64];
+#if defined(TIXML_SNPRINTF)
+    TIXML_SNPRINTF( buf, sizeof( buf ), "%d", _value );
+#else
+    sprintf ( buf, "%d", _value );
+#endif
+    SetValue ( buf );
 }
 
 void TiXmlAttribute::SetDoubleValue( double _value )
 {
-	char buf [256];
-	#if defined(TIXML_SNPRINTF)		
-		TIXML_SNPRINTF( buf, sizeof(buf), "%g", _value);
-	#else
-		sprintf (buf, "%g", _value);
-	#endif
-	SetValue (buf);
+    char buf [256];
+#if defined(TIXML_SNPRINTF)
+    TIXML_SNPRINTF( buf, sizeof( buf ), "%g", _value );
+#else
+    sprintf ( buf, "%g", _value );
+#endif
+    SetValue ( buf );
 }
 
 int TiXmlAttribute::IntValue() const
 {
-	return atoi (value.c_str ());
+    return atoi ( value.c_str () );
 }
 
 double  TiXmlAttribute::DoubleValue() const
 {
-	return atof (value.c_str ());
+    return atof ( value.c_str () );
 }
 
 
 TiXmlComment::TiXmlComment( const TiXmlComment& copy ) : TiXmlNode( TiXmlNode::TINYXML_COMMENT )
 {
-	copy.CopyTo( this );
+    copy.CopyTo( this );
 }
 
 
 TiXmlComment& TiXmlComment::operator=( const TiXmlComment& base )
 {
-	Clear();
-	base.CopyTo( this );
-	return *this;
+    Clear();
+    base.CopyTo( this );
+    return *this;
 }
 
 
 void TiXmlComment::Print( FILE* cfile, int depth ) const
 {
-	assert( cfile );
-	for ( int i=0; i<depth; i++ )
-	{
-		fprintf( cfile,  "    " );
-	}
-	fprintf( cfile, "<!--%s-->", value.c_str() );
+    assert( cfile );
+    for ( int i=0; i<depth; i++ )
+    {
+        fprintf( cfile,  "    " );
+    }
+    fprintf( cfile, "<!--%s-->", value.c_str() );
 }
 
 
 void TiXmlComment::CopyTo( TiXmlComment* target ) const
 {
-	TiXmlNode::CopyTo( target );
+    TiXmlNode::CopyTo( target );
 }
 
 
 bool TiXmlComment::Accept( TiXmlVisitor* visitor ) const
 {
-	return visitor->Visit( *this );
+    return visitor->Visit( *this );
 }
 
 
 TiXmlNode* TiXmlComment::Clone() const
 {
-	TiXmlComment* clone = new TiXmlComment();
+    TiXmlComment* clone = new TiXmlComment();
 
-	if ( !clone )
-		return 0;
+    if ( !clone )
+        return 0;
 
-	CopyTo( clone );
-	return clone;
+    CopyTo( clone );
+    return clone;
 }
 
 
 void TiXmlText::Print( FILE* cfile, int depth ) const
 {
-	assert( cfile );
-	if ( cdata )
-	{
-		int i;
-		fprintf( cfile, "\n" );
-		for ( i=0; i<depth; i++ ) {
-			fprintf( cfile, "    " );
-		}
-		fprintf( cfile, "<![CDATA[%s]]>\n", value.c_str() );	// unformatted output
-	}
-	else
-	{
-		TIXML_STRING buffer;
-		EncodeString( value, &buffer );
-		fprintf( cfile, "%s", buffer.c_str() );
-	}
+    assert( cfile );
+    if ( cdata )
+    {
+        int i;
+        fprintf( cfile, "\n" );
+        for ( i=0; i<depth; i++ )
+        {
+            fprintf( cfile, "    " );
+        }
+        fprintf( cfile, "<![CDATA[%s]]>\n", value.c_str() );	// unformatted output
+    }
+    else
+    {
+        TIXML_STRING buffer;
+        EncodeString( value, &buffer );
+        fprintf( cfile, "%s", buffer.c_str() );
+    }
 }
 
 
 void TiXmlText::CopyTo( TiXmlText* target ) const
 {
-	TiXmlNode::CopyTo( target );
-	target->cdata = cdata;
+    TiXmlNode::CopyTo( target );
+    target->cdata = cdata;
 }
 
 
 bool TiXmlText::Accept( TiXmlVisitor* visitor ) const
 {
-	return visitor->Visit( *this );
+    return visitor->Visit( *this );
 }
 
 
 TiXmlNode* TiXmlText::Clone() const
-{	
-	TiXmlText* clone = 0;
-	clone = new TiXmlText( "" );
+{
+    TiXmlText* clone = 0;
+    clone = new TiXmlText( "" );
 
-	if ( !clone )
-		return 0;
+    if ( !clone )
+        return 0;
 
-	CopyTo( clone );
-	return clone;
+    CopyTo( clone );
+    return clone;
 }
 
 
 TiXmlDeclaration::TiXmlDeclaration( const char * _version,
-									const char * _encoding,
-									const char * _standalone )
-	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
-{
-	version = _version;
-	encoding = _encoding;
-	standalone = _standalone;
+                                    const char * _encoding,
+                                    const char * _standalone )
+    : TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
+{
+    version = _version;
+    encoding = _encoding;
+    standalone = _standalone;
 }
 
 
 #ifdef TIXML_USE_STL
 TiXmlDeclaration::TiXmlDeclaration(	const std::string& _version,
-									const std::string& _encoding,
-									const std::string& _standalone )
-	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
-{
-	version = _version;
-	encoding = _encoding;
-	standalone = _standalone;
+                                    const std::string& _encoding,
+                                    const std::string& _standalone )
+    : TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
+{
+    version = _version;
+    encoding = _encoding;
+    standalone = _standalone;
 }
 #endif
 
 
 TiXmlDeclaration::TiXmlDeclaration( const TiXmlDeclaration& copy )
-	: TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
+    : TiXmlNode( TiXmlNode::TINYXML_DECLARATION )
 {
-	copy.CopyTo( this );	
+    copy.CopyTo( this );
 }
 
 
 TiXmlDeclaration& TiXmlDeclaration::operator=( const TiXmlDeclaration& copy )
 {
-	Clear();
-	copy.CopyTo( this );
-	return *this;
+    Clear();
+    copy.CopyTo( this );
+    return *this;
 }
 
 
 void TiXmlDeclaration::Print( FILE* cfile, int /*depth*/, TIXML_STRING* str ) const
 {
-	if ( cfile ) fprintf( cfile, "<?xml " );
-	if ( str )	 (*str) += "<?xml ";
+    if ( cfile ) fprintf( cfile, "<?xml " );
+    if ( str )	 ( *str ) += "<?xml ";
 
-	if ( !version.empty() ) {
-		if ( cfile ) fprintf (cfile, "version=\"%s\" ", version.c_str ());
-		if ( str ) { (*str) += "version=\""; (*str) += version; (*str) += "\" "; }
-	}
-	if ( !encoding.empty() ) {
-		if ( cfile ) fprintf (cfile, "encoding=\"%s\" ", encoding.c_str ());
-		if ( str ) { (*str) += "encoding=\""; (*str) += encoding; (*str) += "\" "; }
-	}
-	if ( !standalone.empty() ) {
-		if ( cfile ) fprintf (cfile, "standalone=\"%s\" ", standalone.c_str ());
-		if ( str ) { (*str) += "standalone=\""; (*str) += standalone; (*str) += "\" "; }
-	}
-	if ( cfile ) fprintf( cfile, "?>" );
-	if ( str )	 (*str) += "?>";
+    if ( !version.empty() )
+    {
+        if ( cfile ) fprintf ( cfile, "version=\"%s\" ", version.c_str () );
+        if ( str )
+        {
+            ( *str ) += "version=\"";
+            ( *str ) += version;
+            ( *str ) += "\" ";
+        }
+    }
+    if ( !encoding.empty() )
+    {
+        if ( cfile ) fprintf ( cfile, "encoding=\"%s\" ", encoding.c_str () );
+        if ( str )
+        {
+            ( *str ) += "encoding=\"";
+            ( *str ) += encoding;
+            ( *str ) += "\" ";
+        }
+    }
+    if ( !standalone.empty() )
+    {
+        if ( cfile ) fprintf ( cfile, "standalone=\"%s\" ", standalone.c_str () );
+        if ( str )
+        {
+            ( *str ) += "standalone=\"";
+            ( *str ) += standalone;
+            ( *str ) += "\" ";
+        }
+    }
+    if ( cfile ) fprintf( cfile, "?>" );
+    if ( str )	 ( *str ) += "?>";
 }
 
 
 void TiXmlDeclaration::CopyTo( TiXmlDeclaration* target ) const
 {
-	TiXmlNode::CopyTo( target );
+    TiXmlNode::CopyTo( target );
 
-	target->version = version;
-	target->encoding = encoding;
-	target->standalone = standalone;
+    target->version = version;
+    target->encoding = encoding;
+    target->standalone = standalone;
 }
 
 
 bool TiXmlDeclaration::Accept( TiXmlVisitor* visitor ) const
 {
-	return visitor->Visit( *this );
+    return visitor->Visit( *this );
 }
 
 
 TiXmlNode* TiXmlDeclaration::Clone() const
-{	
-	TiXmlDeclaration* clone = new TiXmlDeclaration();
+{
+    TiXmlDeclaration* clone = new TiXmlDeclaration();
 
-	if ( !clone )
-		return 0;
+    if ( !clone )
+        return 0;
 
-	CopyTo( clone );
-	return clone;
+    CopyTo( clone );
+    return clone;
 }
 
 
 void TiXmlUnknown::Print( FILE* cfile, int depth ) const
 {
-	for ( int i=0; i<depth; i++ )
-		fprintf( cfile, "    " );
-	fprintf( cfile, "<%s>", value.c_str() );
+    for ( int i=0; i<depth; i++ )
+        fprintf( cfile, "    " );
+    fprintf( cfile, "<%s>", value.c_str() );
 }
 
 
 void TiXmlUnknown::CopyTo( TiXmlUnknown* target ) const
 {
-	TiXmlNode::CopyTo( target );
+    TiXmlNode::CopyTo( target );
 }
 
 
 bool TiXmlUnknown::Accept( TiXmlVisitor* visitor ) const
 {
-	return visitor->Visit( *this );
+    return visitor->Visit( *this );
 }
 
 
 TiXmlNode* TiXmlUnknown::Clone() const
 {
-	TiXmlUnknown* clone = new TiXmlUnknown();
+    TiXmlUnknown* clone = new TiXmlUnknown();
 
-	if ( !clone )
-		return 0;
+    if ( !clone )
+        return 0;
 
-	CopyTo( clone );
-	return clone;
+    CopyTo( clone );
+    return clone;
 }
 
 
 TiXmlAttributeSet::TiXmlAttributeSet()
 {
-	sentinel.next = &sentinel;
-	sentinel.prev = &sentinel;
+    sentinel.next = &sentinel;
+    sentinel.prev = &sentinel;
 }
 
 
 TiXmlAttributeSet::~TiXmlAttributeSet()
 {
-	assert( sentinel.next == &sentinel );
-	assert( sentinel.prev == &sentinel );
+    assert( sentinel.next == &sentinel );
+    assert( sentinel.prev == &sentinel );
 }
 
 
 void TiXmlAttributeSet::Add( TiXmlAttribute* addMe )
 {
-    #ifdef TIXML_USE_STL
-	assert( !Find( TIXML_STRING( addMe->Name() ) ) );	// Shouldn't be multiply adding to the set.
-	#else
-	assert( !Find( addMe->Name() ) );	// Shouldn't be multiply adding to the set.
-	#endif
+#ifdef TIXML_USE_STL
+    assert( !Find( TIXML_STRING( addMe->Name() ) ) );	// Shouldn't be multiply adding to the set.
+#else
+    assert( !Find( addMe->Name() ) );	// Shouldn't be multiply adding to the set.
+#endif
 
-	addMe->next = &sentinel;
-	addMe->prev = sentinel.prev;
+    addMe->next = &sentinel;
+    addMe->prev = sentinel.prev;
 
-	sentinel.prev->next = addMe;
-	sentinel.prev      = addMe;
+    sentinel.prev->next = addMe;
+    sentinel.prev      = addMe;
 }
 
 void TiXmlAttributeSet::Remove( TiXmlAttribute* removeMe )
 {
-	TiXmlAttribute* node;
+    TiXmlAttribute* node;
 
-	for( node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( node == removeMe )
-		{
-			node->prev->next = node->next;
-			node->next->prev = node->prev;
-			node->next = 0;
-			node->prev = 0;
-			return;
-		}
-	}
-	assert( 0 );		// we tried to remove a non-linked attribute.
+    for ( node = sentinel.next; node != &sentinel; node = node->next )
+    {
+        if ( node == removeMe )
+        {
+            node->prev->next = node->next;
+            node->next->prev = node->prev;
+            node->next = 0;
+            node->prev = 0;
+            return;
+        }
+    }
+    assert( 0 );		// we tried to remove a non-linked attribute.
 }
 
 
 #ifdef TIXML_USE_STL
 TiXmlAttribute* TiXmlAttributeSet::Find( const std::string& name ) const
 {
-	for( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( node->name == name )
-			return node;
-	}
-	return 0;
+    for ( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
+    {
+        if ( node->name == name )
+            return node;
+    }
+    return 0;
 }
 
 TiXmlAttribute* TiXmlAttributeSet::FindOrCreate( const std::string& _name )
 {
-	TiXmlAttribute* attrib = Find( _name );
-	if ( !attrib ) {
-		attrib = new TiXmlAttribute();
-		Add( attrib );
-		attrib->SetName( _name );
-	}
-	return attrib;
+    TiXmlAttribute* attrib = Find( _name );
+    if ( !attrib )
+    {
+        attrib = new TiXmlAttribute();
+        Add( attrib );
+        attrib->SetName( _name );
+    }
+    return attrib;
 }
 #endif
 
 
 TiXmlAttribute* TiXmlAttributeSet::Find( const char* name ) const
 {
-	for( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( strcmp( node->name.c_str(), name ) == 0 )
-			return node;
-	}
-	return 0;
+    for ( TiXmlAttribute* node = sentinel.next; node != &sentinel; node = node->next )
+    {
+        if ( strcmp( node->name.c_str(), name ) == 0 )
+            return node;
+    }
+    return 0;
 }
 
 
 TiXmlAttribute* TiXmlAttributeSet::FindOrCreate( const char* _name )
 {
-	TiXmlAttribute* attrib = Find( _name );
-	if ( !attrib ) {
-		attrib = new TiXmlAttribute();
-		Add( attrib );
-		attrib->SetName( _name );
-	}
-	return attrib;
+    TiXmlAttribute* attrib = Find( _name );
+    if ( !attrib )
+    {
+        attrib = new TiXmlAttribute();
+        Add( attrib );
+        attrib->SetName( _name );
+    }
+    return attrib;
 }
 
 
-#ifdef TIXML_USE_STL	
-std::istream& operator>> (std::istream & in, TiXmlNode & base)
+#ifdef TIXML_USE_STL
+std::istream& operator>> ( std::istream & in, TiXmlNode & base )
 {
-	TIXML_STRING tag;
-	tag.reserve( 8 * 1000 );
-	base.StreamIn( &in, &tag );
+    TIXML_STRING tag;
+    tag.reserve( 8 * 1000 );
+    base.StreamIn( &in, &tag );
 
-	base.Parse( tag.c_str(), 0, TIXML_DEFAULT_ENCODING );
-	return in;
+    base.Parse( tag.c_str(), 0, TIXML_DEFAULT_ENCODING );
+    return in;
 }
 #endif
 
 
-#ifdef TIXML_USE_STL	
-std::ostream& operator<< (std::ostream & out, const TiXmlNode & base)
+#ifdef TIXML_USE_STL
+std::ostream& operator<< ( std::ostream & out, const TiXmlNode & base )
 {
-	TiXmlPrinter printer;
-	printer.SetStreamPrinting();
-	base.Accept( &printer );
-	out << printer.Str();
+    TiXmlPrinter printer;
+    printer.SetStreamPrinting();
+    base.Accept( &printer );
+    out << printer.Str();
 
-	return out;
+    return out;
 }
 
 
-std::string& operator<< (std::string& out, const TiXmlNode& base )
+std::string& operator<< ( std::string& out, const TiXmlNode& base )
 {
-	TiXmlPrinter printer;
-	printer.SetStreamPrinting();
-	base.Accept( &printer );
-	out.append( printer.Str() );
+    TiXmlPrinter printer;
+    printer.SetStreamPrinting();
+    base.Accept( &printer );
+    out.append( printer.Str() );
 
-	return out;
+    return out;
 }
 #endif
 
 
 TiXmlHandle TiXmlHandle::FirstChild() const
 {
-	if ( node )
-	{
-		TiXmlNode* child = node->FirstChild();
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        TiXmlNode* child = node->FirstChild();
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 TiXmlHandle TiXmlHandle::FirstChild( const char * value ) const
 {
-	if ( node )
-	{
-		TiXmlNode* child = node->FirstChild( value );
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        TiXmlNode* child = node->FirstChild( value );
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 TiXmlHandle TiXmlHandle::FirstChildElement() const
 {
-	if ( node )
-	{
-		TiXmlElement* child = node->FirstChildElement();
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        TiXmlElement* child = node->FirstChildElement();
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 TiXmlHandle TiXmlHandle::FirstChildElement( const char * value ) const
 {
-	if ( node )
-	{
-		TiXmlElement* child = node->FirstChildElement( value );
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        TiXmlElement* child = node->FirstChildElement( value );
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 TiXmlHandle TiXmlHandle::Child( int count ) const
 {
-	if ( node )
-	{
-		int i;
-		TiXmlNode* child = node->FirstChild();
-		for (	i=0;
-				child && i<count;
-				child = child->NextSibling(), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        int i;
+        TiXmlNode* child = node->FirstChild();
+        for (	i=0;
+                child && i<count;
+                child = child->NextSibling(), ++i )
+        {
+            // nothing
+        }
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 TiXmlHandle TiXmlHandle::Child( const char* value, int count ) const
 {
-	if ( node )
-	{
-		int i;
-		TiXmlNode* child = node->FirstChild( value );
-		for (	i=0;
-				child && i<count;
-				child = child->NextSibling( value ), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        int i;
+        TiXmlNode* child = node->FirstChild( value );
+        for (	i=0;
+                child && i<count;
+                child = child->NextSibling( value ), ++i )
+        {
+            // nothing
+        }
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 TiXmlHandle TiXmlHandle::ChildElement( int count ) const
 {
-	if ( node )
-	{
-		int i;
-		TiXmlElement* child = node->FirstChildElement();
-		for (	i=0;
-				child && i<count;
-				child = child->NextSiblingElement(), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        int i;
+        TiXmlElement* child = node->FirstChildElement();
+        for (	i=0;
+                child && i<count;
+                child = child->NextSiblingElement(), ++i )
+        {
+            // nothing
+        }
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 TiXmlHandle TiXmlHandle::ChildElement( const char* value, int count ) const
 {
-	if ( node )
-	{
-		int i;
-		TiXmlElement* child = node->FirstChildElement( value );
-		for (	i=0;
-				child && i<count;
-				child = child->NextSiblingElement( value ), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
+    if ( node )
+    {
+        int i;
+        TiXmlElement* child = node->FirstChildElement( value );
+        for (	i=0;
+                child && i<count;
+                child = child->NextSiblingElement( value ), ++i )
+        {
+            // nothing
+        }
+        if ( child )
+            return TiXmlHandle( child );
+    }
+    return TiXmlHandle( 0 );
 }
 
 
 bool TiXmlPrinter::VisitEnter( const TiXmlDocument& )
 {
-	return true;
+    return true;
 }
 
 bool TiXmlPrinter::VisitExit( const TiXmlDocument& )
 {
-	return true;
+    return true;
 }
 
 bool TiXmlPrinter::VisitEnter( const TiXmlElement& element, const TiXmlAttribute* firstAttribute )
 {
-	DoIndent();
-	buffer += "<";
-	buffer += element.Value();
-
-	for( const TiXmlAttribute* attrib = firstAttribute; attrib; attrib = attrib->Next() )
-	{
-		buffer += " ";
-		attrib->Print( 0, 0, &buffer );
-	}
-
-	if ( !element.FirstChild() ) 
-	{
-		buffer += " />";
-		DoLineBreak();
-	}
-	else 
-	{
-		buffer += ">";
-		if (    element.FirstChild()->ToText()
-			  && element.LastChild() == element.FirstChild()
-			  && element.FirstChild()->ToText()->CDATA() == false )
-		{
-			simpleTextPrint = true;
-			// no DoLineBreak()!
-		}
-		else
-		{
-			DoLineBreak();
-		}
-	}
-	++depth;	
-	return true;
+    DoIndent();
+    buffer += "<";
+    buffer += element.Value();
+
+    for ( const TiXmlAttribute* attrib = firstAttribute; attrib; attrib = attrib->Next() )
+    {
+        buffer += " ";
+        attrib->Print( 0, 0, &buffer );
+    }
+
+    if ( !element.FirstChild() )
+    {
+        buffer += " />";
+        DoLineBreak();
+    }
+    else
+    {
+        buffer += ">";
+        if (    element.FirstChild()->ToText()
+                && element.LastChild() == element.FirstChild()
+                && element.FirstChild()->ToText()->CDATA() == false )
+        {
+            simpleTextPrint = true;
+            // no DoLineBreak()!
+        }
+        else
+        {
+            DoLineBreak();
+        }
+    }
+    ++depth;
+    return true;
 }
 
 
 bool TiXmlPrinter::VisitExit( const TiXmlElement& element )
 {
-	--depth;
-	if ( !element.FirstChild() ) 
-	{
-		// nothing.
-	}
-	else 
-	{
-		if ( simpleTextPrint )
-		{
-			simpleTextPrint = false;
-		}
-		else
-		{
-			DoIndent();
-		}
-		buffer += "</";
-		buffer += element.Value();
-		buffer += ">";
-		DoLineBreak();
-	}
-	return true;
+    --depth;
+    if ( !element.FirstChild() )
+    {
+        // nothing.
+    }
+    else
+    {
+        if ( simpleTextPrint )
+        {
+            simpleTextPrint = false;
+        }
+        else
+        {
+            DoIndent();
+        }
+        buffer += "</";
+        buffer += element.Value();
+        buffer += ">";
+        DoLineBreak();
+    }
+    return true;
 }
 
 
 bool TiXmlPrinter::Visit( const TiXmlText& text )
 {
-	if ( text.CDATA() )
-	{
-		DoIndent();
-		buffer += "<![CDATA[";
-		buffer += text.Value();
-		buffer += "]]>";
-		DoLineBreak();
-	}
-	else if ( simpleTextPrint )
-	{
-		TIXML_STRING str;
-		TiXmlBase::EncodeString( text.ValueTStr(), &str );
-		buffer += str;
-	}
-	else
-	{
-		DoIndent();
-		TIXML_STRING str;
-		TiXmlBase::EncodeString( text.ValueTStr(), &str );
-		buffer += str;
-		DoLineBreak();
-	}
-	return true;
+    if ( text.CDATA() )
+    {
+        DoIndent();
+        buffer += "<![CDATA[";
+        buffer += text.Value();
+        buffer += "]]>";
+        DoLineBreak();
+    }
+    else if ( simpleTextPrint )
+    {
+        TIXML_STRING str;
+        TiXmlBase::EncodeString( text.ValueTStr(), &str );
+        buffer += str;
+    }
+    else
+    {
+        DoIndent();
+        TIXML_STRING str;
+        TiXmlBase::EncodeString( text.ValueTStr(), &str );
+        buffer += str;
+        DoLineBreak();
+    }
+    return true;
 }
 
 
 bool TiXmlPrinter::Visit( const TiXmlDeclaration& declaration )
 {
-	DoIndent();
-	declaration.Print( 0, 0, &buffer );
-	DoLineBreak();
-	return true;
+    DoIndent();
+    declaration.Print( 0, 0, &buffer );
+    DoLineBreak();
+    return true;
 }
 
 
 bool TiXmlPrinter::Visit( const TiXmlComment& comment )
 {
-	DoIndent();
-	buffer += "<!--";
-	buffer += comment.Value();
-	buffer += "-->";
-	DoLineBreak();
-	return true;
+    DoIndent();
+    buffer += "<!--";
+    buffer += comment.Value();
+    buffer += "-->";
+    DoLineBreak();
+    return true;
 }
 
 
 bool TiXmlPrinter::Visit( const TiXmlUnknown& unknown )
 {
-	DoIndent();
-	buffer += "<";
-	buffer += unknown.Value();
-	buffer += ">";
-	DoLineBreak();
-	return true;
+    DoIndent();
+    buffer += "<";
+    buffer += unknown.Value();
+    buffer += ">";
+    DoLineBreak();
+    return true;
 }
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxmlerror.cpp opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxmlerror.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxmlerror.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxmlerror.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -2,12 +2,12 @@
 www.sourceforge.net/projects/tinyxml
 Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
 
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
 damages arising from the use of this software.
 
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
 redistribute it freely, subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must
@@ -33,20 +33,20 @@
 
 const char* TiXmlBase::errorString[ TiXmlBase::TIXML_ERROR_STRING_COUNT ] =
 {
-	"No error",
-	"Error",
-	"Failed to open file",
-	"Error parsing Element.",
-	"Failed to read Element name",
-	"Error reading Element value.",
-	"Error reading Attributes.",
-	"Error: empty tag.",
-	"Error reading end tag.",
-	"Error parsing Unknown.",
-	"Error parsing Comment.",
-	"Error parsing Declaration.",
-	"Error document empty.",
-	"Error null (0) or unexpected EOF found in input stream.",
-	"Error parsing CDATA.",
-	"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
+    "No error",
+    "Error",
+    "Failed to open file",
+    "Error parsing Element.",
+    "Failed to read Element name",
+    "Error reading Element value.",
+    "Error reading Attributes.",
+    "Error: empty tag.",
+    "Error reading end tag.",
+    "Error parsing Unknown.",
+    "Error parsing Comment.",
+    "Error parsing Declaration.",
+    "Error document empty.",
+    "Error null (0) or unexpected EOF found in input stream.",
+    "Error parsing CDATA.",
+    "Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
 };
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxml.h opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxml.h
--- opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxml.h	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxml.h	2016-02-25 13:06:29.000000000 +0000
@@ -44,13 +44,13 @@
 #endif
 
 #ifdef TIXML_USE_STL
-	#include <string>
- 	#include <iostream>
-	#include <sstream>
-	#define TIXML_STRING		std::string
+#include <string>
+#include <iostream>
+#include <sstream>
+#define TIXML_STRING		std::string
 #else
-	#include "tinystr.h"
-	#define TIXML_STRING		TiXmlString
+#include "tinystr.h"
+#define TIXML_STRING		TiXmlString
 #endif
 
 // Deprecated library function hell. Compilers want to use the
@@ -60,25 +60,25 @@
 #define TIXML_SAFE
 
 #ifdef TIXML_SAFE
-	#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
-		// Microsoft visual studio, version 2005 and higher.
-		#define TIXML_SNPRINTF _snprintf_s
-		#define TIXML_SSCANF   sscanf_s
-	#elif defined(_MSC_VER) && (_MSC_VER >= 1200 )
-		// Microsoft visual studio, version 6 and higher.
-		//#pragma message( "Using _sn* functions." )
-		#define TIXML_SNPRINTF _snprintf
-		#define TIXML_SSCANF   sscanf
-	#elif defined(__GNUC__) && (__GNUC__ >= 3 )
-		// GCC version 3 and higher.s
-		//#warning( "Using sn* functions." )
-		#define TIXML_SNPRINTF snprintf
-		#define TIXML_SSCANF   sscanf
-	#else
-		#define TIXML_SNPRINTF snprintf
-		#define TIXML_SSCANF   sscanf
-	#endif
-#endif	
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+// Microsoft visual studio, version 2005 and higher.
+#define TIXML_SNPRINTF _snprintf_s
+#define TIXML_SSCANF   sscanf_s
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200 )
+// Microsoft visual studio, version 6 and higher.
+//#pragma message( "Using _sn* functions." )
+#define TIXML_SNPRINTF _snprintf
+#define TIXML_SSCANF   sscanf
+#elif defined(__GNUC__) && (__GNUC__ >= 3 )
+// GCC version 3 and higher.s
+//#warning( "Using sn* functions." )
+#define TIXML_SNPRINTF snprintf
+#define TIXML_SSCANF   sscanf
+#else
+#define TIXML_SNPRINTF snprintf
+#define TIXML_SSCANF   sscanf
+#endif
+#endif
 
 class TiXmlDocument;
 class TiXmlElement;
@@ -93,16 +93,22 @@
 const int TIXML_MINOR_VERSION = 6;
 const int TIXML_PATCH_VERSION = 2;
 
-/*	Internal structure for tracking location of items 
+/*	Internal structure for tracking location of items
 	in the XML file.
 */
 struct TiXmlCursor
 {
-	TiXmlCursor()		{ Clear(); }
-	void Clear()		{ row = col = -1; }
+    TiXmlCursor()
+    {
+        Clear();
+    }
+    void Clear()
+    {
+        row = col = -1;
+    }
 
-	int row;	// 0 based.
-	int col;	// 0 based.
+    int row;	// 0 based.
+    int col;	// 0 based.
 };
 
 
@@ -116,7 +122,7 @@
 	If you return 'true' from a Visit method, recursive parsing will continue. If you return
 	false, <b>no children of this node or its sibilings</b> will be Visited.
 
-	All flavors of Visit methods have a default implementation that returns 'true' (continue 
+	All flavors of Visit methods have a default implementation that returns 'true' (continue
 	visiting). You need to only override methods that are interesting to you.
 
 	Generally Accept() is called on the TiXmlDocument, although all nodes suppert Visiting.
@@ -128,43 +134,67 @@
 class TiXmlVisitor
 {
 public:
-	virtual ~TiXmlVisitor() {}
+    virtual ~TiXmlVisitor() {}
 
-	/// Visit a document.
-	virtual bool VisitEnter( const TiXmlDocument& /*doc*/ )			{ return true; }
-	/// Visit a document.
-	virtual bool VisitExit( const TiXmlDocument& /*doc*/ )			{ return true; }
-
-	/// Visit an element.
-	virtual bool VisitEnter( const TiXmlElement& /*element*/, const TiXmlAttribute* /*firstAttribute*/ )	{ return true; }
-	/// Visit an element.
-	virtual bool VisitExit( const TiXmlElement& /*element*/ )		{ return true; }
-
-	/// Visit a declaration
-	virtual bool Visit( const TiXmlDeclaration& /*declaration*/ )	{ return true; }
-	/// Visit a text node
-	virtual bool Visit( const TiXmlText& /*text*/ )					{ return true; }
-	/// Visit a comment node
-	virtual bool Visit( const TiXmlComment& /*comment*/ )			{ return true; }
-	/// Visit an unknown node
-	virtual bool Visit( const TiXmlUnknown& /*unknown*/ )			{ return true; }
+    /// Visit a document.
+    virtual bool VisitEnter( const TiXmlDocument& /*doc*/ )
+    {
+        return true;
+    }
+    /// Visit a document.
+    virtual bool VisitExit( const TiXmlDocument& /*doc*/ )
+    {
+        return true;
+    }
+
+    /// Visit an element.
+    virtual bool VisitEnter( const TiXmlElement& /*element*/, const TiXmlAttribute* /*firstAttribute*/ )
+    {
+        return true;
+    }
+    /// Visit an element.
+    virtual bool VisitExit( const TiXmlElement& /*element*/ )
+    {
+        return true;
+    }
+
+    /// Visit a declaration
+    virtual bool Visit( const TiXmlDeclaration& /*declaration*/ )
+    {
+        return true;
+    }
+    /// Visit a text node
+    virtual bool Visit( const TiXmlText& /*text*/ )
+    {
+        return true;
+    }
+    /// Visit a comment node
+    virtual bool Visit( const TiXmlComment& /*comment*/ )
+    {
+        return true;
+    }
+    /// Visit an unknown node
+    virtual bool Visit( const TiXmlUnknown& /*unknown*/ )
+    {
+        return true;
+    }
 };
 
 // Only used by Attribute::Query functions
-enum 
-{ 
-	TIXML_SUCCESS,
-	TIXML_NO_ATTRIBUTE,
-	TIXML_WRONG_TYPE
+enum
+{
+    TIXML_SUCCESS,
+    TIXML_NO_ATTRIBUTE,
+    TIXML_WRONG_TYPE
 };
 
 
 // Used by the parsing routines.
 enum TiXmlEncoding
 {
-	TIXML_ENCODING_UNKNOWN,
-	TIXML_ENCODING_UTF8,
-	TIXML_ENCODING_LEGACY
+    TIXML_ENCODING_UNKNOWN,
+    TIXML_ENCODING_UTF8,
+    TIXML_ENCODING_LEGACY
 };
 
 //const TiXmlEncoding TIXML_DEFAULT_ENCODING = TIXML_ENCODING_UNKNOWN;
@@ -193,224 +223,246 @@
 */
 class TiXmlBase
 {
-	friend class TiXmlNode;
-	friend class TiXmlElement;
-	friend class TiXmlDocument;
+    friend class TiXmlNode;
+    friend class TiXmlElement;
+    friend class TiXmlDocument;
 
 public:
-	TiXmlBase()	:	userData(0)		{}
-	virtual ~TiXmlBase()			{}
-
-	/**	All TinyXml classes can print themselves to a filestream
-		or the string class (TiXmlString in non-STL mode, std::string
-		in STL mode.) Either or both cfile and str can be null.
-		
-		This is a formatted print, and will insert 
-		tabs and newlines.
-		
-		(For an unformatted stream, use the << operator.)
-	*/
-	virtual void Print( FILE* cfile, int depth ) const = 0;
-
-	/**	The world does not agree on whether white space should be kept or
-		not. In order to make everyone happy, these global, static functions
-		are provided to set whether or not TinyXml will condense all white space
-		into a single space or not. The default is to condense. Note changing this
-		value is not thread safe.
-	*/
-	static void SetCondenseWhiteSpace( bool condense )		{ condenseWhiteSpace = condense; }
-
-	/// Return the current white space setting.
-	static bool IsWhiteSpaceCondensed()						{ return condenseWhiteSpace; }
-
-	/** Return the position, in the original source file, of this node or attribute.
-		The row and column are 1-based. (That is the first row and first column is
-		1,1). If the returns values are 0 or less, then the parser does not have
-		a row and column value.
-
-		Generally, the row and column value will be set when the TiXmlDocument::Load(),
-		TiXmlDocument::LoadFile(), or any TiXmlNode::Parse() is called. It will NOT be set
-		when the DOM was created from operator>>.
-
-		The values reflect the initial load. Once the DOM is modified programmatically
-		(by adding or changing nodes and attributes) the new values will NOT update to
-		reflect changes in the document.
-
-		There is a minor performance cost to computing the row and column. Computation
-		can be disabled if TiXmlDocument::SetTabSize() is called with 0 as the value.
-
-		@sa TiXmlDocument::SetTabSize()
-	*/
-	int Row() const			{ return location.row + 1; }
-	int Column() const		{ return location.col + 1; }	///< See Row()
-
-	void  SetUserData( void* user )			{ userData = user; }	///< Set a pointer to arbitrary user data.
-	void* GetUserData()						{ return userData; }	///< Get a pointer to arbitrary user data.
-	const void* GetUserData() const 		{ return userData; }	///< Get a pointer to arbitrary user data.
-
-	// Table that returs, for a given lead byte, the total number of bytes
-	// in the UTF-8 sequence.
-	static const int utf8ByteTable[256];
-
-	virtual const char* Parse(	const char* p, 
-								TiXmlParsingData* data, 
-								TiXmlEncoding encoding /*= TIXML_ENCODING_UNKNOWN */ ) = 0;
-
-	/** Expands entities in a string. Note this should not contian the tag's '<', '>', etc, 
-		or they will be transformed into entities!
-	*/
-	static void EncodeString( const TIXML_STRING& str, TIXML_STRING* out );
+    TiXmlBase()	:	userData( 0 )		{}
+    virtual ~TiXmlBase()			{}
 
-	enum
-	{
-		TIXML_NO_ERROR = 0,
-		TIXML_ERROR,
-		TIXML_ERROR_OPENING_FILE,
-		TIXML_ERROR_PARSING_ELEMENT,
-		TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME,
-		TIXML_ERROR_READING_ELEMENT_VALUE,
-		TIXML_ERROR_READING_ATTRIBUTES,
-		TIXML_ERROR_PARSING_EMPTY,
-		TIXML_ERROR_READING_END_TAG,
-		TIXML_ERROR_PARSING_UNKNOWN,
-		TIXML_ERROR_PARSING_COMMENT,
-		TIXML_ERROR_PARSING_DECLARATION,
-		TIXML_ERROR_DOCUMENT_EMPTY,
-		TIXML_ERROR_EMBEDDED_NULL,
-		TIXML_ERROR_PARSING_CDATA,
-		TIXML_ERROR_DOCUMENT_TOP_ONLY,
+    /**	All TinyXml classes can print themselves to a filestream
+    	or the string class (TiXmlString in non-STL mode, std::string
+    	in STL mode.) Either or both cfile and str can be null.
+
+    	This is a formatted print, and will insert
+    	tabs and newlines.
+
+    	(For an unformatted stream, use the << operator.)
+    */
+    virtual void Print( FILE* cfile, int depth ) const = 0;
+
+    /**	The world does not agree on whether white space should be kept or
+    	not. In order to make everyone happy, these global, static functions
+    	are provided to set whether or not TinyXml will condense all white space
+    	into a single space or not. The default is to condense. Note changing this
+    	value is not thread safe.
+    */
+    static void SetCondenseWhiteSpace( bool condense )
+    {
+        condenseWhiteSpace = condense;
+    }
+
+    /// Return the current white space setting.
+    static bool IsWhiteSpaceCondensed()
+    {
+        return condenseWhiteSpace;
+    }
+
+    /** Return the position, in the original source file, of this node or attribute.
+    	The row and column are 1-based. (That is the first row and first column is
+    	1,1). If the returns values are 0 or less, then the parser does not have
+    	a row and column value.
+
+    	Generally, the row and column value will be set when the TiXmlDocument::Load(),
+    	TiXmlDocument::LoadFile(), or any TiXmlNode::Parse() is called. It will NOT be set
+    	when the DOM was created from operator>>.
+
+    	The values reflect the initial load. Once the DOM is modified programmatically
+    	(by adding or changing nodes and attributes) the new values will NOT update to
+    	reflect changes in the document.
+
+    	There is a minor performance cost to computing the row and column. Computation
+    	can be disabled if TiXmlDocument::SetTabSize() is called with 0 as the value.
+
+    	@sa TiXmlDocument::SetTabSize()
+    */
+    int Row() const
+    {
+        return location.row + 1;
+    }
+    int Column() const
+    {
+        return location.col + 1;    ///< See Row()
+    }
+
+    void  SetUserData( void* user )
+    {
+        userData = user;    ///< Set a pointer to arbitrary user data.
+    }
+    void* GetUserData()
+    {
+        return userData;    ///< Get a pointer to arbitrary user data.
+    }
+    const void* GetUserData() const
+    {
+        return userData;    ///< Get a pointer to arbitrary user data.
+    }
+
+    // Table that returs, for a given lead byte, the total number of bytes
+    // in the UTF-8 sequence.
+    static const int utf8ByteTable[256];
+
+    virtual const char* Parse(	const char* p,
+                                TiXmlParsingData* data,
+                                TiXmlEncoding encoding /*= TIXML_ENCODING_UNKNOWN */ ) = 0;
+
+    /** Expands entities in a string. Note this should not contian the tag's '<', '>', etc,
+    	or they will be transformed into entities!
+    */
+    static void EncodeString( const TIXML_STRING& str, TIXML_STRING* out );
+
+    enum
+    {
+        TIXML_NO_ERROR = 0,
+        TIXML_ERROR,
+        TIXML_ERROR_OPENING_FILE,
+        TIXML_ERROR_PARSING_ELEMENT,
+        TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME,
+        TIXML_ERROR_READING_ELEMENT_VALUE,
+        TIXML_ERROR_READING_ATTRIBUTES,
+        TIXML_ERROR_PARSING_EMPTY,
+        TIXML_ERROR_READING_END_TAG,
+        TIXML_ERROR_PARSING_UNKNOWN,
+        TIXML_ERROR_PARSING_COMMENT,
+        TIXML_ERROR_PARSING_DECLARATION,
+        TIXML_ERROR_DOCUMENT_EMPTY,
+        TIXML_ERROR_EMBEDDED_NULL,
+        TIXML_ERROR_PARSING_CDATA,
+        TIXML_ERROR_DOCUMENT_TOP_ONLY,
 
-		TIXML_ERROR_STRING_COUNT
-	};
+        TIXML_ERROR_STRING_COUNT
+    };
 
 protected:
 
-	static const char* SkipWhiteSpace( const char*, TiXmlEncoding encoding );
-
-	inline static bool IsWhiteSpace( char c )		
-	{ 
-		return ( isspace( (unsigned char) c ) || c == '\n' || c == '\r' ); 
-	}
-	inline static bool IsWhiteSpace( int c )
-	{
-		if ( c < 256 )
-			return IsWhiteSpace( (char) c );
-		return false;	// Again, only truly correct for English/Latin...but usually works.
-	}
+    static const char* SkipWhiteSpace( const char*, TiXmlEncoding encoding );
 
-	#ifdef TIXML_USE_STL
-	static bool	StreamWhiteSpace( std::istream * in, TIXML_STRING * tag );
-	static bool StreamTo( std::istream * in, int character, TIXML_STRING * tag );
-	#endif
-
-	/*	Reads an XML name into the string provided. Returns
-		a pointer just past the last character of the name,
-		or 0 if the function has an error.
-	*/
-	static const char* ReadName( const char* p, TIXML_STRING* name, TiXmlEncoding encoding );
-
-	/*	Reads text. Returns a pointer past the given end tag.
-		Wickedly complex options, but it keeps the (sensitive) code in one place.
-	*/
-	static const char* ReadText(	const char* in,				// where to start
-									TIXML_STRING* text,			// the string read
-									bool ignoreWhiteSpace,		// whether to keep the white space
-									const char* endTag,			// what ends this text
-									bool ignoreCase,			// whether to ignore case in the end tag
-									TiXmlEncoding encoding );	// the current encoding
-
-	// If an entity has been found, transform it into a character.
-	static const char* GetEntity( const char* in, char* value, int* length, TiXmlEncoding encoding );
-
-	// Get a character, while interpreting entities.
-	// The length can be from 0 to 4 bytes.
-	inline static const char* GetChar( const char* p, char* _value, int* length, TiXmlEncoding encoding )
-	{
-		assert( p );
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			*length = utf8ByteTable[ *((const unsigned char*)p) ];
-			assert( *length >= 0 && *length < 5 );
-		}
-		else
-		{
-			*length = 1;
-		}
+    inline static bool IsWhiteSpace( char c )
+    {
+        return ( isspace( ( unsigned char ) c ) || c == '\n' || c == '\r' );
+    }
+    inline static bool IsWhiteSpace( int c )
+    {
+        if ( c < 256 )
+            return IsWhiteSpace( ( char ) c );
+        return false;	// Again, only truly correct for English/Latin...but usually works.
+    }
 
-		if ( *length == 1 )
-		{
-			if ( *p == '&' )
-				return GetEntity( p, _value, length, encoding );
-			*_value = *p;
-			return p+1;
-		}
-		else if ( *length )
-		{
-			//strncpy( _value, p, *length );	// lots of compilers don't like this function (unsafe),
-												// and the null terminator isn't needed
-			for( int i=0; p[i] && i<*length; ++i ) {
-				_value[i] = p[i];
-			}
-			return p + (*length);
-		}
-		else
-		{
-			// Not valid text.
-			return 0;
-		}
-	}
+#ifdef TIXML_USE_STL
+    static bool	StreamWhiteSpace( std::istream * in, TIXML_STRING * tag );
+    static bool StreamTo( std::istream * in, int character, TIXML_STRING * tag );
+#endif
 
-	// Return true if the next characters in the stream are any of the endTag sequences.
-	// Ignore case only works for english, and should only be relied on when comparing
-	// to English words: StringEqual( p, "version", true ) is fine.
-	static bool StringEqual(	const char* p,
-								const char* endTag,
-								bool ignoreCase,
-								TiXmlEncoding encoding );
+    /*	Reads an XML name into the string provided. Returns
+    	a pointer just past the last character of the name,
+    	or 0 if the function has an error.
+    */
+    static const char* ReadName( const char* p, TIXML_STRING* name, TiXmlEncoding encoding );
+
+    /*	Reads text. Returns a pointer past the given end tag.
+    	Wickedly complex options, but it keeps the (sensitive) code in one place.
+    */
+    static const char* ReadText(	const char* in,				// where to start
+                                    TIXML_STRING* text,			// the string read
+                                    bool ignoreWhiteSpace,		// whether to keep the white space
+                                    const char* endTag,			// what ends this text
+                                    bool ignoreCase,			// whether to ignore case in the end tag
+                                    TiXmlEncoding encoding );	// the current encoding
+
+    // If an entity has been found, transform it into a character.
+    static const char* GetEntity( const char* in, char* value, int* length, TiXmlEncoding encoding );
+
+    // Get a character, while interpreting entities.
+    // The length can be from 0 to 4 bytes.
+    inline static const char* GetChar( const char* p, char* _value, int* length, TiXmlEncoding encoding )
+    {
+        assert( p );
+        if ( encoding == TIXML_ENCODING_UTF8 )
+        {
+            *length = utf8ByteTable[ *( ( const unsigned char* )p ) ];
+            assert( *length >= 0 && *length < 5 );
+        }
+        else
+        {
+            *length = 1;
+        }
+
+        if ( *length == 1 )
+        {
+            if ( *p == '&' )
+                return GetEntity( p, _value, length, encoding );
+            *_value = *p;
+            return p+1;
+        }
+        else if ( *length )
+        {
+            //strncpy( _value, p, *length );	// lots of compilers don't like this function (unsafe),
+            // and the null terminator isn't needed
+            for ( int i=0; p[i] && i<*length; ++i )
+            {
+                _value[i] = p[i];
+            }
+            return p + ( *length );
+        }
+        else
+        {
+            // Not valid text.
+            return 0;
+        }
+    }
+
+    // Return true if the next characters in the stream are any of the endTag sequences.
+    // Ignore case only works for english, and should only be relied on when comparing
+    // to English words: StringEqual( p, "version", true ) is fine.
+    static bool StringEqual(	const char* p,
+                                const char* endTag,
+                                bool ignoreCase,
+                                TiXmlEncoding encoding );
 
-	static const char* errorString[ TIXML_ERROR_STRING_COUNT ];
+    static const char* errorString[ TIXML_ERROR_STRING_COUNT ];
 
-	TiXmlCursor location;
+    TiXmlCursor location;
 
     /// Field containing a generic user pointer
-	void*			userData;
-	
-	// None of these methods are reliable for any language except English.
-	// Good for approximation, not great for accuracy.
-	static int IsAlpha( unsigned char anyByte, TiXmlEncoding encoding );
-	static int IsAlphaNum( unsigned char anyByte, TiXmlEncoding encoding );
-	inline static int ToLower( int v, TiXmlEncoding encoding )
-	{
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			if ( v < 128 ) return tolower( v );
-			return v;
-		}
-		else
-		{
-			return tolower( v );
-		}
-	}
-	static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length );
+    void*			userData;
 
-private:
-	TiXmlBase( const TiXmlBase& );				// not implemented.
-	void operator=( const TiXmlBase& base );	// not allowed.
+    // None of these methods are reliable for any language except English.
+    // Good for approximation, not great for accuracy.
+    static int IsAlpha( unsigned char anyByte, TiXmlEncoding encoding );
+    static int IsAlphaNum( unsigned char anyByte, TiXmlEncoding encoding );
+    inline static int ToLower( int v, TiXmlEncoding encoding )
+    {
+        if ( encoding == TIXML_ENCODING_UTF8 )
+        {
+            if ( v < 128 ) return tolower( v );
+            return v;
+        }
+        else
+        {
+            return tolower( v );
+        }
+    }
+    static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length );
 
-	struct Entity
-	{
-		const char*     str;
-		unsigned int	strLength;
-		char		    chr;
-	};
-	enum
-	{
-		NUM_ENTITY = 5,
-		MAX_ENTITY_LENGTH = 6
+private:
+    TiXmlBase( const TiXmlBase& );				// not implemented.
+    void operator=( const TiXmlBase& base );	// not allowed.
 
-	};
-	static Entity entity[ NUM_ENTITY ];
-	static bool condenseWhiteSpace;
+    struct Entity
+    {
+        const char*     str;
+        unsigned int	strLength;
+        char		    chr;
+    };
+    enum
+    {
+        NUM_ENTITY = 5,
+        MAX_ENTITY_LENGTH = 6
+
+    };
+    static Entity entity[ NUM_ENTITY ];
+    static bool condenseWhiteSpace;
 };
 
 
@@ -422,350 +474,490 @@
 */
 class TiXmlNode : public TiXmlBase
 {
-	friend class TiXmlDocument;
-	friend class TiXmlElement;
+    friend class TiXmlDocument;
+    friend class TiXmlElement;
 
 public:
-	#ifdef TIXML_USE_STL	
+#ifdef TIXML_USE_STL
 
-	    /** An input stream operator, for every class. Tolerant of newlines and
-		    formatting, but doesn't expect them.
-	    */
-	    friend std::istream& operator >> (std::istream& in, TiXmlNode& base);
-
-	    /** An output stream operator, for every class. Note that this outputs
-		    without any newlines or formatting, as opposed to Print(), which
-		    includes tabs and new lines.
-
-		    The operator<< and operator>> are not completely symmetric. Writing
-		    a node to a stream is very well defined. You'll get a nice stream
-		    of output, without any extra whitespace or newlines.
-		    
-		    But reading is not as well defined. (As it always is.) If you create
-		    a TiXmlElement (for example) and read that from an input stream,
-		    the text needs to define an element or junk will result. This is
-		    true of all input streams, but it's worth keeping in mind.
-
-		    A TiXmlDocument will read nodes until it reads a root element, and
-			all the children of that root element.
-	    */	
-	    friend std::ostream& operator<< (std::ostream& out, const TiXmlNode& base);
-
-		/// Appends the XML node or attribute to a std::string.
-		friend std::string& operator<< (std::string& out, const TiXmlNode& base );
-
-	#endif
-
-	/** The types of XML nodes supported by TinyXml. (All the
-			unsupported types are picked up by UNKNOWN.)
-	*/
-	enum NodeType
-	{
-		TINYXML_DOCUMENT,
-		TINYXML_ELEMENT,
-		TINYXML_COMMENT,
-		TINYXML_UNKNOWN,
-		TINYXML_TEXT,
-		TINYXML_DECLARATION,
-		TINYXML_TYPECOUNT
-	};
-
-	virtual ~TiXmlNode();
-
-	/** The meaning of 'value' changes for the specific type of
-		TiXmlNode.
-		@verbatim
-		Document:	filename of the xml file
-		Element:	name of the element
-		Comment:	the comment text
-		Unknown:	the tag contents
-		Text:		the text string
-		@endverbatim
-
-		The subclasses will wrap this function.
-	*/
-	const char *Value() const { return value.c_str (); }
-
-    #ifdef TIXML_USE_STL
-	/** Return Value() as a std::string. If you only use STL,
-	    this is more efficient than calling Value().
-		Only available in STL mode.
-	*/
-	const std::string& ValueStr() const { return value; }
-	#endif
-
-	const TIXML_STRING& ValueTStr() const { return value; }
-
-	/** Changes the value of the node. Defined as:
-		@verbatim
-		Document:	filename of the xml file
-		Element:	name of the element
-		Comment:	the comment text
-		Unknown:	the tag contents
-		Text:		the text string
-		@endverbatim
-	*/
-	void SetValue(const char * _value) { value = _value;}
-
-    #ifdef TIXML_USE_STL
-	/// STL std::string form.
-	void SetValue( const std::string& _value )	{ value = _value; }
-	#endif
-
-	/// Delete all the children of this node. Does not affect 'this'.
-	void Clear();
-
-	/// One step up the DOM.
-	TiXmlNode* Parent()							{ return parent; }
-	const TiXmlNode* Parent() const				{ return parent; }
-
-	const TiXmlNode* FirstChild()	const		{ return firstChild; }	///< The first child of this node. Will be null if there are no children.
-	TiXmlNode* FirstChild()						{ return firstChild; }
-	const TiXmlNode* FirstChild( const char * value ) const;			///< The first child of this node with the matching 'value'. Will be null if none found.
-	/// The first child of this node with the matching 'value'. Will be null if none found.
-	TiXmlNode* FirstChild( const char * _value ) {
-		// Call through to the const version - safe since nothing is changed. Exiting syntax: cast this to a const (always safe)
-		// call the method, cast the return back to non-const.
-		return const_cast< TiXmlNode* > ((const_cast< const TiXmlNode* >(this))->FirstChild( _value ));
-	}
-	const TiXmlNode* LastChild() const	{ return lastChild; }		/// The last child of this node. Will be null if there are no children.
-	TiXmlNode* LastChild()	{ return lastChild; }
-	
-	const TiXmlNode* LastChild( const char * value ) const;			/// The last child of this node matching 'value'. Will be null if there are no children.
-	TiXmlNode* LastChild( const char * _value ) {
-		return const_cast< TiXmlNode* > ((const_cast< const TiXmlNode* >(this))->LastChild( _value ));
-	}
+    /** An input stream operator, for every class. Tolerant of newlines and
+        formatting, but doesn't expect them.
+    */
+    friend std::istream& operator >> ( std::istream& in, TiXmlNode& base );
+
+    /** An output stream operator, for every class. Note that this outputs
+        without any newlines or formatting, as opposed to Print(), which
+        includes tabs and new lines.
+
+        The operator<< and operator>> are not completely symmetric. Writing
+        a node to a stream is very well defined. You'll get a nice stream
+        of output, without any extra whitespace or newlines.
+
+        But reading is not as well defined. (As it always is.) If you create
+        a TiXmlElement (for example) and read that from an input stream,
+        the text needs to define an element or junk will result. This is
+        true of all input streams, but it's worth keeping in mind.
+
+        A TiXmlDocument will read nodes until it reads a root element, and
+    	all the children of that root element.
+    */
+    friend std::ostream& operator<< ( std::ostream& out, const TiXmlNode& base );
 
-    #ifdef TIXML_USE_STL
-	const TiXmlNode* FirstChild( const std::string& _value ) const	{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* FirstChild( const std::string& _value )				{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
-	const TiXmlNode* LastChild( const std::string& _value ) const	{	return LastChild (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* LastChild( const std::string& _value )				{	return LastChild (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/** An alternate way to walk the children of a node.
-		One way to iterate over nodes is:
-		@verbatim
-			for( child = parent->FirstChild(); child; child = child->NextSibling() )
-		@endverbatim
-
-		IterateChildren does the same thing with the syntax:
-		@verbatim
-			child = 0;
-			while( child = parent->IterateChildren( child ) )
-		@endverbatim
-
-		IterateChildren takes the previous child as input and finds
-		the next one. If the previous child is null, it returns the
-		first. IterateChildren will return null when done.
-	*/
-	const TiXmlNode* IterateChildren( const TiXmlNode* previous ) const;
-	TiXmlNode* IterateChildren( const TiXmlNode* previous ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->IterateChildren( previous ) );
-	}
+    /// Appends the XML node or attribute to a std::string.
+    friend std::string& operator<< ( std::string& out, const TiXmlNode& base );
 
-	/// This flavor of IterateChildren searches for children with a particular 'value'
-	const TiXmlNode* IterateChildren( const char * value, const TiXmlNode* previous ) const;
-	TiXmlNode* IterateChildren( const char * _value, const TiXmlNode* previous ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->IterateChildren( _value, previous ) );
-	}
+#endif
 
-    #ifdef TIXML_USE_STL
-	const TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) const	{	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
-	TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) {	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
-	#endif
-
-	/** Add a new node related to this. Adds a child past the LastChild.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
-
-
-	/** Add a new node related to this. Adds a child past the LastChild.
-
-		NOTE: the node to be added is passed by pointer, and will be
-		henceforth owned (and deleted) by tinyXml. This method is efficient
-		and avoids an extra copy, but should be used with care as it
-		uses a different memory model than the other insert functions.
-
-		@sa InsertEndChild
-	*/
-	TiXmlNode* LinkEndChild( TiXmlNode* addThis );
-
-	/** Add a new node related to this. Adds a child before the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
-
-	/** Add a new node related to this. Adds a child after the specified child.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* InsertAfterChild(  TiXmlNode* afterThis, const TiXmlNode& addThis );
-
-	/** Replace a child of this node.
-		Returns a pointer to the new object or NULL if an error occured.
-	*/
-	TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
-
-	/// Delete a child of this node.
-	bool RemoveChild( TiXmlNode* removeThis );
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* PreviousSibling() const			{ return prev; }
-	TiXmlNode* PreviousSibling()						{ return prev; }
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* PreviousSibling( const char * ) const;
-	TiXmlNode* PreviousSibling( const char *_prev ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->PreviousSibling( _prev ) );
-	}
+    /** The types of XML nodes supported by TinyXml. (All the
+    		unsupported types are picked up by UNKNOWN.)
+    */
+    enum NodeType
+    {
+        TINYXML_DOCUMENT,
+        TINYXML_ELEMENT,
+        TINYXML_COMMENT,
+        TINYXML_UNKNOWN,
+        TINYXML_TEXT,
+        TINYXML_DECLARATION,
+        TINYXML_TYPECOUNT
+    };
+
+    virtual ~TiXmlNode();
+
+    /** The meaning of 'value' changes for the specific type of
+    	TiXmlNode.
+    	@verbatim
+    	Document:	filename of the xml file
+    	Element:	name of the element
+    	Comment:	the comment text
+    	Unknown:	the tag contents
+    	Text:		the text string
+    	@endverbatim
+
+    	The subclasses will wrap this function.
+    */
+    const char *Value() const
+    {
+        return value.c_str ();
+    }
 
-    #ifdef TIXML_USE_STL
-	const TiXmlNode* PreviousSibling( const std::string& _value ) const	{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* PreviousSibling( const std::string& _value ) 			{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
-	const TiXmlNode* NextSibling( const std::string& _value) const		{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* NextSibling( const std::string& _value) 					{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* NextSibling() const				{ return next; }
-	TiXmlNode* NextSibling()							{ return next; }
-
-	/// Navigate to a sibling node with the given 'value'.
-	const TiXmlNode* NextSibling( const char * ) const;
-	TiXmlNode* NextSibling( const char* _next ) {
-		return const_cast< TiXmlNode* >( (const_cast< const TiXmlNode* >(this))->NextSibling( _next ) );
-	}
+#ifdef TIXML_USE_STL
+    /** Return Value() as a std::string. If you only use STL,
+        this is more efficient than calling Value().
+    	Only available in STL mode.
+    */
+    const std::string& ValueStr() const
+    {
+        return value;
+    }
+#endif
 
-	/** Convenience function to get through elements.
-		Calls NextSibling and ToElement. Will skip all non-Element
-		nodes. Returns 0 if there is not another element.
-	*/
-	const TiXmlElement* NextSiblingElement() const;
-	TiXmlElement* NextSiblingElement() {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->NextSiblingElement() );
-	}
+    const TIXML_STRING& ValueTStr() const
+    {
+        return value;
+    }
+
+    /** Changes the value of the node. Defined as:
+    	@verbatim
+    	Document:	filename of the xml file
+    	Element:	name of the element
+    	Comment:	the comment text
+    	Unknown:	the tag contents
+    	Text:		the text string
+    	@endverbatim
+    */
+    void SetValue( const char * _value )
+    {
+        value = _value;
+    }
 
-	/** Convenience function to get through elements.
-		Calls NextSibling and ToElement. Will skip all non-Element
-		nodes. Returns 0 if there is not another element.
-	*/
-	const TiXmlElement* NextSiblingElement( const char * ) const;
-	TiXmlElement* NextSiblingElement( const char *_next ) {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->NextSiblingElement( _next ) );
-	}
+#ifdef TIXML_USE_STL
+    /// STL std::string form.
+    void SetValue( const std::string& _value )
+    {
+        value = _value;
+    }
+#endif
 
-    #ifdef TIXML_USE_STL
-	const TiXmlElement* NextSiblingElement( const std::string& _value) const	{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
-	TiXmlElement* NextSiblingElement( const std::string& _value)				{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/// Convenience function to get through elements.
-	const TiXmlElement* FirstChildElement()	const;
-	TiXmlElement* FirstChildElement() {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->FirstChildElement() );
-	}
+    /// Delete all the children of this node. Does not affect 'this'.
+    void Clear();
 
-	/// Convenience function to get through elements.
-	const TiXmlElement* FirstChildElement( const char * _value ) const;
-	TiXmlElement* FirstChildElement( const char * _value ) {
-		return const_cast< TiXmlElement* >( (const_cast< const TiXmlNode* >(this))->FirstChildElement( _value ) );
-	}
+    /// One step up the DOM.
+    TiXmlNode* Parent()
+    {
+        return parent;
+    }
+    const TiXmlNode* Parent() const
+    {
+        return parent;
+    }
+
+    const TiXmlNode* FirstChild()	const
+    {
+        return firstChild;    ///< The first child of this node. Will be null if there are no children.
+    }
+    TiXmlNode* FirstChild()
+    {
+        return firstChild;
+    }
+    const TiXmlNode* FirstChild( const char * value ) const;			///< The first child of this node with the matching 'value'. Will be null if none found.
+    /// The first child of this node with the matching 'value'. Will be null if none found.
+    TiXmlNode* FirstChild( const char * _value )
+    {
+        // Call through to the const version - safe since nothing is changed. Exiting syntax: cast this to a const (always safe)
+        // call the method, cast the return back to non-const.
+        return const_cast< TiXmlNode* > ( ( const_cast< const TiXmlNode* >( this ) )->FirstChild( _value ) );
+    }
+    const TiXmlNode* LastChild() const
+    {
+        return lastChild;    /// The last child of this node. Will be null if there are no children.
+    }
+    TiXmlNode* LastChild()
+    {
+        return lastChild;
+    }
+
+    const TiXmlNode* LastChild( const char * value ) const;			/// The last child of this node matching 'value'. Will be null if there are no children.
+    TiXmlNode* LastChild( const char * _value )
+    {
+        return const_cast< TiXmlNode* > ( ( const_cast< const TiXmlNode* >( this ) )->LastChild( _value ) );
+    }
 
-    #ifdef TIXML_USE_STL
-	const TiXmlElement* FirstChildElement( const std::string& _value ) const	{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
-	TiXmlElement* FirstChildElement( const std::string& _value )				{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/** Query the type (as an enumerated value, above) of this node.
-		The possible types are: TINYXML_DOCUMENT, TINYXML_ELEMENT, TINYXML_COMMENT,
-								TINYXML_UNKNOWN, TINYXML_TEXT, and TINYXML_DECLARATION.
-	*/
-	int Type() const	{ return type; }
-
-	/** Return a pointer to the Document this node lives in.
-		Returns null if not in a document.
-	*/
-	const TiXmlDocument* GetDocument() const;
-	TiXmlDocument* GetDocument() {
-		return const_cast< TiXmlDocument* >( (const_cast< const TiXmlNode* >(this))->GetDocument() );
-	}
+#ifdef TIXML_USE_STL
+    const TiXmlNode* FirstChild( const std::string& _value ) const
+    {
+        return FirstChild ( _value.c_str () );	   ///< STL std::string form.
+    }
+    TiXmlNode* FirstChild( const std::string& _value )
+    {
+        return FirstChild ( _value.c_str () );	   ///< STL std::string form.
+    }
+    const TiXmlNode* LastChild( const std::string& _value ) const
+    {
+        return LastChild ( _value.c_str () );	   ///< STL std::string form.
+    }
+    TiXmlNode* LastChild( const std::string& _value )
+    {
+        return LastChild ( _value.c_str () );	   ///< STL std::string form.
+    }
+#endif
+
+    /** An alternate way to walk the children of a node.
+    	One way to iterate over nodes is:
+    	@verbatim
+    		for( child = parent->FirstChild(); child; child = child->NextSibling() )
+    	@endverbatim
+
+    	IterateChildren does the same thing with the syntax:
+    	@verbatim
+    		child = 0;
+    		while( child = parent->IterateChildren( child ) )
+    	@endverbatim
+
+    	IterateChildren takes the previous child as input and finds
+    	the next one. If the previous child is null, it returns the
+    	first. IterateChildren will return null when done.
+    */
+    const TiXmlNode* IterateChildren( const TiXmlNode* previous ) const;
+    TiXmlNode* IterateChildren( const TiXmlNode* previous )
+    {
+        return const_cast< TiXmlNode* >( ( const_cast< const TiXmlNode* >( this ) )->IterateChildren( previous ) );
+    }
+
+    /// This flavor of IterateChildren searches for children with a particular 'value'
+    const TiXmlNode* IterateChildren( const char * value, const TiXmlNode* previous ) const;
+    TiXmlNode* IterateChildren( const char * _value, const TiXmlNode* previous )
+    {
+        return const_cast< TiXmlNode* >( ( const_cast< const TiXmlNode* >( this ) )->IterateChildren( _value, previous ) );
+    }
+
+#ifdef TIXML_USE_STL
+    const TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) const
+    {
+        return IterateChildren ( _value.c_str (), previous );	   ///< STL std::string form.
+    }
+    TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous )
+    {
+        return IterateChildren ( _value.c_str (), previous );	   ///< STL std::string form.
+    }
+#endif
+
+    /** Add a new node related to this. Adds a child past the LastChild.
+    	Returns a pointer to the new object or NULL if an error occured.
+    */
+    TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
+
+
+    /** Add a new node related to this. Adds a child past the LastChild.
+
+    	NOTE: the node to be added is passed by pointer, and will be
+    	henceforth owned (and deleted) by tinyXml. This method is efficient
+    	and avoids an extra copy, but should be used with care as it
+    	uses a different memory model than the other insert functions.
+
+    	@sa InsertEndChild
+    */
+    TiXmlNode* LinkEndChild( TiXmlNode* addThis );
+
+    /** Add a new node related to this. Adds a child before the specified child.
+    	Returns a pointer to the new object or NULL if an error occured.
+    */
+    TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
+
+    /** Add a new node related to this. Adds a child after the specified child.
+    	Returns a pointer to the new object or NULL if an error occured.
+    */
+    TiXmlNode* InsertAfterChild(  TiXmlNode* afterThis, const TiXmlNode& addThis );
+
+    /** Replace a child of this node.
+    	Returns a pointer to the new object or NULL if an error occured.
+    */
+    TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
+
+    /// Delete a child of this node.
+    bool RemoveChild( TiXmlNode* removeThis );
+
+    /// Navigate to a sibling node.
+    const TiXmlNode* PreviousSibling() const
+    {
+        return prev;
+    }
+    TiXmlNode* PreviousSibling()
+    {
+        return prev;
+    }
+
+    /// Navigate to a sibling node.
+    const TiXmlNode* PreviousSibling( const char * ) const;
+    TiXmlNode* PreviousSibling( const char *_prev )
+    {
+        return const_cast< TiXmlNode* >( ( const_cast< const TiXmlNode* >( this ) )->PreviousSibling( _prev ) );
+    }
+
+#ifdef TIXML_USE_STL
+    const TiXmlNode* PreviousSibling( const std::string& _value ) const
+    {
+        return PreviousSibling ( _value.c_str () );	   ///< STL std::string form.
+    }
+    TiXmlNode* PreviousSibling( const std::string& _value )
+    {
+        return PreviousSibling ( _value.c_str () );	   ///< STL std::string form.
+    }
+    const TiXmlNode* NextSibling( const std::string& _value ) const
+    {
+        return NextSibling ( _value.c_str () );	   ///< STL std::string form.
+    }
+    TiXmlNode* NextSibling( const std::string& _value )
+    {
+        return NextSibling ( _value.c_str () );	   ///< STL std::string form.
+    }
+#endif
 
-	/// Returns true if this node has no children.
-	bool NoChildren() const						{ return !firstChild; }
+    /// Navigate to a sibling node.
+    const TiXmlNode* NextSibling() const
+    {
+        return next;
+    }
+    TiXmlNode* NextSibling()
+    {
+        return next;
+    }
+
+    /// Navigate to a sibling node with the given 'value'.
+    const TiXmlNode* NextSibling( const char * ) const;
+    TiXmlNode* NextSibling( const char* _next )
+    {
+        return const_cast< TiXmlNode* >( ( const_cast< const TiXmlNode* >( this ) )->NextSibling( _next ) );
+    }
+
+    /** Convenience function to get through elements.
+    	Calls NextSibling and ToElement. Will skip all non-Element
+    	nodes. Returns 0 if there is not another element.
+    */
+    const TiXmlElement* NextSiblingElement() const;
+    TiXmlElement* NextSiblingElement()
+    {
+        return const_cast< TiXmlElement* >( ( const_cast< const TiXmlNode* >( this ) )->NextSiblingElement() );
+    }
+
+    /** Convenience function to get through elements.
+    	Calls NextSibling and ToElement. Will skip all non-Element
+    	nodes. Returns 0 if there is not another element.
+    */
+    const TiXmlElement* NextSiblingElement( const char * ) const;
+    TiXmlElement* NextSiblingElement( const char *_next )
+    {
+        return const_cast< TiXmlElement* >( ( const_cast< const TiXmlNode* >( this ) )->NextSiblingElement( _next ) );
+    }
 
-	virtual const TiXmlDocument*    ToDocument()    const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlElement*     ToElement()     const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlComment*     ToComment()     const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlUnknown*     ToUnknown()     const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlText*        ToText()        const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual const TiXmlDeclaration* ToDeclaration() const { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-
-	virtual TiXmlDocument*          ToDocument()    { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlElement*           ToElement()	    { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlComment*           ToComment()     { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlUnknown*           ToUnknown()	    { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlText*	            ToText()        { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-	virtual TiXmlDeclaration*       ToDeclaration() { return 0; } ///< Cast to a more defined type. Will return null if not of the requested type.
-
-	/** Create an exact duplicate of this node and return it. The memory must be deleted
-		by the caller. 
-	*/
-	virtual TiXmlNode* Clone() const = 0;
-
-	/** Accept a hierchical visit the nodes in the TinyXML DOM. Every node in the 
-		XML tree will be conditionally visited and the host will be called back
-		via the TiXmlVisitor interface.
-
-		This is essentially a SAX interface for TinyXML. (Note however it doesn't re-parse
-		the XML for the callbacks, so the performance of TinyXML is unchanged by using this
-		interface versus any other.)
-
-		The interface has been based on ideas from:
-
-		- http://www.saxproject.org/
-		- http://c2.com/cgi/wiki?HierarchicalVisitorPattern 
-
-		Which are both good references for "visiting".
-
-		An example of using Accept():
-		@verbatim
-		TiXmlPrinter printer;
-		tinyxmlDoc.Accept( &printer );
-		const char* xmlcstr = printer.CStr();
-		@endverbatim
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const = 0;
+#ifdef TIXML_USE_STL
+    const TiXmlElement* NextSiblingElement( const std::string& _value ) const
+    {
+        return NextSiblingElement ( _value.c_str () );	   ///< STL std::string form.
+    }
+    TiXmlElement* NextSiblingElement( const std::string& _value )
+    {
+        return NextSiblingElement ( _value.c_str () );	   ///< STL std::string form.
+    }
+#endif
+
+    /// Convenience function to get through elements.
+    const TiXmlElement* FirstChildElement()	const;
+    TiXmlElement* FirstChildElement()
+    {
+        return const_cast< TiXmlElement* >( ( const_cast< const TiXmlNode* >( this ) )->FirstChildElement() );
+    }
+
+    /// Convenience function to get through elements.
+    const TiXmlElement* FirstChildElement( const char * _value ) const;
+    TiXmlElement* FirstChildElement( const char * _value )
+    {
+        return const_cast< TiXmlElement* >( ( const_cast< const TiXmlNode* >( this ) )->FirstChildElement( _value ) );
+    }
+
+#ifdef TIXML_USE_STL
+    const TiXmlElement* FirstChildElement( const std::string& _value ) const
+    {
+        return FirstChildElement ( _value.c_str () );	   ///< STL std::string form.
+    }
+    TiXmlElement* FirstChildElement( const std::string& _value )
+    {
+        return FirstChildElement ( _value.c_str () );	   ///< STL std::string form.
+    }
+#endif
+
+    /** Query the type (as an enumerated value, above) of this node.
+    	The possible types are: TINYXML_DOCUMENT, TINYXML_ELEMENT, TINYXML_COMMENT,
+    							TINYXML_UNKNOWN, TINYXML_TEXT, and TINYXML_DECLARATION.
+    */
+    int Type() const
+    {
+        return type;
+    }
+
+    /** Return a pointer to the Document this node lives in.
+    	Returns null if not in a document.
+    */
+    const TiXmlDocument* GetDocument() const;
+    TiXmlDocument* GetDocument()
+    {
+        return const_cast< TiXmlDocument* >( ( const_cast< const TiXmlNode* >( this ) )->GetDocument() );
+    }
+
+    /// Returns true if this node has no children.
+    bool NoChildren() const
+    {
+        return !firstChild;
+    }
+
+    virtual const TiXmlDocument*    ToDocument()    const
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual const TiXmlElement*     ToElement()     const
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual const TiXmlComment*     ToComment()     const
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual const TiXmlUnknown*     ToUnknown()     const
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual const TiXmlText*        ToText()        const
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual const TiXmlDeclaration* ToDeclaration() const
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+
+    virtual TiXmlDocument*          ToDocument()
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual TiXmlElement*           ToElement()
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual TiXmlComment*           ToComment()
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual TiXmlUnknown*           ToUnknown()
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual TiXmlText*	            ToText()
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+    virtual TiXmlDeclaration*       ToDeclaration()
+    {
+        return 0;    ///< Cast to a more defined type. Will return null if not of the requested type.
+    }
+
+    /** Create an exact duplicate of this node and return it. The memory must be deleted
+    	by the caller.
+    */
+    virtual TiXmlNode* Clone() const = 0;
+
+    /** Accept a hierchical visit the nodes in the TinyXML DOM. Every node in the
+    	XML tree will be conditionally visited and the host will be called back
+    	via the TiXmlVisitor interface.
+
+    	This is essentially a SAX interface for TinyXML. (Note however it doesn't re-parse
+    	the XML for the callbacks, so the performance of TinyXML is unchanged by using this
+    	interface versus any other.)
+
+    	The interface has been based on ideas from:
+
+    	- http://www.saxproject.org/
+    	- http://c2.com/cgi/wiki?HierarchicalVisitorPattern
+
+    	Which are both good references for "visiting".
+
+    	An example of using Accept():
+    	@verbatim
+    	TiXmlPrinter printer;
+    	tinyxmlDoc.Accept( &printer );
+    	const char* xmlcstr = printer.CStr();
+    	@endverbatim
+    */
+    virtual bool Accept( TiXmlVisitor* visitor ) const = 0;
 
 protected:
-	TiXmlNode( NodeType _type );
+    TiXmlNode( NodeType _type );
 
-	// Copy to the allocated object. Shared functionality between Clone, Copy constructor,
-	// and the assignment operator.
-	void CopyTo( TiXmlNode* target ) const;
+    // Copy to the allocated object. Shared functionality between Clone, Copy constructor,
+    // and the assignment operator.
+    void CopyTo( TiXmlNode* target ) const;
 
-	#ifdef TIXML_USE_STL
-	    // The real work of the input operator.
-	virtual void StreamIn( std::istream* in, TIXML_STRING* tag ) = 0;
-	#endif
+#ifdef TIXML_USE_STL
+    // The real work of the input operator.
+    virtual void StreamIn( std::istream* in, TIXML_STRING* tag ) = 0;
+#endif
 
-	// Figure out what is at *p, and parse it. Returns null if it is not an xml node.
-	TiXmlNode* Identify( const char* start, TiXmlEncoding encoding );
+    // Figure out what is at *p, and parse it. Returns null if it is not an xml node.
+    TiXmlNode* Identify( const char* start, TiXmlEncoding encoding );
 
-	TiXmlNode*		parent;
-	NodeType		type;
+    TiXmlNode*		parent;
+    NodeType		type;
 
-	TiXmlNode*		firstChild;
-	TiXmlNode*		lastChild;
+    TiXmlNode*		firstChild;
+    TiXmlNode*		lastChild;
 
-	TIXML_STRING	value;
+    TIXML_STRING	value;
 
-	TiXmlNode*		prev;
-	TiXmlNode*		next;
+    TiXmlNode*		prev;
+    TiXmlNode*		next;
 
 private:
-	TiXmlNode( const TiXmlNode& );				// not implemented.
-	void operator=( const TiXmlNode& base );	// not allowed.
+    TiXmlNode( const TiXmlNode& );				// not implemented.
+    void operator=( const TiXmlNode& base );	// not allowed.
 };
 
 
@@ -778,119 +970,158 @@
 */
 class TiXmlAttribute : public TiXmlBase
 {
-	friend class TiXmlAttributeSet;
+    friend class TiXmlAttributeSet;
 
 public:
-	/// Construct an empty attribute.
-	TiXmlAttribute() : TiXmlBase()
-	{
-		document = 0;
-		prev = next = 0;
-	}
+    /// Construct an empty attribute.
+    TiXmlAttribute() : TiXmlBase()
+    {
+        document = 0;
+        prev = next = 0;
+    }
 
-	#ifdef TIXML_USE_STL
-	/// std::string constructor.
-	TiXmlAttribute( const std::string& _name, const std::string& _value )
-	{
-		name = _name;
-		value = _value;
-		document = 0;
-		prev = next = 0;
-	}
-	#endif
+#ifdef TIXML_USE_STL
+    /// std::string constructor.
+    TiXmlAttribute( const std::string& _name, const std::string& _value )
+    {
+        name = _name;
+        value = _value;
+        document = 0;
+        prev = next = 0;
+    }
+#endif
 
-	/// Construct an attribute with a name and value.
-	TiXmlAttribute( const char * _name, const char * _value )
-	{
-		name = _name;
-		value = _value;
-		document = 0;
-		prev = next = 0;
-	}
+    /// Construct an attribute with a name and value.
+    TiXmlAttribute( const char * _name, const char * _value )
+    {
+        name = _name;
+        value = _value;
+        document = 0;
+        prev = next = 0;
+    }
+
+    const char*		Name()  const
+    {
+        return name.c_str();    ///< Return the name of this attribute.
+    }
+    const char*		Value() const
+    {
+        return value.c_str();    ///< Return the value of this attribute.
+    }
+#ifdef TIXML_USE_STL
+    const std::string& ValueStr() const
+    {
+        return value;    ///< Return the value of this attribute.
+    }
+#endif
+    int				IntValue() const;									///< Return the value of this attribute, converted to an integer.
+    double			DoubleValue() const;								///< Return the value of this attribute, converted to a double.
 
-	const char*		Name()  const		{ return name.c_str(); }		///< Return the name of this attribute.
-	const char*		Value() const		{ return value.c_str(); }		///< Return the value of this attribute.
-	#ifdef TIXML_USE_STL
-	const std::string& ValueStr() const	{ return value; }				///< Return the value of this attribute.
-	#endif
-	int				IntValue() const;									///< Return the value of this attribute, converted to an integer.
-	double			DoubleValue() const;								///< Return the value of this attribute, converted to a double.
-
-	// Get the tinyxml string representation
-	const TIXML_STRING& NameTStr() const { return name; }
-
-	/** QueryIntValue examines the value string. It is an alternative to the
-		IntValue() method with richer error checking.
-		If the value is an integer, it is stored in 'value' and 
-		the call returns TIXML_SUCCESS. If it is not
-		an integer, it returns TIXML_WRONG_TYPE.
-
-		A specialized but useful call. Note that for success it returns 0,
-		which is the opposite of almost all other TinyXml calls.
-	*/
-	int QueryIntValue( int* _value ) const;
-	/// QueryDoubleValue examines the value string. See QueryIntValue().
-	int QueryDoubleValue( double* _value ) const;
-
-	void SetName( const char* _name )	{ name = _name; }				///< Set the name of this attribute.
-	void SetValue( const char* _value )	{ value = _value; }				///< Set the value.
-
-	void SetIntValue( int _value );										///< Set the value from an integer.
-	void SetDoubleValue( double _value );								///< Set the value from a double.
-
-    #ifdef TIXML_USE_STL
-	/// STL std::string form.
-	void SetName( const std::string& _name )	{ name = _name; }	
-	/// STL std::string form.	
-	void SetValue( const std::string& _value )	{ value = _value; }
-	#endif
-
-	/// Get the next sibling attribute in the DOM. Returns null at end.
-	const TiXmlAttribute* Next() const;
-	TiXmlAttribute* Next() {
-		return const_cast< TiXmlAttribute* >( (const_cast< const TiXmlAttribute* >(this))->Next() ); 
-	}
+    // Get the tinyxml string representation
+    const TIXML_STRING& NameTStr() const
+    {
+        return name;
+    }
+
+    /** QueryIntValue examines the value string. It is an alternative to the
+    	IntValue() method with richer error checking.
+    	If the value is an integer, it is stored in 'value' and
+    	the call returns TIXML_SUCCESS. If it is not
+    	an integer, it returns TIXML_WRONG_TYPE.
+
+    	A specialized but useful call. Note that for success it returns 0,
+    	which is the opposite of almost all other TinyXml calls.
+    */
+    int QueryIntValue( int* _value ) const;
+    /// QueryDoubleValue examines the value string. See QueryIntValue().
+    int QueryDoubleValue( double* _value ) const;
+
+    void SetName( const char* _name )
+    {
+        name = _name;    ///< Set the name of this attribute.
+    }
+    void SetValue( const char* _value )
+    {
+        value = _value;    ///< Set the value.
+    }
 
-	/// Get the previous sibling attribute in the DOM. Returns null at beginning.
-	const TiXmlAttribute* Previous() const;
-	TiXmlAttribute* Previous() {
-		return const_cast< TiXmlAttribute* >( (const_cast< const TiXmlAttribute* >(this))->Previous() ); 
-	}
+    void SetIntValue( int _value );										///< Set the value from an integer.
+    void SetDoubleValue( double _value );								///< Set the value from a double.
 
-	bool operator==( const TiXmlAttribute& rhs ) const { return rhs.name == name; }
-	bool operator<( const TiXmlAttribute& rhs )	 const { return name < rhs.name; }
-	bool operator>( const TiXmlAttribute& rhs )  const { return name > rhs.name; }
-
-	/*	Attribute parsing starts: first letter of the name
-						 returns: the next char after the value end quote
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	// Prints this Attribute to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const {
-		Print( cfile, depth, 0 );
-	}
-	void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
+#ifdef TIXML_USE_STL
+    /// STL std::string form.
+    void SetName( const std::string& _name )
+    {
+        name = _name;
+    }
+    /// STL std::string form.
+    void SetValue( const std::string& _value )
+    {
+        value = _value;
+    }
+#endif
 
-	// [internal use]
-	// Set the document pointer so the attribute can report errors.
-	void SetDocument( TiXmlDocument* doc )	{ document = doc; }
+    /// Get the next sibling attribute in the DOM. Returns null at end.
+    const TiXmlAttribute* Next() const;
+    TiXmlAttribute* Next()
+    {
+        return const_cast< TiXmlAttribute* >( ( const_cast< const TiXmlAttribute* >( this ) )->Next() );
+    }
+
+    /// Get the previous sibling attribute in the DOM. Returns null at beginning.
+    const TiXmlAttribute* Previous() const;
+    TiXmlAttribute* Previous()
+    {
+        return const_cast< TiXmlAttribute* >( ( const_cast< const TiXmlAttribute* >( this ) )->Previous() );
+    }
+
+    bool operator==( const TiXmlAttribute& rhs ) const
+    {
+        return rhs.name == name;
+    }
+    bool operator<( const TiXmlAttribute& rhs )	 const
+    {
+        return name < rhs.name;
+    }
+    bool operator>( const TiXmlAttribute& rhs )  const
+    {
+        return name > rhs.name;
+    }
+
+    /*	Attribute parsing starts: first letter of the name
+    					 returns: the next char after the value end quote
+    */
+    virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+    // Prints this Attribute to a FILE stream.
+    virtual void Print( FILE* cfile, int depth ) const
+    {
+        Print( cfile, depth, 0 );
+    }
+    void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
+
+    // [internal use]
+    // Set the document pointer so the attribute can report errors.
+    void SetDocument( TiXmlDocument* doc )
+    {
+        document = doc;
+    }
 
 private:
-	TiXmlAttribute( const TiXmlAttribute& );				// not implemented.
-	void operator=( const TiXmlAttribute& base );	// not allowed.
+    TiXmlAttribute( const TiXmlAttribute& );				// not implemented.
+    void operator=( const TiXmlAttribute& base );	// not allowed.
 
-	TiXmlDocument*	document;	// A pointer back to a document, for error reporting.
-	TIXML_STRING name;
-	TIXML_STRING value;
-	TiXmlAttribute*	prev;
-	TiXmlAttribute*	next;
+    TiXmlDocument*	document;	// A pointer back to a document, for error reporting.
+    TIXML_STRING name;
+    TIXML_STRING value;
+    TiXmlAttribute*	prev;
+    TiXmlAttribute*	next;
 };
 
 
 /*	A class used to manage a group of attributes.
 	It is only used internally, both by the ELEMENT and the DECLARATION.
-	
+
 	The set can be changed transparent to the Element and Declaration
 	classes that use it, but NOT transparent to the Attribute
 	which has to implement a next() and previous() method. Which makes
@@ -903,33 +1134,45 @@
 class TiXmlAttributeSet
 {
 public:
-	TiXmlAttributeSet();
-	~TiXmlAttributeSet();
+    TiXmlAttributeSet();
+    ~TiXmlAttributeSet();
 
-	void Add( TiXmlAttribute* attribute );
-	void Remove( TiXmlAttribute* attribute );
+    void Add( TiXmlAttribute* attribute );
+    void Remove( TiXmlAttribute* attribute );
 
-	const TiXmlAttribute* First()	const	{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
-	TiXmlAttribute* First()					{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
-	const TiXmlAttribute* Last() const		{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
-	TiXmlAttribute* Last()					{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
+    const TiXmlAttribute* First()	const
+    {
+        return ( sentinel.next == &sentinel ) ? 0 : sentinel.next;
+    }
+    TiXmlAttribute* First()
+    {
+        return ( sentinel.next == &sentinel ) ? 0 : sentinel.next;
+    }
+    const TiXmlAttribute* Last() const
+    {
+        return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev;
+    }
+    TiXmlAttribute* Last()
+    {
+        return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev;
+    }
 
-	TiXmlAttribute*	Find( const char* _name ) const;
-	TiXmlAttribute* FindOrCreate( const char* _name );
+    TiXmlAttribute*	Find( const char* _name ) const;
+    TiXmlAttribute* FindOrCreate( const char* _name );
 
 #	ifdef TIXML_USE_STL
-	TiXmlAttribute*	Find( const std::string& _name ) const;
-	TiXmlAttribute* FindOrCreate( const std::string& _name );
+    TiXmlAttribute*	Find( const std::string& _name ) const;
+    TiXmlAttribute* FindOrCreate( const std::string& _name );
 #	endif
 
 
 private:
-	//*ME:	Because of hidden/disabled copy-construktor in TiXmlAttribute (sentinel-element),
-	//*ME:	this class must be also use a hidden/disabled copy-constructor !!!
-	TiXmlAttributeSet( const TiXmlAttributeSet& );	// not allowed
-	void operator=( const TiXmlAttributeSet& );	// not allowed (as TiXmlAttribute)
+    //*ME:	Because of hidden/disabled copy-construktor in TiXmlAttribute (sentinel-element),
+    //*ME:	this class must be also use a hidden/disabled copy-constructor !!!
+    TiXmlAttributeSet( const TiXmlAttributeSet& );	// not allowed
+    void operator=( const TiXmlAttributeSet& );	// not allowed (as TiXmlAttribute)
 
-	TiXmlAttribute sentinel;
+    TiXmlAttribute sentinel;
 };
 
 
@@ -940,220 +1183,245 @@
 class TiXmlElement : public TiXmlNode
 {
 public:
-	/// Construct an element.
-	TiXmlElement (const char * in_value);
+    /// Construct an element.
+    TiXmlElement ( const char * in_value );
 
-	#ifdef TIXML_USE_STL
-	/// std::string constructor.
-	TiXmlElement( const std::string& _value );
-	#endif
-
-	TiXmlElement( const TiXmlElement& );
-
-	TiXmlElement& operator=( const TiXmlElement& base );
-
-	virtual ~TiXmlElement();
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-	*/
-	const char* Attribute( const char* name ) const;
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-		If the attribute exists and can be converted to an integer,
-		the integer value will be put in the return 'i', if 'i'
-		is non-null.
-	*/
-	const char* Attribute( const char* name, int* i ) const;
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-		If the attribute exists and can be converted to an double,
-		the double value will be put in the return 'd', if 'd'
-		is non-null.
-	*/
-	const char* Attribute( const char* name, double* d ) const;
-
-	/** QueryIntAttribute examines the attribute - it is an alternative to the
-		Attribute() method with richer error checking.
-		If the attribute is an integer, it is stored in 'value' and 
-		the call returns TIXML_SUCCESS. If it is not
-		an integer, it returns TIXML_WRONG_TYPE. If the attribute
-		does not exist, then TIXML_NO_ATTRIBUTE is returned.
-	*/	
-	int QueryIntAttribute( const char* name, int* _value ) const;
-	/// QueryUnsignedAttribute examines the attribute - see QueryIntAttribute().
-	int QueryUnsignedAttribute( const char* name, unsigned* _value ) const;
-	/** QueryBoolAttribute examines the attribute - see QueryIntAttribute(). 
-		Note that '1', 'true', or 'yes' are considered true, while '0', 'false'
-		and 'no' are considered false.
-	*/
-	int QueryBoolAttribute( const char* name, bool* _value ) const;
-	/// QueryDoubleAttribute examines the attribute - see QueryIntAttribute().
-	int QueryDoubleAttribute( const char* name, double* _value ) const;
-	/// QueryFloatAttribute examines the attribute - see QueryIntAttribute().
-	int QueryFloatAttribute( const char* name, float* _value ) const {
-		double d;
-		int result = QueryDoubleAttribute( name, &d );
-		if ( result == TIXML_SUCCESS ) {
-			*_value = (float)d;
-		}
-		return result;
-	}
+#ifdef TIXML_USE_STL
+    /// std::string constructor.
+    TiXmlElement( const std::string& _value );
+#endif
 
-    #ifdef TIXML_USE_STL
-	/// QueryStringAttribute examines the attribute - see QueryIntAttribute().
-	int QueryStringAttribute( const char* name, std::string* _value ) const {
-		const char* cstr = Attribute( name );
-		if ( cstr ) {
-			*_value = std::string( cstr );
-			return TIXML_SUCCESS;
-		}
-		return TIXML_NO_ATTRIBUTE;
-	}
+    TiXmlElement( const TiXmlElement& );
 
-	/** Template form of the attribute query which will try to read the
-		attribute into the specified type. Very easy, very powerful, but
-		be careful to make sure to call this with the correct type.
-		
-		NOTE: This method doesn't work correctly for 'string' types that contain spaces.
-
-		@return TIXML_SUCCESS, TIXML_WRONG_TYPE, or TIXML_NO_ATTRIBUTE
-	*/
-	template< typename T > int QueryValueAttribute( const std::string& name, T* outValue ) const
-	{
-		const TiXmlAttribute* node = attributeSet.Find( name );
-		if ( !node )
-			return TIXML_NO_ATTRIBUTE;
-
-		std::stringstream sstream( node->ValueStr() );
-		sstream >> *outValue;
-		if ( !sstream.fail() )
-			return TIXML_SUCCESS;
-		return TIXML_WRONG_TYPE;
-	}
+    TiXmlElement& operator=( const TiXmlElement& base );
 
-	int QueryValueAttribute( const std::string& name, std::string* outValue ) const
-	{
-		const TiXmlAttribute* node = attributeSet.Find( name );
-		if ( !node )
-			return TIXML_NO_ATTRIBUTE;
-		*outValue = node->ValueStr();
-		return TIXML_SUCCESS;
-	}
-	#endif
+    virtual ~TiXmlElement();
 
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetAttribute( const char* name, const char * _value );
-
-    #ifdef TIXML_USE_STL
-	const std::string* Attribute( const std::string& name ) const;
-	const std::string* Attribute( const std::string& name, int* i ) const;
-	const std::string* Attribute( const std::string& name, double* d ) const;
-	int QueryIntAttribute( const std::string& name, int* _value ) const;
-	int QueryDoubleAttribute( const std::string& name, double* _value ) const;
-
-	/// STL std::string form.
-	void SetAttribute( const std::string& name, const std::string& _value );
-	///< STL std::string form.
-	void SetAttribute( const std::string& name, int _value );
-	///< STL std::string form.
-	void SetDoubleAttribute( const std::string& name, double value );
-	#endif
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetAttribute( const char * name, int value );
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetDoubleAttribute( const char * name, double value );
-
-	/** Deletes an attribute with the given name.
-	*/
-	void RemoveAttribute( const char * name );
-    #ifdef TIXML_USE_STL
-	void RemoveAttribute( const std::string& name )	{	RemoveAttribute (name.c_str ());	}	///< STL std::string form.
-	#endif
-
-	const TiXmlAttribute* FirstAttribute() const	{ return attributeSet.First(); }		///< Access the first attribute in this element.
-	TiXmlAttribute* FirstAttribute() 				{ return attributeSet.First(); }
-	const TiXmlAttribute* LastAttribute()	const 	{ return attributeSet.Last(); }		///< Access the last attribute in this element.
-	TiXmlAttribute* LastAttribute()					{ return attributeSet.Last(); }
-
-	/** Convenience function for easy access to the text inside an element. Although easy
-		and concise, GetText() is limited compared to getting the TiXmlText child
-		and accessing it directly.
-	
-		If the first child of 'this' is a TiXmlText, the GetText()
-		returns the character string of the Text node, else null is returned.
-
-		This is a convenient method for getting the text of simple contained text:
-		@verbatim
-		<foo>This is text</foo>
-		const char* str = fooElement->GetText();
-		@endverbatim
-
-		'str' will be a pointer to "This is text". 
-		
-		Note that this function can be misleading. If the element foo was created from
-		this XML:
-		@verbatim
-		<foo><b>This is text</b></foo> 
-		@endverbatim
-
-		then the value of str would be null. The first child node isn't a text node, it is
-		another element. From this XML:
-		@verbatim
-		<foo>This is <b>text</b></foo> 
-		@endverbatim
-		GetText() will return "This is ".
-
-		WARNING: GetText() accesses a child node - don't become confused with the 
-				 similarly named TiXmlHandle::Text() and TiXmlNode::ToText() which are 
-				 safe type casts on the referenced node.
-	*/
-	const char* GetText() const;
-
-	/// Creates a new Element and returns it - the returned element is a copy.
-	virtual TiXmlNode* Clone() const;
-	// Print the Element to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/*	Attribtue parsing starts: next char past '<'
-						 returns: next char past '>'
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlElement*     ToElement()     const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlElement*           ToElement()	          { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const;
+    /** Given an attribute name, Attribute() returns the value
+    	for the attribute of that name, or null if none exists.
+    */
+    const char* Attribute( const char* name ) const;
+
+    /** Given an attribute name, Attribute() returns the value
+    	for the attribute of that name, or null if none exists.
+    	If the attribute exists and can be converted to an integer,
+    	the integer value will be put in the return 'i', if 'i'
+    	is non-null.
+    */
+    const char* Attribute( const char* name, int* i ) const;
+
+    /** Given an attribute name, Attribute() returns the value
+    	for the attribute of that name, or null if none exists.
+    	If the attribute exists and can be converted to an double,
+    	the double value will be put in the return 'd', if 'd'
+    	is non-null.
+    */
+    const char* Attribute( const char* name, double* d ) const;
+
+    /** QueryIntAttribute examines the attribute - it is an alternative to the
+    	Attribute() method with richer error checking.
+    	If the attribute is an integer, it is stored in 'value' and
+    	the call returns TIXML_SUCCESS. If it is not
+    	an integer, it returns TIXML_WRONG_TYPE. If the attribute
+    	does not exist, then TIXML_NO_ATTRIBUTE is returned.
+    */
+    int QueryIntAttribute( const char* name, int* _value ) const;
+    /// QueryUnsignedAttribute examines the attribute - see QueryIntAttribute().
+    int QueryUnsignedAttribute( const char* name, unsigned* _value ) const;
+    /** QueryBoolAttribute examines the attribute - see QueryIntAttribute().
+    	Note that '1', 'true', or 'yes' are considered true, while '0', 'false'
+    	and 'no' are considered false.
+    */
+    int QueryBoolAttribute( const char* name, bool* _value ) const;
+    /// QueryDoubleAttribute examines the attribute - see QueryIntAttribute().
+    int QueryDoubleAttribute( const char* name, double* _value ) const;
+    /// QueryFloatAttribute examines the attribute - see QueryIntAttribute().
+    int QueryFloatAttribute( const char* name, float* _value ) const
+    {
+        double d;
+        int result = QueryDoubleAttribute( name, &d );
+        if ( result == TIXML_SUCCESS )
+        {
+            *_value = ( float )d;
+        }
+        return result;
+    }
+
+#ifdef TIXML_USE_STL
+    /// QueryStringAttribute examines the attribute - see QueryIntAttribute().
+    int QueryStringAttribute( const char* name, std::string* _value ) const
+    {
+        const char* cstr = Attribute( name );
+        if ( cstr )
+        {
+            *_value = std::string( cstr );
+            return TIXML_SUCCESS;
+        }
+        return TIXML_NO_ATTRIBUTE;
+    }
+
+    /** Template form of the attribute query which will try to read the
+    	attribute into the specified type. Very easy, very powerful, but
+    	be careful to make sure to call this with the correct type.
+
+    	NOTE: This method doesn't work correctly for 'string' types that contain spaces.
+
+    	@return TIXML_SUCCESS, TIXML_WRONG_TYPE, or TIXML_NO_ATTRIBUTE
+    */
+    template< typename T > int QueryValueAttribute( const std::string& name, T* outValue ) const
+    {
+        const TiXmlAttribute* node = attributeSet.Find( name );
+        if ( !node )
+            return TIXML_NO_ATTRIBUTE;
+
+        std::stringstream sstream( node->ValueStr() );
+        sstream >> *outValue;
+        if ( !sstream.fail() )
+            return TIXML_SUCCESS;
+        return TIXML_WRONG_TYPE;
+    }
+
+    int QueryValueAttribute( const std::string& name, std::string* outValue ) const
+    {
+        const TiXmlAttribute* node = attributeSet.Find( name );
+        if ( !node )
+            return TIXML_NO_ATTRIBUTE;
+        *outValue = node->ValueStr();
+        return TIXML_SUCCESS;
+    }
+#endif
+
+    /** Sets an attribute of name to a given value. The attribute
+    	will be created if it does not exist, or changed if it does.
+    */
+    void SetAttribute( const char* name, const char * _value );
+
+#ifdef TIXML_USE_STL
+    const std::string* Attribute( const std::string& name ) const;
+    const std::string* Attribute( const std::string& name, int* i ) const;
+    const std::string* Attribute( const std::string& name, double* d ) const;
+    int QueryIntAttribute( const std::string& name, int* _value ) const;
+    int QueryDoubleAttribute( const std::string& name, double* _value ) const;
+
+    /// STL std::string form.
+    void SetAttribute( const std::string& name, const std::string& _value );
+    ///< STL std::string form.
+    void SetAttribute( const std::string& name, int _value );
+    ///< STL std::string form.
+    void SetDoubleAttribute( const std::string& name, double value );
+#endif
+
+    /** Sets an attribute of name to a given value. The attribute
+    	will be created if it does not exist, or changed if it does.
+    */
+    void SetAttribute( const char * name, int value );
+
+    /** Sets an attribute of name to a given value. The attribute
+    	will be created if it does not exist, or changed if it does.
+    */
+    void SetDoubleAttribute( const char * name, double value );
+
+    /** Deletes an attribute with the given name.
+    */
+    void RemoveAttribute( const char * name );
+#ifdef TIXML_USE_STL
+    void RemoveAttribute( const std::string& name )
+    {
+        RemoveAttribute ( name.c_str () );	   ///< STL std::string form.
+    }
+#endif
+
+    const TiXmlAttribute* FirstAttribute() const
+    {
+        return attributeSet.First();    ///< Access the first attribute in this element.
+    }
+    TiXmlAttribute* FirstAttribute()
+    {
+        return attributeSet.First();
+    }
+    const TiXmlAttribute* LastAttribute()	const
+    {
+        return attributeSet.Last();    ///< Access the last attribute in this element.
+    }
+    TiXmlAttribute* LastAttribute()
+    {
+        return attributeSet.Last();
+    }
+
+    /** Convenience function for easy access to the text inside an element. Although easy
+    	and concise, GetText() is limited compared to getting the TiXmlText child
+    	and accessing it directly.
+
+    	If the first child of 'this' is a TiXmlText, the GetText()
+    	returns the character string of the Text node, else null is returned.
+
+    	This is a convenient method for getting the text of simple contained text:
+    	@verbatim
+    	<foo>This is text</foo>
+    	const char* str = fooElement->GetText();
+    	@endverbatim
+
+    	'str' will be a pointer to "This is text".
+
+    	Note that this function can be misleading. If the element foo was created from
+    	this XML:
+    	@verbatim
+    	<foo><b>This is text</b></foo>
+    	@endverbatim
+
+    	then the value of str would be null. The first child node isn't a text node, it is
+    	another element. From this XML:
+    	@verbatim
+    	<foo>This is <b>text</b></foo>
+    	@endverbatim
+    	GetText() will return "This is ".
+
+    	WARNING: GetText() accesses a child node - don't become confused with the
+    			 similarly named TiXmlHandle::Text() and TiXmlNode::ToText() which are
+    			 safe type casts on the referenced node.
+    */
+    const char* GetText() const;
+
+    /// Creates a new Element and returns it - the returned element is a copy.
+    virtual TiXmlNode* Clone() const;
+    // Print the Element to a FILE stream.
+    virtual void Print( FILE* cfile, int depth ) const;
+
+    /*	Attribtue parsing starts: next char past '<'
+    					 returns: next char past '>'
+    */
+    virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+    virtual const TiXmlElement*     ToElement()     const
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+    virtual TiXmlElement*           ToElement()
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+
+    /** Walk the XML tree visiting this node and all of its children.
+    */
+    virtual bool Accept( TiXmlVisitor* visitor ) const;
 
 protected:
 
-	void CopyTo( TiXmlElement* target ) const;
-	void ClearThis();	// like clear, but initializes 'this' object as well
+    void CopyTo( TiXmlElement* target ) const;
+    void ClearThis();	// like clear, but initializes 'this' object as well
 
-	// Used to be public [internal use]
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
-	/*	[internal use]
-		Reads the "value" of the element -- another element, or text.
-		This should terminate with the current end tag.
-	*/
-	const char* ReadValue( const char* in, TiXmlParsingData* prevData, TiXmlEncoding encoding );
+    // Used to be public [internal use]
+#ifdef TIXML_USE_STL
+    virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+#endif
+    /*	[internal use]
+    	Reads the "value" of the element -- another element, or text.
+    	This should terminate with the current end tag.
+    */
+    const char* ReadValue( const char* in, TiXmlParsingData* prevData, TiXmlEncoding encoding );
 
 private:
-	TiXmlAttributeSet attributeSet;
+    TiXmlAttributeSet attributeSet;
 };
 
 
@@ -1162,41 +1430,48 @@
 class TiXmlComment : public TiXmlNode
 {
 public:
-	/// Constructs an empty comment.
-	TiXmlComment() : TiXmlNode( TiXmlNode::TINYXML_COMMENT ) {}
-	/// Construct a comment from text.
-	TiXmlComment( const char* _value ) : TiXmlNode( TiXmlNode::TINYXML_COMMENT ) {
-		SetValue( _value );
-	}
-	TiXmlComment( const TiXmlComment& );
-	TiXmlComment& operator=( const TiXmlComment& base );
-
-	virtual ~TiXmlComment()	{}
-
-	/// Returns a copy of this Comment.
-	virtual TiXmlNode* Clone() const;
-	// Write this Comment to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/*	Attribtue parsing starts: at the ! of the !--
-						 returns: next char past '>'
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlComment*  ToComment() const	{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual		  TiXmlComment*  ToComment()		{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const;
+    /// Constructs an empty comment.
+    TiXmlComment() : TiXmlNode( TiXmlNode::TINYXML_COMMENT ) {}
+    /// Construct a comment from text.
+    TiXmlComment( const char* _value ) : TiXmlNode( TiXmlNode::TINYXML_COMMENT )
+    {
+        SetValue( _value );
+    }
+    TiXmlComment( const TiXmlComment& );
+    TiXmlComment& operator=( const TiXmlComment& base );
+
+    virtual ~TiXmlComment()	{}
+
+    /// Returns a copy of this Comment.
+    virtual TiXmlNode* Clone() const;
+    // Write this Comment to a FILE stream.
+    virtual void Print( FILE* cfile, int depth ) const;
+
+    /*	Attribtue parsing starts: at the ! of the !--
+    					 returns: next char past '>'
+    */
+    virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+    virtual const TiXmlComment*  ToComment() const
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+    virtual		  TiXmlComment*  ToComment()
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+
+    /** Walk the XML tree visiting this node and all of its children.
+    */
+    virtual bool Accept( TiXmlVisitor* visitor ) const;
 
 protected:
-	void CopyTo( TiXmlComment* target ) const;
+    void CopyTo( TiXmlComment* target ) const;
 
-	// used to be public
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
+    // used to be public
+#ifdef TIXML_USE_STL
+    virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+#endif
 //	virtual void StreamOut( TIXML_OSTREAM * out ) const;
 
 private:
@@ -1204,68 +1479,87 @@
 };
 
 
-/** XML text. A text node can have 2 ways to output the next. "normal" output 
+/** XML text. A text node can have 2 ways to output the next. "normal" output
 	and CDATA. It will default to the mode it was parsed from the XML file and
-	you generally want to leave it alone, but you can change the output mode with 
+	you generally want to leave it alone, but you can change the output mode with
 	SetCDATA() and query it with CDATA().
 */
 class TiXmlText : public TiXmlNode
 {
-	friend class TiXmlElement;
+    friend class TiXmlElement;
 public:
-	/** Constructor for text element. By default, it is treated as 
-		normal, encoded text. If you want it be output as a CDATA text
-		element, set the parameter _cdata to 'true'
-	*/
-	TiXmlText (const char * initValue ) : TiXmlNode (TiXmlNode::TINYXML_TEXT)
-	{
-		SetValue( initValue );
-		cdata = false;
-	}
-	virtual ~TiXmlText() {}
+    /** Constructor for text element. By default, it is treated as
+    	normal, encoded text. If you want it be output as a CDATA text
+    	element, set the parameter _cdata to 'true'
+    */
+    TiXmlText ( const char * initValue ) : TiXmlNode ( TiXmlNode::TINYXML_TEXT )
+    {
+        SetValue( initValue );
+        cdata = false;
+    }
+    virtual ~TiXmlText() {}
 
-	#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlText( const std::string& initValue ) : TiXmlNode (TiXmlNode::TINYXML_TEXT)
-	{
-		SetValue( initValue );
-		cdata = false;
-	}
-	#endif
-
-	TiXmlText( const TiXmlText& copy ) : TiXmlNode( TiXmlNode::TINYXML_TEXT )	{ copy.CopyTo( this ); }
-	TiXmlText& operator=( const TiXmlText& base )							 	{ base.CopyTo( this ); return *this; }
-
-	// Write this text object to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/// Queries whether this represents text using a CDATA section.
-	bool CDATA() const				{ return cdata; }
-	/// Turns on or off a CDATA representation of text.
-	void SetCDATA( bool _cdata )	{ cdata = _cdata; }
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlText* ToText() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlText*       ToText()       { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+#ifdef TIXML_USE_STL
+    /// Constructor.
+    TiXmlText( const std::string& initValue ) : TiXmlNode ( TiXmlNode::TINYXML_TEXT )
+    {
+        SetValue( initValue );
+        cdata = false;
+    }
+#endif
 
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* content ) const;
+    TiXmlText( const TiXmlText& copy ) : TiXmlNode( TiXmlNode::TINYXML_TEXT )
+    {
+        copy.CopyTo( this );
+    }
+    TiXmlText& operator=( const TiXmlText& base )
+    {
+        base.CopyTo( this );
+        return *this;
+    }
+
+    // Write this text object to a FILE stream.
+    virtual void Print( FILE* cfile, int depth ) const;
+
+    /// Queries whether this represents text using a CDATA section.
+    bool CDATA() const
+    {
+        return cdata;
+    }
+    /// Turns on or off a CDATA representation of text.
+    void SetCDATA( bool _cdata )
+    {
+        cdata = _cdata;
+    }
+
+    virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+    virtual const TiXmlText* ToText() const
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+    virtual TiXmlText*       ToText()
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+
+    /** Walk the XML tree visiting this node and all of its children.
+    */
+    virtual bool Accept( TiXmlVisitor* content ) const;
 
 protected :
-	///  [internal use] Creates a new Element and returns it.
-	virtual TiXmlNode* Clone() const;
-	void CopyTo( TiXmlText* target ) const;
-
-	bool Blank() const;	// returns true if all white space and new lines
-	// [internal use]
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
+    ///  [internal use] Creates a new Element and returns it.
+    virtual TiXmlNode* Clone() const;
+    void CopyTo( TiXmlText* target ) const;
+
+    bool Blank() const;	// returns true if all white space and new lines
+    // [internal use]
+#ifdef TIXML_USE_STL
+    virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+#endif
 
 private:
-	bool cdata;			// true if this should be input and output as a CDATA style text element
+    bool cdata;			// true if this should be input and output as a CDATA style text element
 };
 
 
@@ -1285,62 +1579,78 @@
 class TiXmlDeclaration : public TiXmlNode
 {
 public:
-	/// Construct an empty declaration.
-	TiXmlDeclaration()   : TiXmlNode( TiXmlNode::TINYXML_DECLARATION ) {}
+    /// Construct an empty declaration.
+    TiXmlDeclaration()   : TiXmlNode( TiXmlNode::TINYXML_DECLARATION ) {}
 
 #ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlDeclaration(	const std::string& _version,
-						const std::string& _encoding,
-						const std::string& _standalone );
-#endif
-
-	/// Construct.
-	TiXmlDeclaration(	const char* _version,
-						const char* _encoding,
-						const char* _standalone );
-
-	TiXmlDeclaration( const TiXmlDeclaration& copy );
-	TiXmlDeclaration& operator=( const TiXmlDeclaration& copy );
-
-	virtual ~TiXmlDeclaration()	{}
-
-	/// Version. Will return an empty string if none was found.
-	const char *Version() const			{ return version.c_str (); }
-	/// Encoding. Will return an empty string if none was found.
-	const char *Encoding() const		{ return encoding.c_str (); }
-	/// Is this a standalone document?
-	const char *Standalone() const		{ return standalone.c_str (); }
-
-	/// Creates a copy of this Declaration and returns it.
-	virtual TiXmlNode* Clone() const;
-	// Print this declaration to a FILE stream.
-	virtual void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
-	virtual void Print( FILE* cfile, int depth ) const {
-		Print( cfile, depth, 0 );
-	}
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlDeclaration* ToDeclaration() const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlDeclaration*       ToDeclaration()       { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
+    /// Constructor.
+    TiXmlDeclaration(	const std::string& _version,
+                        const std::string& _encoding,
+                        const std::string& _standalone );
+#endif
 
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* visitor ) const;
+    /// Construct.
+    TiXmlDeclaration(	const char* _version,
+                        const char* _encoding,
+                        const char* _standalone );
+
+    TiXmlDeclaration( const TiXmlDeclaration& copy );
+    TiXmlDeclaration& operator=( const TiXmlDeclaration& copy );
+
+    virtual ~TiXmlDeclaration()	{}
+
+    /// Version. Will return an empty string if none was found.
+    const char *Version() const
+    {
+        return version.c_str ();
+    }
+    /// Encoding. Will return an empty string if none was found.
+    const char *Encoding() const
+    {
+        return encoding.c_str ();
+    }
+    /// Is this a standalone document?
+    const char *Standalone() const
+    {
+        return standalone.c_str ();
+    }
+
+    /// Creates a copy of this Declaration and returns it.
+    virtual TiXmlNode* Clone() const;
+    // Print this declaration to a FILE stream.
+    virtual void Print( FILE* cfile, int depth, TIXML_STRING* str ) const;
+    virtual void Print( FILE* cfile, int depth ) const
+    {
+        Print( cfile, depth, 0 );
+    }
+
+    virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+    virtual const TiXmlDeclaration* ToDeclaration() const
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+    virtual TiXmlDeclaration*       ToDeclaration()
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+
+    /** Walk the XML tree visiting this node and all of its children.
+    */
+    virtual bool Accept( TiXmlVisitor* visitor ) const;
 
 protected:
-	void CopyTo( TiXmlDeclaration* target ) const;
-	// used to be public
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
+    void CopyTo( TiXmlDeclaration* target ) const;
+    // used to be public
+#ifdef TIXML_USE_STL
+    virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+#endif
 
 private:
 
-	TIXML_STRING version;
-	TIXML_STRING encoding;
-	TIXML_STRING standalone;
+    TIXML_STRING version;
+    TIXML_STRING encoding;
+    TIXML_STRING standalone;
 };
 
 
@@ -1354,32 +1664,45 @@
 class TiXmlUnknown : public TiXmlNode
 {
 public:
-	TiXmlUnknown() : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )	{}
-	virtual ~TiXmlUnknown() {}
-
-	TiXmlUnknown( const TiXmlUnknown& copy ) : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )		{ copy.CopyTo( this ); }
-	TiXmlUnknown& operator=( const TiXmlUnknown& copy )										{ copy.CopyTo( this ); return *this; }
+    TiXmlUnknown() : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )	{}
+    virtual ~TiXmlUnknown() {}
 
-	/// Creates a copy of this Unknown and returns it.
-	virtual TiXmlNode* Clone() const;
-	// Print this Unknown to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	virtual const TiXmlUnknown*     ToUnknown()     const	{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlUnknown*           ToUnknown()				{ return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* content ) const;
+    TiXmlUnknown( const TiXmlUnknown& copy ) : TiXmlNode( TiXmlNode::TINYXML_UNKNOWN )
+    {
+        copy.CopyTo( this );
+    }
+    TiXmlUnknown& operator=( const TiXmlUnknown& copy )
+    {
+        copy.CopyTo( this );
+        return *this;
+    }
+
+    /// Creates a copy of this Unknown and returns it.
+    virtual TiXmlNode* Clone() const;
+    // Print this Unknown to a FILE stream.
+    virtual void Print( FILE* cfile, int depth ) const;
+
+    virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
+
+    virtual const TiXmlUnknown*     ToUnknown()     const
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+    virtual TiXmlUnknown*           ToUnknown()
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+
+    /** Walk the XML tree visiting this node and all of its children.
+    */
+    virtual bool Accept( TiXmlVisitor* content ) const;
 
 protected:
-	void CopyTo( TiXmlUnknown* target ) const;
+    void CopyTo( TiXmlUnknown* target ) const;
 
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
+#ifdef TIXML_USE_STL
+    virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+#endif
 
 private:
 
@@ -1393,165 +1716,203 @@
 class TiXmlDocument : public TiXmlNode
 {
 public:
-	/// Create an empty document, that has no name.
-	TiXmlDocument();
-	/// Create a document with a name. The name of the document is also the filename of the xml.
-	TiXmlDocument( const char * documentName );
-
-	#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlDocument( const std::string& documentName );
-	#endif
-
-	TiXmlDocument( const TiXmlDocument& copy );
-	TiXmlDocument& operator=( const TiXmlDocument& copy );
-
-	virtual ~TiXmlDocument() {}
-
-	/** Load a file using the current document value.
-		Returns true if successful. Will delete any existing
-		document data before loading.
-	*/
-	bool LoadFile( TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the current document value. Returns true if successful.
-	bool SaveFile() const;
-	/// Load a file using the given filename. Returns true if successful.
-	bool LoadFile( const char * filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the given filename. Returns true if successful.
-	bool SaveFile( const char * filename ) const;
-	/** Load a file using the given FILE*. Returns true if successful. Note that this method
-		doesn't stream - the entire object pointed at by the FILE*
-		will be interpreted as an XML file. TinyXML doesn't stream in XML from the current
-		file location. Streaming may be added in the future.
-	*/
-	bool LoadFile( FILE*, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the given FILE*. Returns true if successful.
-	bool SaveFile( FILE* ) const;
+    /// Create an empty document, that has no name.
+    TiXmlDocument();
+    /// Create a document with a name. The name of the document is also the filename of the xml.
+    TiXmlDocument( const char * documentName );
 
-	#ifdef TIXML_USE_STL
-	bool LoadFile( const std::string& filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING )			///< STL std::string version.
-	{
-		return LoadFile( filename.c_str(), encoding );
-	}
-	bool SaveFile( const std::string& filename ) const		///< STL std::string version.
-	{
-		return SaveFile( filename.c_str() );
-	}
-	#endif
+#ifdef TIXML_USE_STL
+    /// Constructor.
+    TiXmlDocument( const std::string& documentName );
+#endif
+
+    TiXmlDocument( const TiXmlDocument& copy );
+    TiXmlDocument& operator=( const TiXmlDocument& copy );
+
+    virtual ~TiXmlDocument() {}
+
+    /** Load a file using the current document value.
+    	Returns true if successful. Will delete any existing
+    	document data before loading.
+    */
+    bool LoadFile( TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+    /// Save a file using the current document value. Returns true if successful.
+    bool SaveFile() const;
+    /// Load a file using the given filename. Returns true if successful.
+    bool LoadFile( const char * filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+    /// Save a file using the given filename. Returns true if successful.
+    bool SaveFile( const char * filename ) const;
+    /** Load a file using the given FILE*. Returns true if successful. Note that this method
+    	doesn't stream - the entire object pointed at by the FILE*
+    	will be interpreted as an XML file. TinyXML doesn't stream in XML from the current
+    	file location. Streaming may be added in the future.
+    */
+    bool LoadFile( FILE*, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+    /// Save a file using the given FILE*. Returns true if successful.
+    bool SaveFile( FILE* ) const;
+
+#ifdef TIXML_USE_STL
+    bool LoadFile( const std::string& filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING )			///< STL std::string version.
+    {
+        return LoadFile( filename.c_str(), encoding );
+    }
+    bool SaveFile( const std::string& filename ) const		///< STL std::string version.
+    {
+        return SaveFile( filename.c_str() );
+    }
+#endif
 
-	/** Parse the given null terminated block of xml data. Passing in an encoding to this
-		method (either TIXML_ENCODING_LEGACY or TIXML_ENCODING_UTF8 will force TinyXml
-		to use that encoding, regardless of what TinyXml might otherwise try to detect.
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data = 0, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-
-	/** Get the root element -- the only top level element -- of the document.
-		In well formed XML, there should only be one. TinyXml is tolerant of
-		multiple elements at the document level.
-	*/
-	const TiXmlElement* RootElement() const		{ return FirstChildElement(); }
-	TiXmlElement* RootElement()					{ return FirstChildElement(); }
-
-	/** If an error occurs, Error will be set to true. Also,
-		- The ErrorId() will contain the integer identifier of the error (not generally useful)
-		- The ErrorDesc() method will return the name of the error. (very useful)
-		- The ErrorRow() and ErrorCol() will return the location of the error (if known)
-	*/	
-	bool Error() const						{ return error; }
-
-	/// Contains a textual (english) description of the error if one occurs.
-	const char * ErrorDesc() const	{ return errorDesc.c_str (); }
-
-	/** Generally, you probably want the error string ( ErrorDesc() ). But if you
-		prefer the ErrorId, this function will fetch it.
-	*/
-	int ErrorId()	const				{ return errorId; }
-
-	/** Returns the location (if known) of the error. The first column is column 1, 
-		and the first row is row 1. A value of 0 means the row and column wasn't applicable
-		(memory errors, for example, have no row/column) or the parser lost the error. (An
-		error in the error reporting, in that case.)
-
-		@sa SetTabSize, Row, Column
-	*/
-	int ErrorRow() const	{ return errorLocation.row+1; }
-	int ErrorCol() const	{ return errorLocation.col+1; }	///< The column where the error occured. See ErrorRow()
-
-	/** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
-		to report the correct values for row and column. It does not change the output
-		or input in any way.
-		
-		By calling this method, with a tab size
-		greater than 0, the row and column of each node and attribute is stored
-		when the file is loaded. Very useful for tracking the DOM back in to
-		the source file.
-
-		The tab size is required for calculating the location of nodes. If not
-		set, the default of 4 is used. The tabsize is set per document. Setting
-		the tabsize to 0 disables row/column tracking.
-
-		Note that row and column tracking is not supported when using operator>>.
-
-		The tab size needs to be enabled before the parse or load. Correct usage:
-		@verbatim
-		TiXmlDocument doc;
-		doc.SetTabSize( 8 );
-		doc.Load( "myfile.xml" );
-		@endverbatim
-
-		@sa Row, Column
-	*/
-	void SetTabSize( int _tabsize )		{ tabsize = _tabsize; }
-
-	int TabSize() const	{ return tabsize; }
-
-	/** If you have handled the error, it can be reset with this call. The error
-		state is automatically cleared if you Parse a new XML block.
-	*/
-	void ClearError()						{	error = false; 
-												errorId = 0; 
-												errorDesc = ""; 
-												errorLocation.row = errorLocation.col = 0; 
-												//errorLocation.last = 0; 
-											}
-
-	/** Write the document to standard out using formatted printing ("pretty print"). */
-	void Print() const						{ Print( stdout, 0 ); }
-
-	/* Write the document to a string using formatted printing ("pretty print"). This
-		will allocate a character array (new char[]) and return it as a pointer. The
-		calling code pust call delete[] on the return char* to avoid a memory leak.
-	*/
-	//char* PrintToMemory() const; 
-
-	/// Print this Document to a FILE stream.
-	virtual void Print( FILE* cfile, int depth = 0 ) const;
-	// [internal use]
-	void SetError( int err, const char* errorLocation, TiXmlParsingData* prevData, TiXmlEncoding encoding );
-
-	virtual const TiXmlDocument*    ToDocument()    const { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-	virtual TiXmlDocument*          ToDocument()          { return this; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Walk the XML tree visiting this node and all of its children. 
-	*/
-	virtual bool Accept( TiXmlVisitor* content ) const;
+    /** Parse the given null terminated block of xml data. Passing in an encoding to this
+    	method (either TIXML_ENCODING_LEGACY or TIXML_ENCODING_UTF8 will force TinyXml
+    	to use that encoding, regardless of what TinyXml might otherwise try to detect.
+    */
+    virtual const char* Parse( const char* p, TiXmlParsingData* data = 0, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
+
+    /** Get the root element -- the only top level element -- of the document.
+    	In well formed XML, there should only be one. TinyXml is tolerant of
+    	multiple elements at the document level.
+    */
+    const TiXmlElement* RootElement() const
+    {
+        return FirstChildElement();
+    }
+    TiXmlElement* RootElement()
+    {
+        return FirstChildElement();
+    }
+
+    /** If an error occurs, Error will be set to true. Also,
+    	- The ErrorId() will contain the integer identifier of the error (not generally useful)
+    	- The ErrorDesc() method will return the name of the error. (very useful)
+    	- The ErrorRow() and ErrorCol() will return the location of the error (if known)
+    */
+    bool Error() const
+    {
+        return error;
+    }
+
+    /// Contains a textual (english) description of the error if one occurs.
+    const char * ErrorDesc() const
+    {
+        return errorDesc.c_str ();
+    }
+
+    /** Generally, you probably want the error string ( ErrorDesc() ). But if you
+    	prefer the ErrorId, this function will fetch it.
+    */
+    int ErrorId()	const
+    {
+        return errorId;
+    }
+
+    /** Returns the location (if known) of the error. The first column is column 1,
+    	and the first row is row 1. A value of 0 means the row and column wasn't applicable
+    	(memory errors, for example, have no row/column) or the parser lost the error. (An
+    	error in the error reporting, in that case.)
+
+    	@sa SetTabSize, Row, Column
+    */
+    int ErrorRow() const
+    {
+        return errorLocation.row+1;
+    }
+    int ErrorCol() const
+    {
+        return errorLocation.col+1;    ///< The column where the error occured. See ErrorRow()
+    }
+
+    /** SetTabSize() allows the error reporting functions (ErrorRow() and ErrorCol())
+    	to report the correct values for row and column. It does not change the output
+    	or input in any way.
+
+    	By calling this method, with a tab size
+    	greater than 0, the row and column of each node and attribute is stored
+    	when the file is loaded. Very useful for tracking the DOM back in to
+    	the source file.
+
+    	The tab size is required for calculating the location of nodes. If not
+    	set, the default of 4 is used. The tabsize is set per document. Setting
+    	the tabsize to 0 disables row/column tracking.
+
+    	Note that row and column tracking is not supported when using operator>>.
+
+    	The tab size needs to be enabled before the parse or load. Correct usage:
+    	@verbatim
+    	TiXmlDocument doc;
+    	doc.SetTabSize( 8 );
+    	doc.Load( "myfile.xml" );
+    	@endverbatim
+
+    	@sa Row, Column
+    */
+    void SetTabSize( int _tabsize )
+    {
+        tabsize = _tabsize;
+    }
+
+    int TabSize() const
+    {
+        return tabsize;
+    }
+
+    /** If you have handled the error, it can be reset with this call. The error
+    	state is automatically cleared if you Parse a new XML block.
+    */
+    void ClearError()
+    {
+        error = false;
+        errorId = 0;
+        errorDesc = "";
+        errorLocation.row = errorLocation.col = 0;
+        //errorLocation.last = 0;
+    }
+
+    /** Write the document to standard out using formatted printing ("pretty print"). */
+    void Print() const
+    {
+        Print( stdout, 0 );
+    }
+
+    /* Write the document to a string using formatted printing ("pretty print"). This
+    	will allocate a character array (new char[]) and return it as a pointer. The
+    	calling code pust call delete[] on the return char* to avoid a memory leak.
+    */
+    //char* PrintToMemory() const;
+
+    /// Print this Document to a FILE stream.
+    virtual void Print( FILE* cfile, int depth = 0 ) const;
+    // [internal use]
+    void SetError( int err, const char* errorLocation, TiXmlParsingData* prevData, TiXmlEncoding encoding );
+
+    virtual const TiXmlDocument*    ToDocument()    const
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+    virtual TiXmlDocument*          ToDocument()
+    {
+        return this;    ///< Cast to a more defined type. Will return null not of the requested type.
+    }
+
+    /** Walk the XML tree visiting this node and all of its children.
+    */
+    virtual bool Accept( TiXmlVisitor* content ) const;
 
 protected :
-	// [internal use]
-	virtual TiXmlNode* Clone() const;
-	#ifdef TIXML_USE_STL
-	virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
-	#endif
+    // [internal use]
+    virtual TiXmlNode* Clone() const;
+#ifdef TIXML_USE_STL
+    virtual void StreamIn( std::istream * in, TIXML_STRING * tag );
+#endif
 
 private:
-	void CopyTo( TiXmlDocument* target ) const;
+    void CopyTo( TiXmlDocument* target ) const;
 
-	bool error;
-	int  errorId;
-	TIXML_STRING errorDesc;
-	int tabsize;
-	TiXmlCursor errorLocation;
-	bool useMicrosoftBOM;		// the UTF-8 BOM were found when read. Note this, and try to write.
+    bool error;
+    int  errorId;
+    TIXML_STRING errorDesc;
+    int tabsize;
+    TiXmlCursor errorLocation;
+    bool useMicrosoftBOM;		// the UTF-8 BOM were found when read. Note this, and try to write.
 };
 
 
@@ -1570,7 +1931,7 @@
 	<Document>
 	@endverbatim
 
-	Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very 
+	Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very
 	easy to write a *lot* of code that looks like:
 
 	@verbatim
@@ -1590,7 +1951,7 @@
 	@endverbatim
 
 	And that doesn't even cover "else" cases. TiXmlHandle addresses the verbosity
-	of such code. A TiXmlHandle checks for null	pointers so it is perfectly safe 
+	of such code. A TiXmlHandle checks for null	pointers so it is perfectly safe
 	and correct to use:
 
 	@verbatim
@@ -1611,7 +1972,7 @@
 	What they should not be used for is iteration:
 
 	@verbatim
-	int i=0; 
+	int i=0;
 	while ( true )
 	{
 		TiXmlElement* child = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", i ).ToElement();
@@ -1622,8 +1983,8 @@
 	}
 	@endverbatim
 
-	It seems reasonable, but it is in fact two embedded while loops. The Child method is 
-	a linear walk to find the element, so this code would iterate much more than it needs 
+	It seems reasonable, but it is in fact two embedded while loops. The Child method is
+	a linear walk to find the element, so this code would iterate much more than it needs
 	to. Instead, prefer:
 
 	@verbatim
@@ -1638,80 +1999,126 @@
 class TiXmlHandle
 {
 public:
-	/// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
-	TiXmlHandle( TiXmlNode* _node )					{ this->node = _node; }
-	/// Copy constructor
-	TiXmlHandle( const TiXmlHandle& ref )			{ this->node = ref.node; }
-	TiXmlHandle operator=( const TiXmlHandle& ref ) { if ( &ref != this ) this->node = ref.node; return *this; }
-
-	/// Return a handle to the first child node.
-	TiXmlHandle FirstChild() const;
-	/// Return a handle to the first child node with the given name.
-	TiXmlHandle FirstChild( const char * value ) const;
-	/// Return a handle to the first child element.
-	TiXmlHandle FirstChildElement() const;
-	/// Return a handle to the first child element with the given name.
-	TiXmlHandle FirstChildElement( const char * value ) const;
-
-	/** Return a handle to the "index" child with the given name. 
-		The first child is 0, the second 1, etc.
-	*/
-	TiXmlHandle Child( const char* value, int index ) const;
-	/** Return a handle to the "index" child. 
-		The first child is 0, the second 1, etc.
-	*/
-	TiXmlHandle Child( int index ) const;
-	/** Return a handle to the "index" child element with the given name. 
-		The first child element is 0, the second 1, etc. Note that only TiXmlElements
-		are indexed: other types are not counted.
-	*/
-	TiXmlHandle ChildElement( const char* value, int index ) const;
-	/** Return a handle to the "index" child element. 
-		The first child element is 0, the second 1, etc. Note that only TiXmlElements
-		are indexed: other types are not counted.
-	*/
-	TiXmlHandle ChildElement( int index ) const;
-
-	#ifdef TIXML_USE_STL
-	TiXmlHandle FirstChild( const std::string& _value ) const				{ return FirstChild( _value.c_str() ); }
-	TiXmlHandle FirstChildElement( const std::string& _value ) const		{ return FirstChildElement( _value.c_str() ); }
-
-	TiXmlHandle Child( const std::string& _value, int index ) const			{ return Child( _value.c_str(), index ); }
-	TiXmlHandle ChildElement( const std::string& _value, int index ) const	{ return ChildElement( _value.c_str(), index ); }
-	#endif
-
-	/** Return the handle as a TiXmlNode. This may return null.
-	*/
-	TiXmlNode* ToNode() const			{ return node; } 
-	/** Return the handle as a TiXmlElement. This may return null.
-	*/
-	TiXmlElement* ToElement() const		{ return ( ( node && node->ToElement() ) ? node->ToElement() : 0 ); }
-	/**	Return the handle as a TiXmlText. This may return null.
-	*/
-	TiXmlText* ToText() const			{ return ( ( node && node->ToText() ) ? node->ToText() : 0 ); }
-	/** Return the handle as a TiXmlUnknown. This may return null.
-	*/
-	TiXmlUnknown* ToUnknown() const		{ return ( ( node && node->ToUnknown() ) ? node->ToUnknown() : 0 ); }
-
-	/** @deprecated use ToNode. 
-		Return the handle as a TiXmlNode. This may return null.
-	*/
-	TiXmlNode* Node() const			{ return ToNode(); } 
-	/** @deprecated use ToElement. 
-		Return the handle as a TiXmlElement. This may return null.
-	*/
-	TiXmlElement* Element() const	{ return ToElement(); }
-	/**	@deprecated use ToText()
-		Return the handle as a TiXmlText. This may return null.
-	*/
-	TiXmlText* Text() const			{ return ToText(); }
-	/** @deprecated use ToUnknown()
-		Return the handle as a TiXmlUnknown. This may return null.
-	*/
-	TiXmlUnknown* Unknown() const	{ return ToUnknown(); }
+    /// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
+    TiXmlHandle( TiXmlNode* _node )
+    {
+        this->node = _node;
+    }
+    /// Copy constructor
+    TiXmlHandle( const TiXmlHandle& ref )
+    {
+        this->node = ref.node;
+    }
+    TiXmlHandle operator=( const TiXmlHandle& ref )
+    {
+        if ( &ref != this ) this->node = ref.node;
+        return *this;
+    }
+
+    /// Return a handle to the first child node.
+    TiXmlHandle FirstChild() const;
+    /// Return a handle to the first child node with the given name.
+    TiXmlHandle FirstChild( const char * value ) const;
+    /// Return a handle to the first child element.
+    TiXmlHandle FirstChildElement() const;
+    /// Return a handle to the first child element with the given name.
+    TiXmlHandle FirstChildElement( const char * value ) const;
+
+    /** Return a handle to the "index" child with the given name.
+    	The first child is 0, the second 1, etc.
+    */
+    TiXmlHandle Child( const char* value, int index ) const;
+    /** Return a handle to the "index" child.
+    	The first child is 0, the second 1, etc.
+    */
+    TiXmlHandle Child( int index ) const;
+    /** Return a handle to the "index" child element with the given name.
+    	The first child element is 0, the second 1, etc. Note that only TiXmlElements
+    	are indexed: other types are not counted.
+    */
+    TiXmlHandle ChildElement( const char* value, int index ) const;
+    /** Return a handle to the "index" child element.
+    	The first child element is 0, the second 1, etc. Note that only TiXmlElements
+    	are indexed: other types are not counted.
+    */
+    TiXmlHandle ChildElement( int index ) const;
+
+#ifdef TIXML_USE_STL
+    TiXmlHandle FirstChild( const std::string& _value ) const
+    {
+        return FirstChild( _value.c_str() );
+    }
+    TiXmlHandle FirstChildElement( const std::string& _value ) const
+    {
+        return FirstChildElement( _value.c_str() );
+    }
+
+    TiXmlHandle Child( const std::string& _value, int index ) const
+    {
+        return Child( _value.c_str(), index );
+    }
+    TiXmlHandle ChildElement( const std::string& _value, int index ) const
+    {
+        return ChildElement( _value.c_str(), index );
+    }
+#endif
+
+    /** Return the handle as a TiXmlNode. This may return null.
+    */
+    TiXmlNode* ToNode() const
+    {
+        return node;
+    }
+    /** Return the handle as a TiXmlElement. This may return null.
+    */
+    TiXmlElement* ToElement() const
+    {
+        return ( ( node && node->ToElement() ) ? node->ToElement() : 0 );
+    }
+    /**	Return the handle as a TiXmlText. This may return null.
+    */
+    TiXmlText* ToText() const
+    {
+        return ( ( node && node->ToText() ) ? node->ToText() : 0 );
+    }
+    /** Return the handle as a TiXmlUnknown. This may return null.
+    */
+    TiXmlUnknown* ToUnknown() const
+    {
+        return ( ( node && node->ToUnknown() ) ? node->ToUnknown() : 0 );
+    }
+
+    /** @deprecated use ToNode.
+    	Return the handle as a TiXmlNode. This may return null.
+    */
+    TiXmlNode* Node() const
+    {
+        return ToNode();
+    }
+    /** @deprecated use ToElement.
+    	Return the handle as a TiXmlElement. This may return null.
+    */
+    TiXmlElement* Element() const
+    {
+        return ToElement();
+    }
+    /**	@deprecated use ToText()
+    	Return the handle as a TiXmlText. This may return null.
+    */
+    TiXmlText* Text() const
+    {
+        return ToText();
+    }
+    /** @deprecated use ToUnknown()
+    	Return the handle as a TiXmlUnknown. This may return null.
+    */
+    TiXmlUnknown* Unknown() const
+    {
+        return ToUnknown();
+    }
 
 private:
-	TiXmlNode* node;
+    TiXmlNode* node;
 };
 
 
@@ -1737,64 +2144,89 @@
 class TiXmlPrinter : public TiXmlVisitor
 {
 public:
-	TiXmlPrinter() : depth( 0 ), simpleTextPrint( false ),
-					 buffer(), indent( "    " ), lineBreak( "\n" ) {}
+    TiXmlPrinter() : depth( 0 ), simpleTextPrint( false ),
+        buffer(), indent( "    " ), lineBreak( "\n" ) {}
 
-	virtual bool VisitEnter( const TiXmlDocument& doc );
-	virtual bool VisitExit( const TiXmlDocument& doc );
+    virtual bool VisitEnter( const TiXmlDocument& doc );
+    virtual bool VisitExit( const TiXmlDocument& doc );
 
-	virtual bool VisitEnter( const TiXmlElement& element, const TiXmlAttribute* firstAttribute );
-	virtual bool VisitExit( const TiXmlElement& element );
+    virtual bool VisitEnter( const TiXmlElement& element, const TiXmlAttribute* firstAttribute );
+    virtual bool VisitExit( const TiXmlElement& element );
 
-	virtual bool Visit( const TiXmlDeclaration& declaration );
-	virtual bool Visit( const TiXmlText& text );
-	virtual bool Visit( const TiXmlComment& comment );
-	virtual bool Visit( const TiXmlUnknown& unknown );
-
-	/** Set the indent characters for printing. By default 4 spaces
-		but tab (\t) is also useful, or null/empty string for no indentation.
-	*/
-	void SetIndent( const char* _indent )			{ indent = _indent ? _indent : "" ; }
-	/// Query the indention string.
-	const char* Indent()							{ return indent.c_str(); }
-	/** Set the line breaking string. By default set to newline (\n). 
-		Some operating systems prefer other characters, or can be
-		set to the null/empty string for no indenation.
-	*/
-	void SetLineBreak( const char* _lineBreak )		{ lineBreak = _lineBreak ? _lineBreak : ""; }
-	/// Query the current line breaking string.
-	const char* LineBreak()							{ return lineBreak.c_str(); }
-
-	/** Switch over to "stream printing" which is the most dense formatting without 
-		linebreaks. Common when the XML is needed for network transmission.
-	*/
-	void SetStreamPrinting()						{ indent = "";
-													  lineBreak = "";
-													}	
-	/// Return the result.
-	const char* CStr()								{ return buffer.c_str(); }
-	/// Return the length of the result string.
-	size_t Size()									{ return buffer.size(); }
-
-	#ifdef TIXML_USE_STL
-	/// Return the result.
-	const std::string& Str()						{ return buffer; }
-	#endif
+    virtual bool Visit( const TiXmlDeclaration& declaration );
+    virtual bool Visit( const TiXmlText& text );
+    virtual bool Visit( const TiXmlComment& comment );
+    virtual bool Visit( const TiXmlUnknown& unknown );
+
+    /** Set the indent characters for printing. By default 4 spaces
+    	but tab (\t) is also useful, or null/empty string for no indentation.
+    */
+    void SetIndent( const char* _indent )
+    {
+        indent = _indent ? _indent : "" ;
+    }
+    /// Query the indention string.
+    const char* Indent()
+    {
+        return indent.c_str();
+    }
+    /** Set the line breaking string. By default set to newline (\n).
+    	Some operating systems prefer other characters, or can be
+    	set to the null/empty string for no indenation.
+    */
+    void SetLineBreak( const char* _lineBreak )
+    {
+        lineBreak = _lineBreak ? _lineBreak : "";
+    }
+    /// Query the current line breaking string.
+    const char* LineBreak()
+    {
+        return lineBreak.c_str();
+    }
+
+    /** Switch over to "stream printing" which is the most dense formatting without
+    	linebreaks. Common when the XML is needed for network transmission.
+    */
+    void SetStreamPrinting()
+    {
+        indent = "";
+        lineBreak = "";
+    }
+    /// Return the result.
+    const char* CStr()
+    {
+        return buffer.c_str();
+    }
+    /// Return the length of the result string.
+    size_t Size()
+    {
+        return buffer.size();
+    }
 
-private:
-	void DoIndent()	{
-		for( int i=0; i<depth; ++i )
-			buffer += indent;
-	}
-	void DoLineBreak() {
-		buffer += lineBreak;
-	}
+#ifdef TIXML_USE_STL
+    /// Return the result.
+    const std::string& Str()
+    {
+        return buffer;
+    }
+#endif
 
-	int depth;
-	bool simpleTextPrint;
-	TIXML_STRING buffer;
-	TIXML_STRING indent;
-	TIXML_STRING lineBreak;
+private:
+    void DoIndent()
+    {
+        for ( int i=0; i<depth; ++i )
+            buffer += indent;
+    }
+    void DoLineBreak()
+    {
+        buffer += lineBreak;
+    }
+
+    int depth;
+    bool simpleTextPrint;
+    TIXML_STRING buffer;
+    TIXML_STRING indent;
+    TIXML_STRING lineBreak;
 };
 
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxmlparser.cpp opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxmlparser.cpp
--- opencpn-plugin-logbookkonni-1.2018.2/src/tinyxml/tinyxmlparser.cpp	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/src/tinyxml/tinyxmlparser.cpp	2016-02-25 13:06:29.000000000 +0000
@@ -2,23 +2,23 @@
 www.sourceforge.net/projects/tinyxml
 Original code by Lee Thomason (www.grinninglizard.com)
 
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
 damages arising from the use of this software.
 
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
 redistribute it freely, subject to the following restrictions:
 
-1. The origin of this software must not be misrepresented; you must 
+1. The origin of this software must not be misrepresented; you must
 not claim that you wrote the original software. If you use this
 software in a product, an acknowledgment in the product documentation
 would be appreciated but is not required.
 
-2. Altered source versions must be plainly marked as such, and 
+2. Altered source versions must be plainly marked as such, and
 must not be misrepresented as being the original software.
 
-3. This notice may not be removed or altered from any source 
+3. This notice may not be removed or altered from any source
 distribution.
 */
 
@@ -39,14 +39,14 @@
 
 // Note tha "PutString" hardcodes the same list. This
 // is less flexible than it appears. Changing the entries
-// or order will break putstring.	
-TiXmlBase::Entity TiXmlBase::entity[ TiXmlBase::NUM_ENTITY ] = 
+// or order will break putstring.
+TiXmlBase::Entity TiXmlBase::entity[ TiXmlBase::NUM_ENTITY ] =
 {
-	{ "&amp;",  5, '&' },
-	{ "&lt;",   4, '<' },
-	{ "&gt;",   4, '>' },
-	{ "&quot;", 6, '\"' },
-	{ "&apos;", 6, '\'' }
+    { "&amp;",  5, '&' },
+    { "&lt;",   4, '<' },
+    { "&gt;",   4, '>' },
+    { "&quot;", 6, '\"' },
+    { "&apos;", 6, '\'' }
 };
 
 // Bunch of unicode info at:
@@ -54,91 +54,94 @@
 // Including the basic of this table, which determines the #bytes in the
 // sequence from the lead byte. 1 placed for invalid sequences --
 // although the result will be junk, pass it through as much as possible.
-// Beware of the non-characters in UTF-8:	
+// Beware of the non-characters in UTF-8:
 //				ef bb bf (Microsoft "lead bytes")
 //				ef bf be
-//				ef bf bf 
+//				ef bf bf
 
 const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
 const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
 const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
 
-const int TiXmlBase::utf8ByteTable[256] = 
+const int TiXmlBase::utf8ByteTable[256] =
 {
-	//	0	1	2	3	4	5	6	7	8	9	a	b	c	d	e	f
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x00
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x10
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x20
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x30
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x40
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x50
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x60
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x70	End of ASCII range
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x80 0x80 to 0xc1 invalid
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x90 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xa0 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xb0 
-		1,	1,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xc0 0xc2 to 0xdf 2 byte
-		2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xd0
-		3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	// 0xe0 0xe0 to 0xef 3 byte
-		4,	4,	4,	4,	4,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1	// 0xf0 0xf0 to 0xf4 4 byte, 0xf5 and higher invalid
+    //	0	1	2	3	4	5	6	7	8	9	a	b	c	d	e	f
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x00
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x10
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x20
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x30
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x40
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x50
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x60
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x70	End of ASCII range
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x80 0x80 to 0xc1 invalid
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x90
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xa0
+    1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xb0
+    1,	1,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xc0 0xc2 to 0xdf 2 byte
+    2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xd0
+    3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	// 0xe0 0xe0 to 0xef 3 byte
+    4,	4,	4,	4,	4,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1	// 0xf0 0xf0 to 0xf4 4 byte, 0xf5 and higher invalid
 };
 
 
 void TiXmlBase::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length )
 {
-	const unsigned long BYTE_MASK = 0xBF;
-	const unsigned long BYTE_MARK = 0x80;
-	const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-	if (input < 0x80) 
-		*length = 1;
-	else if ( input < 0x800 )
-		*length = 2;
-	else if ( input < 0x10000 )
-		*length = 3;
-	else if ( input < 0x200000 )
-		*length = 4;
-	else
-		{ *length = 0; return; }	// This code won't covert this correctly anyway.
-
-	output += *length;
-
-	// Scary scary fall throughs.
-	switch (*length) 
-	{
-		case 4:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 3:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 2:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 1:
-			--output; 
-			*output = (char)(input | FIRST_BYTE_MARK[*length]);
-	}
+    const unsigned long BYTE_MASK = 0xBF;
+    const unsigned long BYTE_MARK = 0x80;
+    const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+    if ( input < 0x80 )
+        *length = 1;
+    else if ( input < 0x800 )
+        *length = 2;
+    else if ( input < 0x10000 )
+        *length = 3;
+    else if ( input < 0x200000 )
+        *length = 4;
+    else
+    {
+        *length = 0;    // This code won't covert this correctly anyway.
+        return;
+    }
+
+    output += *length;
+
+    // Scary scary fall throughs.
+    switch ( *length )
+    {
+    case 4:
+        --output;
+        *output = ( char )( ( input | BYTE_MARK ) & BYTE_MASK );
+        input >>= 6;
+    case 3:
+        --output;
+        *output = ( char )( ( input | BYTE_MARK ) & BYTE_MASK );
+        input >>= 6;
+    case 2:
+        --output;
+        *output = ( char )( ( input | BYTE_MARK ) & BYTE_MASK );
+        input >>= 6;
+    case 1:
+        --output;
+        *output = ( char )( input | FIRST_BYTE_MARK[*length] );
+    }
 }
 
 
 /*static*/ int TiXmlBase::IsAlpha( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
 {
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
+    // This will only work for low-ascii, everything else is assumed to be a valid
+    // letter. I'm not sure this is the best approach, but it is quite tricky trying
+    // to figure out alhabetical vs. not across encoding. So take a very
+    // conservative approach.
 
 //	if ( encoding == TIXML_ENCODING_UTF8 )
 //	{
-		if ( anyByte < 127 )
-			return isalpha( anyByte );
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
+    if ( anyByte < 127 )
+        return isalpha( anyByte );
+    else
+        return 1;	// What else to do? The unicode set is huge...get the english ones right.
 //	}
 //	else
 //	{
@@ -149,17 +152,17 @@
 
 /*static*/ int TiXmlBase::IsAlphaNum( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
 {
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
+    // This will only work for low-ascii, everything else is assumed to be a valid
+    // letter. I'm not sure this is the best approach, but it is quite tricky trying
+    // to figure out alhabetical vs. not across encoding. So take a very
+    // conservative approach.
 
 //	if ( encoding == TIXML_ENCODING_UTF8 )
 //	{
-		if ( anyByte < 127 )
-			return isalnum( anyByte );
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
+    if ( anyByte < 127 )
+        return isalnum( anyByte );
+    else
+        return 1;	// What else to do? The unicode set is huge...get the english ones right.
 //	}
 //	else
 //	{
@@ -170,228 +173,237 @@
 
 class TiXmlParsingData
 {
-	friend class TiXmlDocument;
-  public:
-	void Stamp( const char* now, TiXmlEncoding encoding );
-
-	const TiXmlCursor& Cursor() const	{ return cursor; }
-
-  private:
-	// Only used by the document!
-	TiXmlParsingData( const char* start, int _tabsize, int row, int col )
-	{
-		assert( start );
-		stamp = start;
-		tabsize = _tabsize;
-		cursor.row = row;
-		cursor.col = col;
-	}
-
-	TiXmlCursor		cursor;
-	const char*		stamp;
-	int				tabsize;
+    friend class TiXmlDocument;
+public:
+    void Stamp( const char* now, TiXmlEncoding encoding );
+
+    const TiXmlCursor& Cursor() const
+    {
+        return cursor;
+    }
+
+private:
+    // Only used by the document!
+    TiXmlParsingData( const char* start, int _tabsize, int row, int col )
+    {
+        assert( start );
+        stamp = start;
+        tabsize = _tabsize;
+        cursor.row = row;
+        cursor.col = col;
+    }
+
+    TiXmlCursor		cursor;
+    const char*		stamp;
+    int				tabsize;
 };
 
 
 void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
 {
-	assert( now );
+    assert( now );
 
-	// Do nothing if the tabsize is 0.
-	if ( tabsize < 1 )
-	{
-		return;
-	}
-
-	// Get the current row, column.
-	int row = cursor.row;
-	int col = cursor.col;
-	const char* p = stamp;
-	assert( p );
-
-	while ( p < now )
-	{
-		// Treat p as unsigned, so we have a happy compiler.
-		const unsigned char* pU = (const unsigned char*)p;
-
-		// Code contributed by Fletcher Dunn: (modified by lee)
-		switch (*pU) {
-			case 0:
-				// We *should* never get here, but in case we do, don't
-				// advance past the terminating null character, ever
-				return;
-
-			case '\r':
-				// bump down to the next line
-				++row;
-				col = 0;				
-				// Eat the character
-				++p;
-
-				// Check for \r\n sequence, and treat this as a single character
-				if (*p == '\n') {
-					++p;
-				}
-				break;
-
-			case '\n':
-				// bump down to the next line
-				++row;
-				col = 0;
-
-				// Eat the character
-				++p;
-
-				// Check for \n\r sequence, and treat this as a single
-				// character.  (Yes, this bizarre thing does occur still
-				// on some arcane platforms...)
-				if (*p == '\r') {
-					++p;
-				}
-				break;
-
-			case '\t':
-				// Eat the character
-				++p;
-
-				// Skip to next tab stop
-				col = (col / tabsize + 1) * tabsize;
-				break;
-
-			case TIXML_UTF_LEAD_0:
-				if ( encoding == TIXML_ENCODING_UTF8 )
-				{
-					if ( *(p+1) && *(p+2) )
-					{
-						// In these cases, don't advance the column. These are
-						// 0-width spaces.
-						if ( *(pU+1)==TIXML_UTF_LEAD_1 && *(pU+2)==TIXML_UTF_LEAD_2 )
-							p += 3;	
-						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbeU )
-							p += 3;	
-						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbfU )
-							p += 3;	
-						else
-							{ p +=3; ++col; }	// A normal character.
-					}
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-
-			default:
-				if ( encoding == TIXML_ENCODING_UTF8 )
-				{
-					// Eat the 1 to 4 byte utf8 character.
-					int step = TiXmlBase::utf8ByteTable[*((const unsigned char*)p)];
-					if ( step == 0 )
-						step = 1;		// Error case from bad encoding, but handle gracefully.
-					p += step;
-
-					// Just advance one column, of course.
-					++col;
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-		}
-	}
-	cursor.row = row;
-	cursor.col = col;
-	assert( cursor.row >= -1 );
-	assert( cursor.col >= -1 );
-	stamp = p;
-	assert( stamp );
+    // Do nothing if the tabsize is 0.
+    if ( tabsize < 1 )
+    {
+        return;
+    }
+
+    // Get the current row, column.
+    int row = cursor.row;
+    int col = cursor.col;
+    const char* p = stamp;
+    assert( p );
+
+    while ( p < now )
+    {
+        // Treat p as unsigned, so we have a happy compiler.
+        const unsigned char* pU = ( const unsigned char* )p;
+
+        // Code contributed by Fletcher Dunn: (modified by lee)
+        switch ( *pU )
+        {
+        case 0:
+            // We *should* never get here, but in case we do, don't
+            // advance past the terminating null character, ever
+            return;
+
+        case '\r':
+            // bump down to the next line
+            ++row;
+            col = 0;
+            // Eat the character
+            ++p;
+
+            // Check for \r\n sequence, and treat this as a single character
+            if ( *p == '\n' )
+            {
+                ++p;
+            }
+            break;
+
+        case '\n':
+            // bump down to the next line
+            ++row;
+            col = 0;
+
+            // Eat the character
+            ++p;
+
+            // Check for \n\r sequence, and treat this as a single
+            // character.  (Yes, this bizarre thing does occur still
+            // on some arcane platforms...)
+            if ( *p == '\r' )
+            {
+                ++p;
+            }
+            break;
+
+        case '\t':
+            // Eat the character
+            ++p;
+
+            // Skip to next tab stop
+            col = ( col / tabsize + 1 ) * tabsize;
+            break;
+
+        case TIXML_UTF_LEAD_0:
+            if ( encoding == TIXML_ENCODING_UTF8 )
+            {
+                if ( *( p+1 ) && *( p+2 ) )
+                {
+                    // In these cases, don't advance the column. These are
+                    // 0-width spaces.
+                    if ( *( pU+1 )==TIXML_UTF_LEAD_1 && *( pU+2 )==TIXML_UTF_LEAD_2 )
+                        p += 3;
+                    else if ( *( pU+1 )==0xbfU && *( pU+2 )==0xbeU )
+                        p += 3;
+                    else if ( *( pU+1 )==0xbfU && *( pU+2 )==0xbfU )
+                        p += 3;
+                    else
+                    {
+                        p +=3;    // A normal character.
+                        ++col;
+                    }
+                }
+            }
+            else
+            {
+                ++p;
+                ++col;
+            }
+            break;
+
+        default:
+            if ( encoding == TIXML_ENCODING_UTF8 )
+            {
+                // Eat the 1 to 4 byte utf8 character.
+                int step = TiXmlBase::utf8ByteTable[*( ( const unsigned char* )p )];
+                if ( step == 0 )
+                    step = 1;		// Error case from bad encoding, but handle gracefully.
+                p += step;
+
+                // Just advance one column, of course.
+                ++col;
+            }
+            else
+            {
+                ++p;
+                ++col;
+            }
+            break;
+        }
+    }
+    cursor.row = row;
+    cursor.col = col;
+    assert( cursor.row >= -1 );
+    assert( cursor.col >= -1 );
+    stamp = p;
+    assert( stamp );
 }
 
 
 const char* TiXmlBase::SkipWhiteSpace( const char* p, TiXmlEncoding encoding )
 {
-	if ( !p || !*p )
-	{
-		return 0;
-	}
-	if ( encoding == TIXML_ENCODING_UTF8 )
-	{
-		while ( *p )
-		{
-			const unsigned char* pU = (const unsigned char*)p;
-			
-			// Skip the stupid Microsoft UTF-8 Byte order marks
-			if (	*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==TIXML_UTF_LEAD_1 
-				 && *(pU+2)==TIXML_UTF_LEAD_2 )
-			{
-				p += 3;
-				continue;
-			}
-			else if(*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbeU )
-			{
-				p += 3;
-				continue;
-			}
-			else if(*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbfU )
-			{
-				p += 3;
-				continue;
-			}
-
-			if ( IsWhiteSpace( *p ) )		// Still using old rules for white space.
-				++p;
-			else
-				break;
-		}
-	}
-	else
-	{
-		while ( *p && IsWhiteSpace( *p ) )
-			++p;
-	}
+    if ( !p || !*p )
+    {
+        return 0;
+    }
+    if ( encoding == TIXML_ENCODING_UTF8 )
+    {
+        while ( *p )
+        {
+            const unsigned char* pU = ( const unsigned char* )p;
+
+            // Skip the stupid Microsoft UTF-8 Byte order marks
+            if (	*( pU+0 )==TIXML_UTF_LEAD_0
+                    && *( pU+1 )==TIXML_UTF_LEAD_1
+                    && *( pU+2 )==TIXML_UTF_LEAD_2 )
+            {
+                p += 3;
+                continue;
+            }
+            else if ( *( pU+0 )==TIXML_UTF_LEAD_0
+                      && *( pU+1 )==0xbfU
+                      && *( pU+2 )==0xbeU )
+            {
+                p += 3;
+                continue;
+            }
+            else if ( *( pU+0 )==TIXML_UTF_LEAD_0
+                      && *( pU+1 )==0xbfU
+                      && *( pU+2 )==0xbfU )
+            {
+                p += 3;
+                continue;
+            }
+
+            if ( IsWhiteSpace( *p ) )		// Still using old rules for white space.
+                ++p;
+            else
+                break;
+        }
+    }
+    else
+    {
+        while ( *p && IsWhiteSpace( *p ) )
+            ++p;
+    }
 
-	return p;
+    return p;
 }
 
 #ifdef TIXML_USE_STL
 /*static*/ bool TiXmlBase::StreamWhiteSpace( std::istream * in, TIXML_STRING * tag )
 {
-	for( ;; )
-	{
-		if ( !in->good() ) return false;
-
-		int c = in->peek();
-		// At this scope, we can't get to a document. So fail silently.
-		if ( !IsWhiteSpace( c ) || c <= 0 )
-			return true;
+    for ( ;; )
+    {
+        if ( !in->good() ) return false;
+
+        int c = in->peek();
+        // At this scope, we can't get to a document. So fail silently.
+        if ( !IsWhiteSpace( c ) || c <= 0 )
+            return true;
 
-		*tag += (char) in->get();
-	}
+        *tag += ( char ) in->get();
+    }
 }
 
 /*static*/ bool TiXmlBase::StreamTo( std::istream * in, int character, TIXML_STRING * tag )
 {
-	//assert( character > 0 && character < 128 );	// else it won't work in utf-8
-	while ( in->good() )
-	{
-		int c = in->peek();
-		if ( c == character )
-			return true;
-		if ( c <= 0 )		// Silent failure: can't get document at this scope
-			return false;
-
-		in->get();
-		*tag += (char) c;
-	}
-	return false;
+    //assert( character > 0 && character < 128 );	// else it won't work in utf-8
+    while ( in->good() )
+    {
+        int c = in->peek();
+        if ( c == character )
+            return true;
+        if ( c <= 0 )		// Silent failure: can't get document at this scope
+            return false;
+
+        in->get();
+        *tag += ( char ) c;
+    }
+    return false;
 }
 #endif
 
@@ -400,1239 +412,1247 @@
 //
 const char* TiXmlBase::ReadName( const char* p, TIXML_STRING * name, TiXmlEncoding encoding )
 {
-	// Oddly, not supported on some comilers,
-	//name->clear();
-	// So use this:
-	*name = "";
-	assert( p );
-
-	// Names start with letters or underscores.
-	// Of course, in unicode, tinyxml has no idea what a letter *is*. The
-	// algorithm is generous.
-	//
-	// After that, they can be letters, underscores, numbers,
-	// hyphens, or colons. (Colons are valid ony for namespaces,
-	// but tinyxml can't tell namespaces from names.)
-	if (    p && *p 
-		 && ( IsAlpha( (unsigned char) *p, encoding ) || *p == '_' ) )
-	{
-		const char* start = p;
-		while(		p && *p
-				&&	(		IsAlphaNum( (unsigned char ) *p, encoding ) 
-						 || *p == '_'
-						 || *p == '-'
-						 || *p == '.'
-						 || *p == ':' ) )
-		{
-			//(*name) += *p; // expensive
-			++p;
-		}
-		if ( p-start > 0 ) {
-			name->assign( start, p-start );
-		}
-		return p;
-	}
-	return 0;
+    // Oddly, not supported on some comilers,
+    //name->clear();
+    // So use this:
+    *name = "";
+    assert( p );
+
+    // Names start with letters or underscores.
+    // Of course, in unicode, tinyxml has no idea what a letter *is*. The
+    // algorithm is generous.
+    //
+    // After that, they can be letters, underscores, numbers,
+    // hyphens, or colons. (Colons are valid ony for namespaces,
+    // but tinyxml can't tell namespaces from names.)
+    if (    p && *p
+            && ( IsAlpha( ( unsigned char ) *p, encoding ) || *p == '_' ) )
+    {
+        const char* start = p;
+        while (		p && *p
+                    &&	(		IsAlphaNum( ( unsigned char ) *p, encoding )
+                                || *p == '_'
+                                || *p == '-'
+                                || *p == '.'
+                                || *p == ':' ) )
+        {
+            //(*name) += *p; // expensive
+            ++p;
+        }
+        if ( p-start > 0 )
+        {
+            name->assign( start, p-start );
+        }
+        return p;
+    }
+    return 0;
 }
 
 const char* TiXmlBase::GetEntity( const char* p, char* value, int* length, TiXmlEncoding encoding )
 {
-	// Presume an entity, and pull it out.
+    // Presume an entity, and pull it out.
     TIXML_STRING ent;
-	int i;
-	*length = 0;
+    int i;
+    *length = 0;
 
-	if ( *(p+1) && *(p+1) == '#' && *(p+2) )
-	{
-		unsigned long ucs = 0;
-		ptrdiff_t delta = 0;
-		unsigned mult = 1;
-
-		if ( *(p+2) == 'x' )
-		{
-			// Hexadecimal.
-			if ( !*(p+3) ) return 0;
-
-			const char* q = p+3;
-			q = strchr( q, ';' );
-
-			if ( !q || !*q ) return 0;
-
-			delta = q-p;
-			--q;
-
-			while ( *q != 'x' )
-			{
-				if ( *q >= '0' && *q <= '9' )
-					ucs += mult * (*q - '0');
-				else if ( *q >= 'a' && *q <= 'f' )
-					ucs += mult * (*q - 'a' + 10);
-				else if ( *q >= 'A' && *q <= 'F' )
-					ucs += mult * (*q - 'A' + 10 );
-				else 
-					return 0;
-				mult *= 16;
-				--q;
-			}
-		}
-		else
-		{
-			// Decimal.
-			if ( !*(p+2) ) return 0;
-
-			const char* q = p+2;
-			q = strchr( q, ';' );
-
-			if ( !q || !*q ) return 0;
-
-			delta = q-p;
-			--q;
-
-			while ( *q != '#' )
-			{
-				if ( *q >= '0' && *q <= '9' )
-					ucs += mult * (*q - '0');
-				else 
-					return 0;
-				mult *= 10;
-				--q;
-			}
-		}
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			// convert the UCS to UTF-8
-			ConvertUTF32ToUTF8( ucs, value, length );
-		}
-		else
-		{
-			*value = (char)ucs;
-			*length = 1;
-		}
-		return p + delta + 1;
-	}
-
-	// Now try to match it.
-	for( i=0; i<NUM_ENTITY; ++i )
-	{
-		if ( strncmp( entity[i].str, p, entity[i].strLength ) == 0 )
-		{
-			assert( strlen( entity[i].str ) == entity[i].strLength );
-			*value = entity[i].chr;
-			*length = 1;
-			return ( p + entity[i].strLength );
-		}
-	}
-
-	// So it wasn't an entity, its unrecognized, or something like that.
-	*value = *p;	// Don't put back the last one, since we return it!
-	//*length = 1;	// Leave unrecognized entities - this doesn't really work.
-					// Just writes strange XML.
-	return p+1;
+    if ( *( p+1 ) && *( p+1 ) == '#' && *( p+2 ) )
+    {
+        unsigned long ucs = 0;
+        ptrdiff_t delta = 0;
+        unsigned mult = 1;
+
+        if ( *( p+2 ) == 'x' )
+        {
+            // Hexadecimal.
+            if ( !*( p+3 ) ) return 0;
+
+            const char* q = p+3;
+            q = strchr( q, ';' );
+
+            if ( !q || !*q ) return 0;
+
+            delta = q-p;
+            --q;
+
+            while ( *q != 'x' )
+            {
+                if ( *q >= '0' && *q <= '9' )
+                    ucs += mult * ( *q - '0' );
+                else if ( *q >= 'a' && *q <= 'f' )
+                    ucs += mult * ( *q - 'a' + 10 );
+                else if ( *q >= 'A' && *q <= 'F' )
+                    ucs += mult * ( *q - 'A' + 10 );
+                else
+                    return 0;
+                mult *= 16;
+                --q;
+            }
+        }
+        else
+        {
+            // Decimal.
+            if ( !*( p+2 ) ) return 0;
+
+            const char* q = p+2;
+            q = strchr( q, ';' );
+
+            if ( !q || !*q ) return 0;
+
+            delta = q-p;
+            --q;
+
+            while ( *q != '#' )
+            {
+                if ( *q >= '0' && *q <= '9' )
+                    ucs += mult * ( *q - '0' );
+                else
+                    return 0;
+                mult *= 10;
+                --q;
+            }
+        }
+        if ( encoding == TIXML_ENCODING_UTF8 )
+        {
+            // convert the UCS to UTF-8
+            ConvertUTF32ToUTF8( ucs, value, length );
+        }
+        else
+        {
+            *value = ( char )ucs;
+            *length = 1;
+        }
+        return p + delta + 1;
+    }
+
+    // Now try to match it.
+    for ( i=0; i<NUM_ENTITY; ++i )
+    {
+        if ( strncmp( entity[i].str, p, entity[i].strLength ) == 0 )
+        {
+            assert( strlen( entity[i].str ) == entity[i].strLength );
+            *value = entity[i].chr;
+            *length = 1;
+            return ( p + entity[i].strLength );
+        }
+    }
+
+    // So it wasn't an entity, its unrecognized, or something like that.
+    *value = *p;	// Don't put back the last one, since we return it!
+    //*length = 1;	// Leave unrecognized entities - this doesn't really work.
+    // Just writes strange XML.
+    return p+1;
 }
 
 
 bool TiXmlBase::StringEqual( const char* p,
-							 const char* tag,
-							 bool ignoreCase,
-							 TiXmlEncoding encoding )
-{
-	assert( p );
-	assert( tag );
-	if ( !p || !*p )
-	{
-		assert( 0 );
-		return false;
-	}
-
-	const char* q = p;
-
-	if ( ignoreCase )
-	{
-		while ( *q && *tag && ToLower( *q, encoding ) == ToLower( *tag, encoding ) )
-		{
-			++q;
-			++tag;
-		}
-
-		if ( *tag == 0 )
-			return true;
-	}
-	else
-	{
-		while ( *q && *tag && *q == *tag )
-		{
-			++q;
-			++tag;
-		}
-
-		if ( *tag == 0 )		// Have we found the end of the tag, and everything equal?
-			return true;
-	}
-	return false;
-}
-
-const char* TiXmlBase::ReadText(	const char* p, 
-									TIXML_STRING * text, 
-									bool trimWhiteSpace, 
-									const char* endTag, 
-									bool caseInsensitive,
-									TiXmlEncoding encoding )
+                             const char* tag,
+                             bool ignoreCase,
+                             TiXmlEncoding encoding )
+{
+    assert( p );
+    assert( tag );
+    if ( !p || !*p )
+    {
+        assert( 0 );
+        return false;
+    }
+
+    const char* q = p;
+
+    if ( ignoreCase )
+    {
+        while ( *q && *tag && ToLower( *q, encoding ) == ToLower( *tag, encoding ) )
+        {
+            ++q;
+            ++tag;
+        }
+
+        if ( *tag == 0 )
+            return true;
+    }
+    else
+    {
+        while ( *q && *tag && *q == *tag )
+        {
+            ++q;
+            ++tag;
+        }
+
+        if ( *tag == 0 )		// Have we found the end of the tag, and everything equal?
+            return true;
+    }
+    return false;
+}
+
+const char* TiXmlBase::ReadText(	const char* p,
+                                    TIXML_STRING * text,
+                                    bool trimWhiteSpace,
+                                    const char* endTag,
+                                    bool caseInsensitive,
+                                    TiXmlEncoding encoding )
 {
     *text = "";
-	if (    !trimWhiteSpace			// certain tags always keep whitespace
-		 || !condenseWhiteSpace )	// if true, whitespace is always kept
-	{
-		// Keep all the white space.
-		while (	   p && *p
-				&& !StringEqual( p, endTag, caseInsensitive, encoding )
-			  )
-		{
-			int len;
-			char cArr[4] = { 0, 0, 0, 0 };
-			p = GetChar( p, cArr, &len, encoding );
-			text->append( cArr, len );
-		}
-	}
-	else
-	{
-		bool whitespace = false;
-
-		// Remove leading white space:
-		p = SkipWhiteSpace( p, encoding );
-		while (	   p && *p
-				&& !StringEqual( p, endTag, caseInsensitive, encoding ) )
-		{
-			if ( *p == '\r' || *p == '\n' )
-			{
-				whitespace = true;
-				++p;
-			}
-			else if ( IsWhiteSpace( *p ) )
-			{
-				whitespace = true;
-				++p;
-			}
-			else
-			{
-				// If we've found whitespace, add it before the
-				// new character. Any whitespace just becomes a space.
-				if ( whitespace )
-				{
-					(*text) += ' ';
-					whitespace = false;
-				}
-				int len;
-				char cArr[4] = { 0, 0, 0, 0 };
-				p = GetChar( p, cArr, &len, encoding );
-				if ( len == 1 )
-					(*text) += cArr[0];	// more efficient
-				else
-					text->append( cArr, len );
-			}
-		}
-	}
-	if ( p && *p )
-		p += strlen( endTag );
-	return ( p && *p ) ? p : 0;
+    if (    !trimWhiteSpace			// certain tags always keep whitespace
+            || !condenseWhiteSpace )	// if true, whitespace is always kept
+    {
+        // Keep all the white space.
+        while (	   p && *p
+                   && !StringEqual( p, endTag, caseInsensitive, encoding )
+              )
+        {
+            int len;
+            char cArr[4] = { 0, 0, 0, 0 };
+            p = GetChar( p, cArr, &len, encoding );
+            text->append( cArr, len );
+        }
+    }
+    else
+    {
+        bool whitespace = false;
+
+        // Remove leading white space:
+        p = SkipWhiteSpace( p, encoding );
+        while (	   p && *p
+                   && !StringEqual( p, endTag, caseInsensitive, encoding ) )
+        {
+            if ( *p == '\r' || *p == '\n' )
+            {
+                whitespace = true;
+                ++p;
+            }
+            else if ( IsWhiteSpace( *p ) )
+            {
+                whitespace = true;
+                ++p;
+            }
+            else
+            {
+                // If we've found whitespace, add it before the
+                // new character. Any whitespace just becomes a space.
+                if ( whitespace )
+                {
+                    ( *text ) += ' ';
+                    whitespace = false;
+                }
+                int len;
+                char cArr[4] = { 0, 0, 0, 0 };
+                p = GetChar( p, cArr, &len, encoding );
+                if ( len == 1 )
+                    ( *text ) += cArr[0];	// more efficient
+                else
+                    text->append( cArr, len );
+            }
+        }
+    }
+    if ( p && *p )
+        p += strlen( endTag );
+    return ( p && *p ) ? p : 0;
 }
 
 #ifdef TIXML_USE_STL
 
 void TiXmlDocument::StreamIn( std::istream * in, TIXML_STRING * tag )
 {
-	// The basic issue with a document is that we don't know what we're
-	// streaming. Read something presumed to be a tag (and hope), then
-	// identify it, and call the appropriate stream method on the tag.
-	//
-	// This "pre-streaming" will never read the closing ">" so the
-	// sub-tag can orient itself.
-
-	if ( !StreamTo( in, '<', tag ) ) 
-	{
-		SetError( TIXML_ERROR_PARSING_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return;
-	}
-
-	while ( in->good() )
-	{
-		int tagIndex = (int) tag->length();
-		while ( in->good() && in->peek() != '>' )
-		{
-			int c = in->get();
-			if ( c <= 0 )
-			{
-				SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-				break;
-			}
-			(*tag) += (char) c;
-		}
-
-		if ( in->good() )
-		{
-			// We now have something we presume to be a node of 
-			// some sort. Identify it, and call the node to
-			// continue streaming.
-			TiXmlNode* node = Identify( tag->c_str() + tagIndex, TIXML_DEFAULT_ENCODING );
-
-			if ( node )
-			{
-				node->StreamIn( in, tag );
-				bool isElement = node->ToElement() != 0;
-				delete node;
-				node = 0;
-
-				// If this is the root element, we're done. Parsing will be
-				// done by the >> operator.
-				if ( isElement )
-				{
-					return;
-				}
-			}
-			else
-			{
-				SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
-				return;
-			}
-		}
-	}
-	// We should have returned sooner.
-	SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
+    // The basic issue with a document is that we don't know what we're
+    // streaming. Read something presumed to be a tag (and hope), then
+    // identify it, and call the appropriate stream method on the tag.
+    //
+    // This "pre-streaming" will never read the closing ">" so the
+    // sub-tag can orient itself.
+
+    if ( !StreamTo( in, '<', tag ) )
+    {
+        SetError( TIXML_ERROR_PARSING_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return;
+    }
+
+    while ( in->good() )
+    {
+        int tagIndex = ( int ) tag->length();
+        while ( in->good() && in->peek() != '>' )
+        {
+            int c = in->get();
+            if ( c <= 0 )
+            {
+                SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+                break;
+            }
+            ( *tag ) += ( char ) c;
+        }
+
+        if ( in->good() )
+        {
+            // We now have something we presume to be a node of
+            // some sort. Identify it, and call the node to
+            // continue streaming.
+            TiXmlNode* node = Identify( tag->c_str() + tagIndex, TIXML_DEFAULT_ENCODING );
+
+            if ( node )
+            {
+                node->StreamIn( in, tag );
+                bool isElement = node->ToElement() != 0;
+                delete node;
+                node = 0;
+
+                // If this is the root element, we're done. Parsing will be
+                // done by the >> operator.
+                if ( isElement )
+                {
+                    return;
+                }
+            }
+            else
+            {
+                SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
+                return;
+            }
+        }
+    }
+    // We should have returned sooner.
+    SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
 }
 
 #endif
 
 const char* TiXmlDocument::Parse( const char* p, TiXmlParsingData* prevData, TiXmlEncoding encoding )
 {
-	ClearError();
+    ClearError();
 
-	// Parse away, at the document level. Since a document
-	// contains nothing but other tags, most of what happens
-	// here is skipping white space.
-	if ( !p || !*p )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	// Note that, for a document, this needs to come
-	// before the while space skip, so that parsing
-	// starts from the pointer we are given.
-	location.Clear();
-	if ( prevData )
-	{
-		location.row = prevData->cursor.row;
-		location.col = prevData->cursor.col;
-	}
-	else
-	{
-		location.row = 0;
-		location.col = 0;
-	}
-	TiXmlParsingData data( p, TabSize(), location.row, location.col );
-	location = data.Cursor();
-
-	if ( encoding == TIXML_ENCODING_UNKNOWN )
-	{
-		// Check for the Microsoft UTF-8 lead bytes.
-		const unsigned char* pU = (const unsigned char*)p;
-		if (	*(pU+0) && *(pU+0) == TIXML_UTF_LEAD_0
-			 && *(pU+1) && *(pU+1) == TIXML_UTF_LEAD_1
-			 && *(pU+2) && *(pU+2) == TIXML_UTF_LEAD_2 )
-		{
-			encoding = TIXML_ENCODING_UTF8;
-			useMicrosoftBOM = true;
-		}
-	}
+    // Parse away, at the document level. Since a document
+    // contains nothing but other tags, most of what happens
+    // here is skipping white space.
+    if ( !p || !*p )
+    {
+        SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return 0;
+    }
+
+    // Note that, for a document, this needs to come
+    // before the while space skip, so that parsing
+    // starts from the pointer we are given.
+    location.Clear();
+    if ( prevData )
+    {
+        location.row = prevData->cursor.row;
+        location.col = prevData->cursor.col;
+    }
+    else
+    {
+        location.row = 0;
+        location.col = 0;
+    }
+    TiXmlParsingData data( p, TabSize(), location.row, location.col );
+    location = data.Cursor();
+
+    if ( encoding == TIXML_ENCODING_UNKNOWN )
+    {
+        // Check for the Microsoft UTF-8 lead bytes.
+        const unsigned char* pU = ( const unsigned char* )p;
+        if (	*( pU+0 ) && *( pU+0 ) == TIXML_UTF_LEAD_0
+                && *( pU+1 ) && *( pU+1 ) == TIXML_UTF_LEAD_1
+                && *( pU+2 ) && *( pU+2 ) == TIXML_UTF_LEAD_2 )
+        {
+            encoding = TIXML_ENCODING_UTF8;
+            useMicrosoftBOM = true;
+        }
+    }
 
     p = SkipWhiteSpace( p, encoding );
-	if ( !p )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	while ( p && *p )
-	{
-		TiXmlNode* node = Identify( p, encoding );
-		if ( node )
-		{
-			p = node->Parse( p, &data, encoding );
-			LinkEndChild( node );
-		}
-		else
-		{
-			break;
-		}
-
-		// Did we get encoding info?
-		if (    encoding == TIXML_ENCODING_UNKNOWN
-			 && node->ToDeclaration() )
-		{
-			TiXmlDeclaration* dec = node->ToDeclaration();
-			const char* enc = dec->Encoding();
-			assert( enc );
-
-			if ( *enc == 0 )
-				encoding = TIXML_ENCODING_UTF8;
-			else if ( StringEqual( enc, "UTF-8", true, TIXML_ENCODING_UNKNOWN ) )
-				encoding = TIXML_ENCODING_UTF8;
-			else if ( StringEqual( enc, "UTF8", true, TIXML_ENCODING_UNKNOWN ) )
-				encoding = TIXML_ENCODING_UTF8;	// incorrect, but be nice
-			else 
-				encoding = TIXML_ENCODING_LEGACY;
-		}
-
-		p = SkipWhiteSpace( p, encoding );
-	}
-
-	// Was this empty?
-	if ( !firstChild ) {
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, encoding );
-		return 0;
-	}
+    if ( !p )
+    {
+        SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
+        return 0;
+    }
+
+    while ( p && *p )
+    {
+        TiXmlNode* node = Identify( p, encoding );
+        if ( node )
+        {
+            p = node->Parse( p, &data, encoding );
+            LinkEndChild( node );
+        }
+        else
+        {
+            break;
+        }
+
+        // Did we get encoding info?
+        if (    encoding == TIXML_ENCODING_UNKNOWN
+                && node->ToDeclaration() )
+        {
+            TiXmlDeclaration* dec = node->ToDeclaration();
+            const char* enc = dec->Encoding();
+            assert( enc );
+
+            if ( *enc == 0 )
+                encoding = TIXML_ENCODING_UTF8;
+            else if ( StringEqual( enc, "UTF-8", true, TIXML_ENCODING_UNKNOWN ) )
+                encoding = TIXML_ENCODING_UTF8;
+            else if ( StringEqual( enc, "UTF8", true, TIXML_ENCODING_UNKNOWN ) )
+                encoding = TIXML_ENCODING_UTF8;	// incorrect, but be nice
+            else
+                encoding = TIXML_ENCODING_LEGACY;
+        }
+
+        p = SkipWhiteSpace( p, encoding );
+    }
+
+    // Was this empty?
+    if ( !firstChild )
+    {
+        SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, encoding );
+        return 0;
+    }
 
-	// All is well.
-	return p;
+    // All is well.
+    return p;
 }
 
 void TiXmlDocument::SetError( int err, const char* pError, TiXmlParsingData* data, TiXmlEncoding encoding )
-{	
-	// The first error in a chain is more accurate - don't set again!
-	if ( error )
-		return;
-
-	assert( err > 0 && err < TIXML_ERROR_STRING_COUNT );
-	error   = true;
-	errorId = err;
-	errorDesc = errorString[ errorId ];
-
-	errorLocation.Clear();
-	if ( pError && data )
-	{
-		data->Stamp( pError, encoding );
-		errorLocation = data->Cursor();
-	}
+{
+    // The first error in a chain is more accurate - don't set again!
+    if ( error )
+        return;
+
+    assert( err > 0 && err < TIXML_ERROR_STRING_COUNT );
+    error   = true;
+    errorId = err;
+    errorDesc = errorString[ errorId ];
+
+    errorLocation.Clear();
+    if ( pError && data )
+    {
+        data->Stamp( pError, encoding );
+        errorLocation = data->Cursor();
+    }
 }
 
 
 TiXmlNode* TiXmlNode::Identify( const char* p, TiXmlEncoding encoding )
 {
-	TiXmlNode* returnNode = 0;
+    TiXmlNode* returnNode = 0;
+
+    p = SkipWhiteSpace( p, encoding );
+    if ( !p || !*p || *p != '<' )
+    {
+        return 0;
+    }
 
-	p = SkipWhiteSpace( p, encoding );
-	if( !p || !*p || *p != '<' )
-	{
-		return 0;
-	}
-
-	p = SkipWhiteSpace( p, encoding );
-
-	if ( !p || !*p )
-	{
-		return 0;
-	}
-
-	// What is this thing? 
-	// - Elements start with a letter or underscore, but xml is reserved.
-	// - Comments: <!--
-	// - Decleration: <?xml
-	// - Everthing else is unknown to tinyxml.
-	//
-
-	const char* xmlHeader = { "<?xml" };
-	const char* commentHeader = { "<!--" };
-	const char* dtdHeader = { "<!" };
-	const char* cdataHeader = { "<![CDATA[" };
-
-	if ( StringEqual( p, xmlHeader, true, encoding ) )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Declaration\n" );
-		#endif
-		returnNode = new TiXmlDeclaration();
-	}
-	else if ( StringEqual( p, commentHeader, false, encoding ) )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Comment\n" );
-		#endif
-		returnNode = new TiXmlComment();
-	}
-	else if ( StringEqual( p, cdataHeader, false, encoding ) )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing CDATA\n" );
-		#endif
-		TiXmlText* text = new TiXmlText( "" );
-		text->SetCDATA( true );
-		returnNode = text;
-	}
-	else if ( StringEqual( p, dtdHeader, false, encoding ) )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Unknown(1)\n" );
-		#endif
-		returnNode = new TiXmlUnknown();
-	}
-	else if (    IsAlpha( *(p+1), encoding )
-			  || *(p+1) == '_' )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Element\n" );
-		#endif
-		returnNode = new TiXmlElement( "" );
-	}
-	else
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Unknown(2)\n" );
-		#endif
-		returnNode = new TiXmlUnknown();
-	}
-
-	if ( returnNode )
-	{
-		// Set the parent, so it can report errors
-		returnNode->parent = this;
-	}
-	return returnNode;
+    p = SkipWhiteSpace( p, encoding );
+
+    if ( !p || !*p )
+    {
+        return 0;
+    }
+
+    // What is this thing?
+    // - Elements start with a letter or underscore, but xml is reserved.
+    // - Comments: <!--
+    // - Decleration: <?xml
+    // - Everthing else is unknown to tinyxml.
+    //
+
+    const char* xmlHeader = { "<?xml" };
+    const char* commentHeader = { "<!--" };
+    const char* dtdHeader = { "<!" };
+    const char* cdataHeader = { "<![CDATA[" };
+
+    if ( StringEqual( p, xmlHeader, true, encoding ) )
+    {
+#ifdef DEBUG_PARSER
+        TIXML_LOG( "XML parsing Declaration\n" );
+#endif
+        returnNode = new TiXmlDeclaration();
+    }
+    else if ( StringEqual( p, commentHeader, false, encoding ) )
+    {
+#ifdef DEBUG_PARSER
+        TIXML_LOG( "XML parsing Comment\n" );
+#endif
+        returnNode = new TiXmlComment();
+    }
+    else if ( StringEqual( p, cdataHeader, false, encoding ) )
+    {
+#ifdef DEBUG_PARSER
+        TIXML_LOG( "XML parsing CDATA\n" );
+#endif
+        TiXmlText* text = new TiXmlText( "" );
+        text->SetCDATA( true );
+        returnNode = text;
+    }
+    else if ( StringEqual( p, dtdHeader, false, encoding ) )
+    {
+#ifdef DEBUG_PARSER
+        TIXML_LOG( "XML parsing Unknown(1)\n" );
+#endif
+        returnNode = new TiXmlUnknown();
+    }
+    else if (    IsAlpha( *( p+1 ), encoding )
+                 || *( p+1 ) == '_' )
+    {
+#ifdef DEBUG_PARSER
+        TIXML_LOG( "XML parsing Element\n" );
+#endif
+        returnNode = new TiXmlElement( "" );
+    }
+    else
+    {
+#ifdef DEBUG_PARSER
+        TIXML_LOG( "XML parsing Unknown(2)\n" );
+#endif
+        returnNode = new TiXmlUnknown();
+    }
+
+    if ( returnNode )
+    {
+        // Set the parent, so it can report errors
+        returnNode->parent = this;
+    }
+    return returnNode;
 }
 
 #ifdef TIXML_USE_STL
 
-void TiXmlElement::StreamIn (std::istream * in, TIXML_STRING * tag)
+void TiXmlElement::StreamIn ( std::istream * in, TIXML_STRING * tag )
 {
-	// We're called with some amount of pre-parsing. That is, some of "this"
-	// element is in "tag". Go ahead and stream to the closing ">"
-	while( in->good() )
-	{
-		int c = in->get();
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-		(*tag) += (char) c ;
-		
-		if ( c == '>' )
-			break;
-	}
-
-	if ( tag->length() < 3 ) return;
-
-	// Okay...if we are a "/>" tag, then we're done. We've read a complete tag.
-	// If not, identify and stream.
-
-	if (    tag->at( tag->length() - 1 ) == '>' 
-		 && tag->at( tag->length() - 2 ) == '/' )
-	{
-		// All good!
-		return;
-	}
-	else if ( tag->at( tag->length() - 1 ) == '>' )
-	{
-		// There is more. Could be:
-		//		text
-		//		cdata text (which looks like another node)
-		//		closing tag
-		//		another node.
-		for ( ;; )
-		{
-			StreamWhiteSpace( in, tag );
-
-			// Do we have text?
-			if ( in->good() && in->peek() != '<' ) 
-			{
-				// Yep, text.
-				TiXmlText text( "" );
-				text.StreamIn( in, tag );
-
-				// What follows text is a closing tag or another node.
-				// Go around again and figure it out.
-				continue;
-			}
-
-			// We now have either a closing tag...or another node.
-			// We should be at a "<", regardless.
-			if ( !in->good() ) return;
-			assert( in->peek() == '<' );
-			int tagIndex = (int) tag->length();
-
-			bool closingTag = false;
-			bool firstCharFound = false;
-
-			for( ;; )
-			{
-				if ( !in->good() )
-					return;
-
-				int c = in->peek();
-				if ( c <= 0 )
-				{
-					TiXmlDocument* document = GetDocument();
-					if ( document )
-						document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-					return;
-				}
-				
-				if ( c == '>' )
-					break;
-
-				*tag += (char) c;
-				in->get();
-
-				// Early out if we find the CDATA id.
-				if ( c == '[' && tag->size() >= 9 )
-				{
-					size_t len = tag->size();
-					const char* start = tag->c_str() + len - 9;
-					if ( strcmp( start, "<![CDATA[" ) == 0 ) {
-						assert( !closingTag );
-						break;
-					}
-				}
-
-				if ( !firstCharFound && c != '<' && !IsWhiteSpace( c ) )
-				{
-					firstCharFound = true;
-					if ( c == '/' )
-						closingTag = true;
-				}
-			}
-			// If it was a closing tag, then read in the closing '>' to clean up the input stream.
-			// If it was not, the streaming will be done by the tag.
-			if ( closingTag )
-			{
-				if ( !in->good() )
-					return;
-
-				int c = in->get();
-				if ( c <= 0 )
-				{
-					TiXmlDocument* document = GetDocument();
-					if ( document )
-						document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-					return;
-				}
-				assert( c == '>' );
-				*tag += (char) c;
-
-				// We are done, once we've found our closing tag.
-				return;
-			}
-			else
-			{
-				// If not a closing tag, id it, and stream.
-				const char* tagloc = tag->c_str() + tagIndex;
-				TiXmlNode* node = Identify( tagloc, TIXML_DEFAULT_ENCODING );
-				if ( !node )
-					return;
-				node->StreamIn( in, tag );
-				delete node;
-				node = 0;
-
-				// No return: go around from the beginning: text, closing tag, or node.
-			}
-		}
-	}
+    // We're called with some amount of pre-parsing. That is, some of "this"
+    // element is in "tag". Go ahead and stream to the closing ">"
+    while ( in->good() )
+    {
+        int c = in->get();
+        if ( c <= 0 )
+        {
+            TiXmlDocument* document = GetDocument();
+            if ( document )
+                document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+            return;
+        }
+        ( *tag ) += ( char ) c ;
+
+        if ( c == '>' )
+            break;
+    }
+
+    if ( tag->length() < 3 ) return;
+
+    // Okay...if we are a "/>" tag, then we're done. We've read a complete tag.
+    // If not, identify and stream.
+
+    if (    tag->at( tag->length() - 1 ) == '>'
+            && tag->at( tag->length() - 2 ) == '/' )
+    {
+        // All good!
+        return;
+    }
+    else if ( tag->at( tag->length() - 1 ) == '>' )
+    {
+        // There is more. Could be:
+        //		text
+        //		cdata text (which looks like another node)
+        //		closing tag
+        //		another node.
+        for ( ;; )
+        {
+            StreamWhiteSpace( in, tag );
+
+            // Do we have text?
+            if ( in->good() && in->peek() != '<' )
+            {
+                // Yep, text.
+                TiXmlText text( "" );
+                text.StreamIn( in, tag );
+
+                // What follows text is a closing tag or another node.
+                // Go around again and figure it out.
+                continue;
+            }
+
+            // We now have either a closing tag...or another node.
+            // We should be at a "<", regardless.
+            if ( !in->good() ) return;
+            assert( in->peek() == '<' );
+            int tagIndex = ( int ) tag->length();
+
+            bool closingTag = false;
+            bool firstCharFound = false;
+
+            for ( ;; )
+            {
+                if ( !in->good() )
+                    return;
+
+                int c = in->peek();
+                if ( c <= 0 )
+                {
+                    TiXmlDocument* document = GetDocument();
+                    if ( document )
+                        document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+                    return;
+                }
+
+                if ( c == '>' )
+                    break;
+
+                *tag += ( char ) c;
+                in->get();
+
+                // Early out if we find the CDATA id.
+                if ( c == '[' && tag->size() >= 9 )
+                {
+                    size_t len = tag->size();
+                    const char* start = tag->c_str() + len - 9;
+                    if ( strcmp( start, "<![CDATA[" ) == 0 )
+                    {
+                        assert( !closingTag );
+                        break;
+                    }
+                }
+
+                if ( !firstCharFound && c != '<' && !IsWhiteSpace( c ) )
+                {
+                    firstCharFound = true;
+                    if ( c == '/' )
+                        closingTag = true;
+                }
+            }
+            // If it was a closing tag, then read in the closing '>' to clean up the input stream.
+            // If it was not, the streaming will be done by the tag.
+            if ( closingTag )
+            {
+                if ( !in->good() )
+                    return;
+
+                int c = in->get();
+                if ( c <= 0 )
+                {
+                    TiXmlDocument* document = GetDocument();
+                    if ( document )
+                        document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+                    return;
+                }
+                assert( c == '>' );
+                *tag += ( char ) c;
+
+                // We are done, once we've found our closing tag.
+                return;
+            }
+            else
+            {
+                // If not a closing tag, id it, and stream.
+                const char* tagloc = tag->c_str() + tagIndex;
+                TiXmlNode* node = Identify( tagloc, TIXML_DEFAULT_ENCODING );
+                if ( !node )
+                    return;
+                node->StreamIn( in, tag );
+                delete node;
+                node = 0;
+
+                // No return: go around from the beginning: text, closing tag, or node.
+            }
+        }
+    }
 }
 #endif
 
 const char* TiXmlElement::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
 {
-	p = SkipWhiteSpace( p, encoding );
-	TiXmlDocument* document = GetDocument();
+    p = SkipWhiteSpace( p, encoding );
+    TiXmlDocument* document = GetDocument();
 
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, 0, 0, encoding );
-		return 0;
-	}
-
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-
-	if ( *p != '<' )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, p, data, encoding );
-		return 0;
-	}
+    if ( !p || !*p )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, 0, 0, encoding );
+        return 0;
+    }
+
+    if ( data )
+    {
+        data->Stamp( p, encoding );
+        location = data->Cursor();
+    }
+
+    if ( *p != '<' )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, p, data, encoding );
+        return 0;
+    }
 
-	p = SkipWhiteSpace( p+1, encoding );
+    p = SkipWhiteSpace( p+1, encoding );
 
-	// Read the name.
-	const char* pErr = p;
+    // Read the name.
+    const char* pErr = p;
 
     p = ReadName( p, &value, encoding );
-	if ( !p || !*p )
-	{
-		if ( document )	document->SetError( TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME, pErr, data, encoding );
-		return 0;
-	}
-
-    TIXML_STRING endTag ("</");
-	endTag += value;
-
-	// Check for and read attributes. Also look for an empty
-	// tag or an end tag.
-	while ( p && *p )
-	{
-		pErr = p;
-		p = SkipWhiteSpace( p, encoding );
-		if ( !p || !*p )
-		{
-			if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
-			return 0;
-		}
-		if ( *p == '/' )
-		{
-			++p;
-			// Empty tag.
-			if ( *p  != '>' )
-			{
-				if ( document ) document->SetError( TIXML_ERROR_PARSING_EMPTY, p, data, encoding );		
-				return 0;
-			}
-			return (p+1);
-		}
-		else if ( *p == '>' )
-		{
-			// Done with attributes (if there were any.)
-			// Read the value -- which can include other
-			// elements -- read the end tag, and return.
-			++p;
-			p = ReadValue( p, data, encoding );		// Note this is an Element method, and will set the error if one happens.
-			if ( !p || !*p ) {
-				// We were looking for the end tag, but found nothing.
-				// Fix for [ 1663758 ] Failure to report error on bad XML
-				if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
-				return 0;
-			}
-
-			// We should find the end tag now
-			// note that:
-			// </foo > and
-			// </foo> 
-			// are both valid end tags.
-			if ( StringEqual( p, endTag.c_str(), false, encoding ) )
-			{
-				p += endTag.length();
-				p = SkipWhiteSpace( p, encoding );
-				if ( p && *p && *p == '>' ) {
-					++p;
-					return p;
-				}
-				if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
-				return 0;
-			}
-			else
-			{
-				if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
-				return 0;
-			}
-		}
-		else
-		{
-			// Try to read an attribute:
-			TiXmlAttribute* attrib = new TiXmlAttribute();
-			if ( !attrib )
-			{
-				return 0;
-			}
-
-			attrib->SetDocument( document );
-			pErr = p;
-			p = attrib->Parse( p, data, encoding );
-
-			if ( !p || !*p )
-			{
-				if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding );
-				delete attrib;
-				return 0;
-			}
-
-			// Handle the strange case of double attributes:
-			#ifdef TIXML_USE_STL
-			TiXmlAttribute* node = attributeSet.Find( attrib->NameTStr() );
-			#else
-			TiXmlAttribute* node = attributeSet.Find( attrib->Name() );
-			#endif
-			if ( node )
-			{
-				if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding );
-				delete attrib;
-				return 0;
-			}
-
-			attributeSet.Add( attrib );
-		}
-	}
-	return p;
+    if ( !p || !*p )
+    {
+        if ( document )	document->SetError( TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME, pErr, data, encoding );
+        return 0;
+    }
+
+    TIXML_STRING endTag ( "</" );
+    endTag += value;
+
+    // Check for and read attributes. Also look for an empty
+    // tag or an end tag.
+    while ( p && *p )
+    {
+        pErr = p;
+        p = SkipWhiteSpace( p, encoding );
+        if ( !p || !*p )
+        {
+            if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
+            return 0;
+        }
+        if ( *p == '/' )
+        {
+            ++p;
+            // Empty tag.
+            if ( *p  != '>' )
+            {
+                if ( document ) document->SetError( TIXML_ERROR_PARSING_EMPTY, p, data, encoding );
+                return 0;
+            }
+            return ( p+1 );
+        }
+        else if ( *p == '>' )
+        {
+            // Done with attributes (if there were any.)
+            // Read the value -- which can include other
+            // elements -- read the end tag, and return.
+            ++p;
+            p = ReadValue( p, data, encoding );		// Note this is an Element method, and will set the error if one happens.
+            if ( !p || !*p )
+            {
+                // We were looking for the end tag, but found nothing.
+                // Fix for [ 1663758 ] Failure to report error on bad XML
+                if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
+                return 0;
+            }
+
+            // We should find the end tag now
+            // note that:
+            // </foo > and
+            // </foo>
+            // are both valid end tags.
+            if ( StringEqual( p, endTag.c_str(), false, encoding ) )
+            {
+                p += endTag.length();
+                p = SkipWhiteSpace( p, encoding );
+                if ( p && *p && *p == '>' )
+                {
+                    ++p;
+                    return p;
+                }
+                if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
+                return 0;
+            }
+            else
+            {
+                if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
+                return 0;
+            }
+        }
+        else
+        {
+            // Try to read an attribute:
+            TiXmlAttribute* attrib = new TiXmlAttribute();
+            if ( !attrib )
+            {
+                return 0;
+            }
+
+            attrib->SetDocument( document );
+            pErr = p;
+            p = attrib->Parse( p, data, encoding );
+
+            if ( !p || !*p )
+            {
+                if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding );
+                delete attrib;
+                return 0;
+            }
+
+            // Handle the strange case of double attributes:
+#ifdef TIXML_USE_STL
+            TiXmlAttribute* node = attributeSet.Find( attrib->NameTStr() );
+#else
+            TiXmlAttribute* node = attributeSet.Find( attrib->Name() );
+#endif
+            if ( node )
+            {
+                if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding );
+                delete attrib;
+                return 0;
+            }
+
+            attributeSet.Add( attrib );
+        }
+    }
+    return p;
 }
 
 
 const char* TiXmlElement::ReadValue( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
 {
-	TiXmlDocument* document = GetDocument();
+    TiXmlDocument* document = GetDocument();
 
-	// Read in text and elements in any order.
-	const char* pWithWhiteSpace = p;
-	p = SkipWhiteSpace( p, encoding );
-
-	while ( p && *p )
-	{
-		if ( *p != '<' )
-		{
-			// Take what we have, make a text element.
-			TiXmlText* textNode = new TiXmlText( "" );
-
-			if ( !textNode )
-			{
-			    return 0;
-			}
-
-			if ( TiXmlBase::IsWhiteSpaceCondensed() )
-			{
-				p = textNode->Parse( p, data, encoding );
-			}
-			else
-			{
-				// Special case: we want to keep the white space
-				// so that leading spaces aren't removed.
-				p = textNode->Parse( pWithWhiteSpace, data, encoding );
-			}
-
-			if ( !textNode->Blank() )
-				LinkEndChild( textNode );
-			else
-				delete textNode;
-		} 
-		else 
-		{
-			// We hit a '<'
-			// Have we hit a new element or an end tag? This could also be
-			// a TiXmlText in the "CDATA" style.
-			if ( StringEqual( p, "</", false, encoding ) )
-			{
-				return p;
-			}
-			else
-			{
-				TiXmlNode* node = Identify( p, encoding );
-				if ( node )
-				{
-					p = node->Parse( p, data, encoding );
-					LinkEndChild( node );
-				}				
-				else
-				{
-					return 0;
-				}
-			}
-		}
-		pWithWhiteSpace = p;
-		p = SkipWhiteSpace( p, encoding );
-	}
-
-	if ( !p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ELEMENT_VALUE, 0, 0, encoding );
-	}	
-	return p;
+    // Read in text and elements in any order.
+    const char* pWithWhiteSpace = p;
+    p = SkipWhiteSpace( p, encoding );
+
+    while ( p && *p )
+    {
+        if ( *p != '<' )
+        {
+            // Take what we have, make a text element.
+            TiXmlText* textNode = new TiXmlText( "" );
+
+            if ( !textNode )
+            {
+                return 0;
+            }
+
+            if ( TiXmlBase::IsWhiteSpaceCondensed() )
+            {
+                p = textNode->Parse( p, data, encoding );
+            }
+            else
+            {
+                // Special case: we want to keep the white space
+                // so that leading spaces aren't removed.
+                p = textNode->Parse( pWithWhiteSpace, data, encoding );
+            }
+
+            if ( !textNode->Blank() )
+                LinkEndChild( textNode );
+            else
+                delete textNode;
+        }
+        else
+        {
+            // We hit a '<'
+            // Have we hit a new element or an end tag? This could also be
+            // a TiXmlText in the "CDATA" style.
+            if ( StringEqual( p, "</", false, encoding ) )
+            {
+                return p;
+            }
+            else
+            {
+                TiXmlNode* node = Identify( p, encoding );
+                if ( node )
+                {
+                    p = node->Parse( p, data, encoding );
+                    LinkEndChild( node );
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+        pWithWhiteSpace = p;
+        p = SkipWhiteSpace( p, encoding );
+    }
+
+    if ( !p )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_READING_ELEMENT_VALUE, 0, 0, encoding );
+    }
+    return p;
 }
 
 
 #ifdef TIXML_USE_STL
 void TiXmlUnknown::StreamIn( std::istream * in, TIXML_STRING * tag )
 {
-	while ( in->good() )
-	{
-		int c = in->get();	
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-		(*tag) += (char) c;
-
-		if ( c == '>' )
-		{
-			// All is well.
-			return;		
-		}
-	}
+    while ( in->good() )
+    {
+        int c = in->get();
+        if ( c <= 0 )
+        {
+            TiXmlDocument* document = GetDocument();
+            if ( document )
+                document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+            return;
+        }
+        ( *tag ) += ( char ) c;
+
+        if ( c == '>' )
+        {
+            // All is well.
+            return;
+        }
+    }
 }
 #endif
 
 
 const char* TiXmlUnknown::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
 {
-	TiXmlDocument* document = GetDocument();
-	p = SkipWhiteSpace( p, encoding );
+    TiXmlDocument* document = GetDocument();
+    p = SkipWhiteSpace( p, encoding );
 
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	if ( !p || !*p || *p != '<' )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_UNKNOWN, p, data, encoding );
-		return 0;
-	}
-	++p;
+    if ( data )
+    {
+        data->Stamp( p, encoding );
+        location = data->Cursor();
+    }
+    if ( !p || !*p || *p != '<' )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_PARSING_UNKNOWN, p, data, encoding );
+        return 0;
+    }
+    ++p;
     value = "";
 
-	while ( p && *p && *p != '>' )
-	{
-		value += *p;
-		++p;
-	}
-
-	if ( !p )
-	{
-		if ( document )	
-			document->SetError( TIXML_ERROR_PARSING_UNKNOWN, 0, 0, encoding );
-	}
-	if ( p && *p == '>' )
-		return p+1;
-	return p;
+    while ( p && *p && *p != '>' )
+    {
+        value += *p;
+        ++p;
+    }
+
+    if ( !p )
+    {
+        if ( document )
+            document->SetError( TIXML_ERROR_PARSING_UNKNOWN, 0, 0, encoding );
+    }
+    if ( p && *p == '>' )
+        return p+1;
+    return p;
 }
 
 #ifdef TIXML_USE_STL
 void TiXmlComment::StreamIn( std::istream * in, TIXML_STRING * tag )
 {
-	while ( in->good() )
-	{
-		int c = in->get();	
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-
-		(*tag) += (char) c;
-
-		if ( c == '>' 
-			 && tag->at( tag->length() - 2 ) == '-'
-			 && tag->at( tag->length() - 3 ) == '-' )
-		{
-			// All is well.
-			return;		
-		}
-	}
+    while ( in->good() )
+    {
+        int c = in->get();
+        if ( c <= 0 )
+        {
+            TiXmlDocument* document = GetDocument();
+            if ( document )
+                document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+            return;
+        }
+
+        ( *tag ) += ( char ) c;
+
+        if ( c == '>'
+                && tag->at( tag->length() - 2 ) == '-'
+                && tag->at( tag->length() - 3 ) == '-' )
+        {
+            // All is well.
+            return;
+        }
+    }
 }
 #endif
 
 
 const char* TiXmlComment::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
 {
-	TiXmlDocument* document = GetDocument();
-	value = "";
+    TiXmlDocument* document = GetDocument();
+    value = "";
 
-	p = SkipWhiteSpace( p, encoding );
+    p = SkipWhiteSpace( p, encoding );
 
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	const char* startTag = "<!--";
-	const char* endTag   = "-->";
-
-	if ( !StringEqual( p, startTag, false, encoding ) )
-	{
-		if ( document )
-			document->SetError( TIXML_ERROR_PARSING_COMMENT, p, data, encoding );
-		return 0;
-	}
-	p += strlen( startTag );
-
-	// [ 1475201 ] TinyXML parses entities in comments
-	// Oops - ReadText doesn't work, because we don't want to parse the entities.
-	// p = ReadText( p, &value, false, endTag, false, encoding );
-	//
-	// from the XML spec:
-	/*
-	 [Definition: Comments may appear anywhere in a document outside other markup; in addition, 
-	              they may appear within the document type declaration at places allowed by the grammar. 
-				  They are not part of the document's character data; an XML processor MAY, but need not, 
-				  make it possible for an application to retrieve the text of comments. For compatibility, 
-				  the string "--" (double-hyphen) MUST NOT occur within comments.] Parameter entity 
-				  references MUST NOT be recognized within comments.
+    if ( data )
+    {
+        data->Stamp( p, encoding );
+        location = data->Cursor();
+    }
+    const char* startTag = "<!--";
+    const char* endTag   = "-->";
+
+    if ( !StringEqual( p, startTag, false, encoding ) )
+    {
+        if ( document )
+            document->SetError( TIXML_ERROR_PARSING_COMMENT, p, data, encoding );
+        return 0;
+    }
+    p += strlen( startTag );
+
+    // [ 1475201 ] TinyXML parses entities in comments
+    // Oops - ReadText doesn't work, because we don't want to parse the entities.
+    // p = ReadText( p, &value, false, endTag, false, encoding );
+    //
+    // from the XML spec:
+    /*
+     [Definition: Comments may appear anywhere in a document outside other markup; in addition,
+                  they may appear within the document type declaration at places allowed by the grammar.
+    			  They are not part of the document's character data; an XML processor MAY, but need not,
+    			  make it possible for an application to retrieve the text of comments. For compatibility,
+    			  the string "--" (double-hyphen) MUST NOT occur within comments.] Parameter entity
+    			  references MUST NOT be recognized within comments.
 
-				  An example of a comment:
+    			  An example of a comment:
 
-				  <!-- declarations for <head> & <body> -->
-	*/
+    			  <!-- declarations for <head> & <body> -->
+    */
 
     value = "";
-	// Keep all the white space.
-	while (	p && *p && !StringEqual( p, endTag, false, encoding ) )
-	{
-		value.append( p, 1 );
-		++p;
-	}
-	if ( p && *p ) 
-		p += strlen( endTag );
+    // Keep all the white space.
+    while (	p && *p && !StringEqual( p, endTag, false, encoding ) )
+    {
+        value.append( p, 1 );
+        ++p;
+    }
+    if ( p && *p )
+        p += strlen( endTag );
 
-	return p;
+    return p;
 }
 
 
 const char* TiXmlAttribute::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
 {
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p ) return 0;
+    p = SkipWhiteSpace( p, encoding );
+    if ( !p || !*p ) return 0;
+
+    if ( data )
+    {
+        data->Stamp( p, encoding );
+        location = data->Cursor();
+    }
+    // Read the name, the '=' and the value.
+    const char* pErr = p;
+    p = ReadName( p, &name, encoding );
+    if ( !p || !*p )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
+        return 0;
+    }
+    p = SkipWhiteSpace( p, encoding );
+    if ( !p || !*p || *p != '=' )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
+        return 0;
+    }
 
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	// Read the name, the '=' and the value.
-	const char* pErr = p;
-	p = ReadName( p, &name, encoding );
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
-		return 0;
-	}
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p || *p != '=' )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-		return 0;
-	}
-
-	++p;	// skip '='
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-		return 0;
-	}
-	
-	const char* end;
-	const char SINGLE_QUOTE = '\'';
-	const char DOUBLE_QUOTE = '\"';
-
-	if ( *p == SINGLE_QUOTE )
-	{
-		++p;
-		end = "\'";		// single quote in string
-		p = ReadText( p, &value, false, end, false, encoding );
-	}
-	else if ( *p == DOUBLE_QUOTE )
-	{
-		++p;
-		end = "\"";		// double quote in string
-		p = ReadText( p, &value, false, end, false, encoding );
-	}
-	else
-	{
-		// All attribute values should be in single or double quotes.
-		// But this is such a common error that the parser will try
-		// its best, even without them.
-		value = "";
-		while (    p && *p											// existence
-				&& !IsWhiteSpace( *p )								// whitespace
-				&& *p != '/' && *p != '>' )							// tag end
-		{
-			if ( *p == SINGLE_QUOTE || *p == DOUBLE_QUOTE ) {
-				// [ 1451649 ] Attribute values with trailing quotes not handled correctly
-				// We did not have an opening quote but seem to have a 
-				// closing one. Give up and throw an error.
-				if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-				return 0;
-			}
-			value += *p;
-			++p;
-		}
-	}
-	return p;
+    ++p;	// skip '='
+    p = SkipWhiteSpace( p, encoding );
+    if ( !p || !*p )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
+        return 0;
+    }
+
+    const char* end;
+    const char SINGLE_QUOTE = '\'';
+    const char DOUBLE_QUOTE = '\"';
+
+    if ( *p == SINGLE_QUOTE )
+    {
+        ++p;
+        end = "\'";		// single quote in string
+        p = ReadText( p, &value, false, end, false, encoding );
+    }
+    else if ( *p == DOUBLE_QUOTE )
+    {
+        ++p;
+        end = "\"";		// double quote in string
+        p = ReadText( p, &value, false, end, false, encoding );
+    }
+    else
+    {
+        // All attribute values should be in single or double quotes.
+        // But this is such a common error that the parser will try
+        // its best, even without them.
+        value = "";
+        while (    p && *p											// existence
+                   && !IsWhiteSpace( *p )								// whitespace
+                   && *p != '/' && *p != '>' )							// tag end
+        {
+            if ( *p == SINGLE_QUOTE || *p == DOUBLE_QUOTE )
+            {
+                // [ 1451649 ] Attribute values with trailing quotes not handled correctly
+                // We did not have an opening quote but seem to have a
+                // closing one. Give up and throw an error.
+                if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
+                return 0;
+            }
+            value += *p;
+            ++p;
+        }
+    }
+    return p;
 }
 
 #ifdef TIXML_USE_STL
 void TiXmlText::StreamIn( std::istream * in, TIXML_STRING * tag )
 {
-	while ( in->good() )
-	{
-		int c = in->peek();	
-		if ( !cdata && (c == '<' ) ) 
-		{
-			return;
-		}
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-
-		(*tag) += (char) c;
-		in->get();	// "commits" the peek made above
-
-		if ( cdata && c == '>' && tag->size() >= 3 ) {
-			size_t len = tag->size();
-			if ( (*tag)[len-2] == ']' && (*tag)[len-3] == ']' ) {
-				// terminator of cdata.
-				return;
-			}
-		}    
-	}
+    while ( in->good() )
+    {
+        int c = in->peek();
+        if ( !cdata && ( c == '<' ) )
+        {
+            return;
+        }
+        if ( c <= 0 )
+        {
+            TiXmlDocument* document = GetDocument();
+            if ( document )
+                document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+            return;
+        }
+
+        ( *tag ) += ( char ) c;
+        in->get();	// "commits" the peek made above
+
+        if ( cdata && c == '>' && tag->size() >= 3 )
+        {
+            size_t len = tag->size();
+            if ( ( *tag )[len-2] == ']' && ( *tag )[len-3] == ']' )
+            {
+                // terminator of cdata.
+                return;
+            }
+        }
+    }
 }
 #endif
 
 const char* TiXmlText::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
 {
-	value = "";
-	TiXmlDocument* document = GetDocument();
+    value = "";
+    TiXmlDocument* document = GetDocument();
 
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-
-	const char* const startTag = "<![CDATA[";
-	const char* const endTag   = "]]>";
-
-	if ( cdata || StringEqual( p, startTag, false, encoding ) )
-	{
-		cdata = true;
-
-		if ( !StringEqual( p, startTag, false, encoding ) )
-		{
-			if ( document )
-				document->SetError( TIXML_ERROR_PARSING_CDATA, p, data, encoding );
-			return 0;
-		}
-		p += strlen( startTag );
-
-		// Keep all the white space, ignore the encoding, etc.
-		while (	   p && *p
-				&& !StringEqual( p, endTag, false, encoding )
-			  )
-		{
-			value += *p;
-			++p;
-		}
-
-		TIXML_STRING dummy; 
-		p = ReadText( p, &dummy, false, endTag, false, encoding );
-		return p;
-	}
-	else
-	{
-		bool ignoreWhite = true;
-
-		const char* end = "<";
-		p = ReadText( p, &value, ignoreWhite, end, false, encoding );
-		if ( p && *p )
-			return p-1;	// don't truncate the '<'
-		return 0;
-	}
+    if ( data )
+    {
+        data->Stamp( p, encoding );
+        location = data->Cursor();
+    }
+
+    const char* const startTag = "<![CDATA[";
+    const char* const endTag   = "]]>";
+
+    if ( cdata || StringEqual( p, startTag, false, encoding ) )
+    {
+        cdata = true;
+
+        if ( !StringEqual( p, startTag, false, encoding ) )
+        {
+            if ( document )
+                document->SetError( TIXML_ERROR_PARSING_CDATA, p, data, encoding );
+            return 0;
+        }
+        p += strlen( startTag );
+
+        // Keep all the white space, ignore the encoding, etc.
+        while (	   p && *p
+                   && !StringEqual( p, endTag, false, encoding )
+              )
+        {
+            value += *p;
+            ++p;
+        }
+
+        TIXML_STRING dummy;
+        p = ReadText( p, &dummy, false, endTag, false, encoding );
+        return p;
+    }
+    else
+    {
+        bool ignoreWhite = true;
+
+        const char* end = "<";
+        p = ReadText( p, &value, ignoreWhite, end, false, encoding );
+        if ( p && *p )
+            return p-1;	// don't truncate the '<'
+        return 0;
+    }
 }
 
 #ifdef TIXML_USE_STL
 void TiXmlDeclaration::StreamIn( std::istream * in, TIXML_STRING * tag )
 {
-	while ( in->good() )
-	{
-		int c = in->get();
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-		(*tag) += (char) c;
-
-		if ( c == '>' )
-		{
-			// All is well.
-			return;
-		}
-	}
+    while ( in->good() )
+    {
+        int c = in->get();
+        if ( c <= 0 )
+        {
+            TiXmlDocument* document = GetDocument();
+            if ( document )
+                document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+            return;
+        }
+        ( *tag ) += ( char ) c;
+
+        if ( c == '>' )
+        {
+            // All is well.
+            return;
+        }
+    }
 }
 #endif
 
 const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding _encoding )
 {
-	p = SkipWhiteSpace( p, _encoding );
-	// Find the beginning, find the end, and look for
-	// the stuff in-between.
-	TiXmlDocument* document = GetDocument();
-	if ( !p || !*p || !StringEqual( p, "<?xml", true, _encoding ) )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_DECLARATION, 0, 0, _encoding );
-		return 0;
-	}
-	if ( data )
-	{
-		data->Stamp( p, _encoding );
-		location = data->Cursor();
-	}
-	p += 5;
-
-	version = "";
-	encoding = "";
-	standalone = "";
-
-	while ( p && *p )
-	{
-		if ( *p == '>' )
-		{
-			++p;
-			return p;
-		}
-
-		p = SkipWhiteSpace( p, _encoding );
-		if ( StringEqual( p, "version", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			version = attrib.Value();
-		}
-		else if ( StringEqual( p, "encoding", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			encoding = attrib.Value();
-		}
-		else if ( StringEqual( p, "standalone", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			standalone = attrib.Value();
-		}
-		else
-		{
-			// Read over whatever it is.
-			while( p && *p && *p != '>' && !IsWhiteSpace( *p ) )
-				++p;
-		}
-	}
-	return 0;
+    p = SkipWhiteSpace( p, _encoding );
+    // Find the beginning, find the end, and look for
+    // the stuff in-between.
+    TiXmlDocument* document = GetDocument();
+    if ( !p || !*p || !StringEqual( p, "<?xml", true, _encoding ) )
+    {
+        if ( document ) document->SetError( TIXML_ERROR_PARSING_DECLARATION, 0, 0, _encoding );
+        return 0;
+    }
+    if ( data )
+    {
+        data->Stamp( p, _encoding );
+        location = data->Cursor();
+    }
+    p += 5;
+
+    version = "";
+    encoding = "";
+    standalone = "";
+
+    while ( p && *p )
+    {
+        if ( *p == '>' )
+        {
+            ++p;
+            return p;
+        }
+
+        p = SkipWhiteSpace( p, _encoding );
+        if ( StringEqual( p, "version", true, _encoding ) )
+        {
+            TiXmlAttribute attrib;
+            p = attrib.Parse( p, data, _encoding );
+            version = attrib.Value();
+        }
+        else if ( StringEqual( p, "encoding", true, _encoding ) )
+        {
+            TiXmlAttribute attrib;
+            p = attrib.Parse( p, data, _encoding );
+            encoding = attrib.Value();
+        }
+        else if ( StringEqual( p, "standalone", true, _encoding ) )
+        {
+            TiXmlAttribute attrib;
+            p = attrib.Parse( p, data, _encoding );
+            standalone = attrib.Value();
+        }
+        else
+        {
+            // Read over whatever it is.
+            while ( p && *p && *p != '>' && !IsWhiteSpace( *p ) )
+                ++p;
+        }
+    }
+    return 0;
 }
 
 bool TiXmlText::Blank() const
 {
-	for ( unsigned i=0; i<value.length(); i++ )
-		if ( !IsWhiteSpace( value[i] ) )
-			return false;
-	return true;
+    for ( unsigned i=0; i<value.length(); i++ )
+        if ( !IsWhiteSpace( value[i] ) )
+            return false;
+    return true;
 }
 
diff -Nru opencpn-plugin-logbookkonni-1.2018.2/VERSION.cmake opencpn-plugin-logbookkonni-1.2024/VERSION.cmake
--- opencpn-plugin-logbookkonni-1.2018.2/VERSION.cmake	2015-06-04 22:16:25.000000000 +0000
+++ opencpn-plugin-logbookkonni-1.2024/VERSION.cmake	2016-02-25 13:06:29.000000000 +0000
@@ -1,4 +1,4 @@
 SET(PLUGIN_VERSION_MAJOR "1")
 SET(PLUGIN_VERSION_MINOR "2")
-SET(PLUGIN_VERSION_PATCH "018")
-SET(PLUGIN_VERSION_DATE "2015-05-19")
+SET(PLUGIN_VERSION_PATCH "024")
+SET(PLUGIN_VERSION_DATE "2016-02-21")