Index: /applications/editors/josm/plugins/toms/src/toms/Toms.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/Toms.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/Toms.java	(revision 23078)
@@ -47,6 +47,4 @@
 		SmpDialog.setUserHome(userHome);
 		Smp.setEnabled(false);
-
-		System.out.println(Messages.getString("Toms.2")); //$NON-NLS-1$
 	}
 
Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23078)
@@ -1329,5 +1329,5 @@
 			bM01Close = new JButton();
 			bM01Close.setBounds(new Rectangle(20, 325, 110, 20));
-			bM01Close.setText(Messages.getString("SmpDialogAction.204")); //$NON-NLS-1$
+			bM01Close.setText(tr("close"));
 			bM01Close.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
@@ -1353,5 +1353,5 @@
 			bM01Save = new JButton();
 			bM01Save.setBounds(new Rectangle(150, 325, 110, 20));
-			bM01Save.setText(Messages.getString("SmpDialogAction.205")); //$NON-NLS-1$
+			bM01Save.setText(tr("save"));
 			bM01Save.setEnabled(false);
 
Index: /applications/editors/josm/plugins/toms/src/toms/msg/messages.properties
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/msg/messages.properties	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/msg/messages.properties	(revision 23078)
@@ -6,7 +6,7 @@
 Buoy.06=Tower
 Buoy.07=Float
+Buoy.08=Sphere Buoy
+Buoy.09=Barrel
 Buoy.10=Perch
-Buoy.11=*Select Shape*
-Toms.2=Hello World
 SmpDialogAction.0=Seamark Editor
 SmpDialogAction.1=Category:
@@ -66,6 +66,4 @@
 SmpDialogAction.202=8
 SmpDialogAction.203=9
-SmpDialogAction.204=Close
-SmpDialogAction.205=Save
 SmpDialogAction.26=active layer contains no OSM data
 SmpDialogAction.27=Please select a node
@@ -83,3 +81,3 @@
 SmpDialogAction.211=Red X
 SmpDialogAction.212=Not set
-
+SmpDialogAction.213=*Select shape*
Index: /applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties	(revision 23078)
@@ -1,16 +1,17 @@
 Buoy.01=Bakentonne
 Buoy.02=Stumpftonne
-Buoy.03=Cone Buoy
+Buoy.03=Spitztonne
 Buoy.04=Spierentonne
-Buoy.05=Bake
+Buoy.05=Spiere
 Buoy.06=Tower
 Buoy.07=Floß
-Buoy.10=Perch
-Buoy.11=*Wähle Form aus*
-Toms.2=Hallo Welt
+Buoy.08=Kugeltonne
+Buoy.09=Fasstonne
+Buoy.10=Pricke
 SmpDialogAction.0=Seezeichen Editor
 SmpDialogAction.1=Kategorie:
 SmpDialogAction.101=IALA
 SmpDialogAction.103=Typ:
+SmpDialogAction.107=Form:
 SmpDialogAction.109=Name:
 SmpDialogAction.111=Andere Eigenschaften:
@@ -65,13 +66,12 @@
 SmpDialogAction.202=8
 SmpDialogAction.203=9
-SmpDialogAction.204=Abbrechen
-SmpDialogAction.205=Speichern
 SmpDialogAction.26=Aktive Ebene enthält keine OSM-Daten
 SmpDialogAction.27=Bitte einen Knoten anwählen
 SmpDialogAction.28=Bitte nur einen Knoten anwählen
+SmpDialogAction.4=OpenSeaMap Editor
 SmpDialogAction.9=Seekarten Editor
 SmpDialogAction.91=Seezeichen nicht gesetzt
 SmpDialogAction.97=Seezeichen: Eigenschaften
-SmpDialogAction.4=OpenSeaMap Editor
+SmpDialogAction.97=Region:
 SmpDialogAction.206=Leuchtturm
 SmpDialogAction.207=primäres Feuer
@@ -81,2 +81,3 @@
 SmpDialogAction.211=X rot
 SmpDialogAction.212=Unbekannt
+SmpDialogAction.213=*Wähle Form aus*
Index: /applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties	(revision 23078)
@@ -6,7 +6,7 @@
 Buoy.06=Tower
 Buoy.07=Float
+Buoy.08=Sphere Buoy
+Buoy.09=Barrel
 Buoy.10=Perch
-Buoy.11=*Select Shape*
-Toms.2=Hello World
 SmpDialogAction.0=Seamark Editor
 SmpDialogAction.1=Category:
@@ -66,6 +66,4 @@
 SmpDialogAction.202=8
 SmpDialogAction.203=9
-SmpDialogAction.204=Close
-SmpDialogAction.205=Save
 SmpDialogAction.26=active layer contains no OSM data
 SmpDialogAction.27=Please select a node
@@ -83,2 +81,3 @@
 SmpDialogAction.211=Red X
 SmpDialogAction.212=Not set
+SmpDialogAction.213=*Select shape*
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyCard.java	(revision 23078)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 
+import toms.Messages;
 import toms.dialogs.SmpDialogAction;
 import toms.seamarks.SeaMark;
@@ -31,82 +32,82 @@
 
 		dlg.cbM01StyleOfMark.removeAllItems();
-		dlg.cbM01StyleOfMark.addItem("Not set");
-		dlg.cbM01StyleOfMark.addItem("Pillar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Spar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Beacon");
-		dlg.cbM01StyleOfMark.addItem("Tower");
-		dlg.cbM01StyleOfMark.addItem("Float");
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.01")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.04")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.05")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.06")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
 		dlg.cbM01StyleOfMark.setVisible(true);
 		dlg.lM01StyleOfMark.setVisible(true);
 
-		setRegion(Main.pref.get("tomsplugin.IALA").equals("B"));
-		if (keys.containsKey("name"))
-			setName(keys.get("name"));
-
-		if (keys.containsKey("seamark:name"))
-			setName(keys.get("seamark:name"));
-
-		if (keys.containsKey("seamark:buoy_cardinal:name"))
-			setName(keys.get("seamark:buoy_cardinal:name"));
-		else if (keys.containsKey("seamark:beacon_cardinal:name"))
-			setName(keys.get("seamark:beacon_cardinal:name"));
-		else if (keys.containsKey("seamark:light_float:name"))
-			setName(keys.get("seamark:light_float:name"));
-
-		String cat = "";
-		String col = "";
-
-		if (keys.containsKey("seamark:buoy_cardinal:category"))
-			cat = keys.get("seamark:buoy_cardinal:category");
-		else if (keys.containsKey("seamark:beacon_cardinal:category"))
-			cat = keys.get("seamark:beacon_cardinal:category");
-
-		if (keys.containsKey("seamark:buoy_cardinal:colour"))
-			col = keys.get("seamark:buoy_cardinal:colour");
-		else if (keys.containsKey("seamark:beacon_cardinal:colour"))
-			col = keys.get("seamark:beacon_cardinal:colour");
-		else if (keys.containsKey("seamark:light_float:colour"))
-			col = keys.get("seamark:light_float:colour");
-
-		if (cat.equals("")) {
-			if (col.equals("black;yellow")) {
+		setRegion(Main.pref.get("tomsplugin.IALA").equals("B")); //$NON-NLS-1$ //$NON-NLS-2$
+		if (keys.containsKey("name")) //$NON-NLS-1$
+			setName(keys.get("name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_cardinal:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:buoy_cardinal:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:beacon_cardinal:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:beacon_cardinal:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:light_float:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:light_float:name")); //$NON-NLS-1$
+
+		String cat = ""; //$NON-NLS-1$
+		String col = ""; //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_cardinal:category")) //$NON-NLS-1$
+			cat = keys.get("seamark:buoy_cardinal:category"); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:beacon_cardinal:category")) //$NON-NLS-1$
+			cat = keys.get("seamark:beacon_cardinal:category"); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_cardinal:colour")) //$NON-NLS-1$
+			col = keys.get("seamark:buoy_cardinal:colour"); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:beacon_cardinal:colour")) //$NON-NLS-1$
+			col = keys.get("seamark:beacon_cardinal:colour"); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:light_float:colour")) //$NON-NLS-1$
+			col = keys.get("seamark:light_float:colour"); //$NON-NLS-1$
+
+		if (cat.equals("")) { //$NON-NLS-1$
+			if (col.equals("black;yellow")) { //$NON-NLS-1$
 				setBuoyIndex(CARD_NORTH);
 				setColour(BLACK_YELLOW);
-			} else if (col.equals("black;yellow;black")) {
+			} else if (col.equals("black;yellow;black")) { //$NON-NLS-1$
 				setBuoyIndex(CARD_EAST);
 				setColour(BLACK_YELLOW_BLACK);
-			} else if (col.equals("yellow;black")) {
+			} else if (col.equals("yellow;black")) { //$NON-NLS-1$
 				setBuoyIndex(CARD_SOUTH);
 				setColour(YELLOW_BLACK);
-			} else if (col.equals("yellow;black;yellow")) {
+			} else if (col.equals("yellow;black;yellow")) { //$NON-NLS-1$
 				setBuoyIndex(CARD_WEST);
 				setColour(YELLOW_BLACK_YELLOW);
 			}
-		} else if (cat.equals("north")) {
+		} else if (cat.equals("north")) { //$NON-NLS-1$
 			setBuoyIndex(CARD_NORTH);
 			setColour(BLACK_YELLOW);
-		} else if (cat.equals("east")) {
+		} else if (cat.equals("east")) { //$NON-NLS-1$
 			setBuoyIndex(CARD_EAST);
 			setColour(BLACK_YELLOW_BLACK);
-		} else if (cat.equals("south")) {
+		} else if (cat.equals("south")) { //$NON-NLS-1$
 			setBuoyIndex(CARD_SOUTH);
 			setColour(YELLOW_BLACK);
-		} else if (cat.equals("west")) {
+		} else if (cat.equals("west")) { //$NON-NLS-1$
 			setBuoyIndex(CARD_WEST);
 			setColour(YELLOW_BLACK_YELLOW);
 		}
 
-		if (keys.containsKey("seamark:buoy_cardinal:shape")) {
-			str = keys.get("seamark:buoy_cardinal:shape");
-
-			if (str.equals("pillar"))
+		if (keys.containsKey("seamark:buoy_cardinal:shape")) { //$NON-NLS-1$
+			str = keys.get("seamark:buoy_cardinal:shape"); //$NON-NLS-1$
+
+			if (str.equals("pillar")) //$NON-NLS-1$
 				setStyleIndex(CARD_PILLAR);
-			else if (str.equals("spar"))
+			else if (str.equals("spar")) //$NON-NLS-1$
 				setStyleIndex(CARD_SPAR);
-		} else if (keys.containsKey("seamark:beacon_cardinal:colour")) {
-			if (keys.containsKey("seamark:beacon_cardinal:shape")) {
-				str = keys.get("seamark:beacon_cardinal:shape");
-
-				if (str.equals("tower"))
+		} else if (keys.containsKey("seamark:beacon_cardinal:colour")) { //$NON-NLS-1$
+			if (keys.containsKey("seamark:beacon_cardinal:shape")) { //$NON-NLS-1$
+				str = keys.get("seamark:beacon_cardinal:shape"); //$NON-NLS-1$
+
+				if (str.equals("tower")) //$NON-NLS-1$
 					setStyleIndex(CARD_TOWER);
 				else
@@ -114,6 +115,6 @@
 			} else
 				setStyleIndex(CARD_BEACON);
-		} else if (keys.containsKey("seamark:type")
-				&& (keys.get("seamark:type").equals("light_float"))) {
+		} else if (keys.containsKey("seamark:type") //$NON-NLS-1$
+				&& (keys.get("seamark:type").equals("light_float"))) { //$NON-NLS-1$ //$NON-NLS-2$
 			setStyleIndex(CARD_FLOAT);
 		}
@@ -121,8 +122,8 @@
 		refreshLights();
 
-		if (keys.containsKey("seamark:light:colour")) {
-			str = keys.get("seamark:light:colour");
-
-			if (keys.containsKey("seamark:light:character")) {
+		if (keys.containsKey("seamark:light:colour")) { //$NON-NLS-1$
+			str = keys.get("seamark:light:colour"); //$NON-NLS-1$
+
+			if (keys.containsKey("seamark:light:character")) { //$NON-NLS-1$
 				int i1;
 				String tmp = null;
@@ -130,13 +131,13 @@
 				setLightGroup(keys);
 
-				String c = keys.get("seamark:light:character");
-
-				if (c.contains("+")) {
-					i1 = c.indexOf("+");
+				String c = keys.get("seamark:light:character"); //$NON-NLS-1$
+
+				if (c.contains("+")) { //$NON-NLS-1$
+					i1 = c.indexOf("+"); //$NON-NLS-1$
 					tmp = c.substring(i1, c.length());
 					c = c.substring(0, i1);
 				}
 
-				if (getLightGroup() != "")
+				if (getLightGroup() != "") //$NON-NLS-1$
 					if (tmp != null) {
 						c = c + tmp;
@@ -147,7 +148,7 @@
 			}
 
-			if (str.equals("white")) {
+			if (str.equals("white")) { //$NON-NLS-1$
 				setFired(true);
-				setLightColour("W");
+				setLightColour("W"); //$NON-NLS-1$
 			}
 		}
@@ -158,26 +159,26 @@
 
 		dlg.cbM01Kennung.removeAllItems();
-		dlg.cbM01Kennung.addItem("Not set");
+		dlg.cbM01Kennung.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
 		dlg.cbM01Kennung.setSelectedIndex(0);
 
 		switch (type) {
 		case SeaMark.CARD_NORTH:
-			dlg.cbM01Kennung.addItem("Q");
-			dlg.cbM01Kennung.addItem("VQ");
+			dlg.cbM01Kennung.addItem("Q"); //$NON-NLS-1$
+			dlg.cbM01Kennung.addItem("VQ"); //$NON-NLS-1$
 			break;
 
 		case SeaMark.CARD_EAST:
-			dlg.cbM01Kennung.addItem("Q(3)");
-			dlg.cbM01Kennung.addItem("VQ(3)");
+			dlg.cbM01Kennung.addItem("Q(3)"); //$NON-NLS-1$
+			dlg.cbM01Kennung.addItem("VQ(3)"); //$NON-NLS-1$
 			break;
 
 		case SeaMark.CARD_SOUTH:
-			dlg.cbM01Kennung.addItem("Q(6)+LFl");
-			dlg.cbM01Kennung.addItem("VQ(6)+LFl");
+			dlg.cbM01Kennung.addItem("Q(6)+LFl"); //$NON-NLS-1$
+			dlg.cbM01Kennung.addItem("VQ(6)+LFl"); //$NON-NLS-1$
 			break;
 
 		case SeaMark.CARD_WEST:
-			dlg.cbM01Kennung.addItem("Q(9)");
-			dlg.cbM01Kennung.addItem("VQ(9)");
+			dlg.cbM01Kennung.addItem("Q(9)"); //$NON-NLS-1$
+			dlg.cbM01Kennung.addItem("VQ(9)"); //$NON-NLS-1$
 			break;
 
@@ -213,25 +214,25 @@
 			dlg.cM01Fired.setVisible(true);
 
-			String image = "/images/Cardinal";
+			String image = "/images/Cardinal"; //$NON-NLS-1$
 
 			switch (getStyleIndex()) {
 			case SeaMark.CARD_PILLAR:
-				image += "_Pillar";
+				image += "_Pillar"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_SPAR:
-				image += "_Spar";
+				image += "_Spar"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_BEACON:
-				image += "_Beacon";
+				image += "_Beacon"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_TOWER:
-				image += "_Tower";
+				image += "_Tower"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_FLOAT:
-				image += "_Float";
+				image += "_Float"; //$NON-NLS-1$
 				break;
 
@@ -242,14 +243,14 @@
 			switch (getBuoyIndex()) {
 			case CARD_NORTH:
-				image += "_North";
+				image += "_North"; //$NON-NLS-1$
 				break;
 			case CARD_EAST:
-				image += "_East";
+				image += "_East"; //$NON-NLS-1$
 				break;
 			case CARD_SOUTH:
-				image += "_South";
+				image += "_South"; //$NON-NLS-1$
 				break;
 			case CARD_WEST:
-				image += "_West";
+				image += "_West"; //$NON-NLS-1$
 				break;
 			default:
@@ -257,6 +258,6 @@
 			}
 
-			if (!image.equals("/images/Cardinal")) {
-				image += ".png";
+			if (!image.equals("/images/Cardinal")) { //$NON-NLS-1$
+				image += ".png"; //$NON-NLS-1$
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
 
@@ -267,5 +268,5 @@
 
 	public void setLightColour() {
-		super.setLightColour("W");
+		super.setLightColour("W"); //$NON-NLS-1$
 	}
 
@@ -276,27 +277,27 @@
 		}
 
-		String shape = "";
+		String shape = ""; //$NON-NLS-1$
 
 		switch (getStyleIndex()) {
 		case CARD_PILLAR:
-			super.saveSign("buoy_cardinal");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_cardinal:shape", "pillar"));
+			super.saveSign("buoy_cardinal"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_cardinal:shape", "pillar")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case CARD_SPAR:
-			super.saveSign("buoy_cardinal");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_cardinal:shape", "spar"));
+			super.saveSign("buoy_cardinal"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_cardinal:shape", "spar")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case CARD_BEACON:
-			super.saveSign("beacon_cardinal");
+			super.saveSign("beacon_cardinal"); //$NON-NLS-1$
 			break;
 		case CARD_TOWER:
-			super.saveSign("beacon_cardinal");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_cardinal:shape", "tower"));
+			super.saveSign("beacon_cardinal"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_cardinal:shape", "tower")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case CARD_FLOAT:
-			super.saveSign("light_float");
+			super.saveSign("light_float"); //$NON-NLS-1$
 			break;
 		default:
@@ -309,36 +310,36 @@
 			case SeaMark.CARD_NORTH:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:category", "north"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:colour", "black;yellow"));
-				shape = "2 cones up";
+						"seamark:buoy_cardinal:category", "north")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:buoy_cardinal:colour", "black;yellow")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones up"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_EAST:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:category", "east"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:colour", "black;yellow;black"));
-				shape = "2 cones base together";
+						"seamark:buoy_cardinal:category", "east")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:buoy_cardinal:colour", "black;yellow;black")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones base together"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_SOUTH:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:category", "south"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:colour", "yellow;black"));
-				shape = "2 cones down";
+						"seamark:buoy_cardinal:category", "south")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:buoy_cardinal:colour", "yellow;black")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones down"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_WEST:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:category", "west"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:buoy_cardinal:colour", "yellow;black;yellow"));
-				shape = "2 cones point together";
-				break;
-			}
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_cardinal:colour_pattern", "horizontal stripes"));
+						"seamark:buoy_cardinal:category", "west")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:buoy_cardinal:colour", "yellow;black;yellow")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones point together"; //$NON-NLS-1$
+				break;
+			}
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_cardinal:colour_pattern", "horizontal stripes")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case CARD_BEACON:
@@ -347,36 +348,36 @@
 			case SeaMark.CARD_NORTH:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:category", "north"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:colour", "black;yellow"));
-				shape = "2 cones up";
+						"seamark:beacon_cardinal:category", "north")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:beacon_cardinal:colour", "black;yellow")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones up"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_EAST:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:category", "east"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:colour", "black;yellow;black"));
-				shape = "2 cones base together";
+						"seamark:beacon_cardinal:category", "east")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:beacon_cardinal:colour", "black;yellow;black")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones base together"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_SOUTH:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:category", "south"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:colour", "yellow;black"));
-				shape = "2 cones down";
+						"seamark:beacon_cardinal:category", "south")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:beacon_cardinal:colour", "yellow;black")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones down"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_WEST:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:category", "west"));
-				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:beacon_cardinal:colour", "yellow;black;yellow"));
-				shape = "2 cones point together";
-				break;
-			}
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_cardinal:colour_pattern", "horizontal stripes"));
+						"seamark:beacon_cardinal:category", "west")); //$NON-NLS-1$ //$NON-NLS-2$
+				Main.main.undoRedo.add(new ChangePropertyCommand(node,
+						"seamark:beacon_cardinal:colour", "yellow;black;yellow")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones point together"; //$NON-NLS-1$
+				break;
+			}
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_cardinal:colour_pattern", "horizontal stripes")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case CARD_FLOAT:
@@ -384,32 +385,32 @@
 			case SeaMark.CARD_NORTH:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:light_float:colour", "black;yellow"));
-				shape = "2 cones up";
+						"seamark:light_float:colour", "black;yellow")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones up"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_EAST:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:light_float:colour", "black;yellow;black"));
-				shape = "2 cones base together";
+						"seamark:light_float:colour", "black;yellow;black")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones base together"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_SOUTH:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:light_float:colour", "yellow;black"));
-				shape = "2 cones down";
+						"seamark:light_float:colour", "yellow;black")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones down"; //$NON-NLS-1$
 				break;
 
 			case SeaMark.CARD_WEST:
 				Main.main.undoRedo.add(new ChangePropertyCommand(node,
-						"seamark:light_float:colour", "yellow;black;yellow"));
-				shape = "2 cones point together";
-				break;
-			}
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:light_float:colour_pattern", "horizontal stripes"));
-			break;
-		}
-		saveTopMarkData(shape, "black");
-		saveLightData("white");
+						"seamark:light_float:colour", "yellow;black;yellow")); //$NON-NLS-1$ //$NON-NLS-2$
+				shape = "2 cones point together"; //$NON-NLS-1$
+				break;
+			}
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:light_float:colour_pattern", "horizontal stripes")); //$NON-NLS-1$ //$NON-NLS-2$
+			break;
+		}
+		saveTopMarkData(shape, "black"); //$NON-NLS-1$
+		saveLightData("white"); //$NON-NLS-1$
 		saveRadarFogData();
 	}
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 23078)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 
+import toms.Messages;
 import toms.dialogs.SmpDialogAction;
 import toms.seamarks.SeaMark;
@@ -27,48 +28,48 @@
 
 		dlg.cbM01StyleOfMark.removeAllItems();
-		dlg.cbM01StyleOfMark.addItem("Not set");
-		dlg.cbM01StyleOfMark.addItem("Pillar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Spar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Beacon");
-		dlg.cbM01StyleOfMark.addItem("Tower");
-		dlg.cbM01StyleOfMark.addItem("Float");
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.01")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.04")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.05")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.06")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
 		dlg.cbM01StyleOfMark.setVisible(true);
 		dlg.lM01StyleOfMark.setVisible(true);
 
 		dlg.cbM01Kennung.removeAllItems();
-		dlg.cbM01Kennung.addItem("Not set");
-		dlg.cbM01Kennung.addItem("Fl(2)");
+		dlg.cbM01Kennung.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Fl(2)"); //$NON-NLS-1$
 
 		setBuoyIndex(ISOLATED_DANGER);
 		setColour(SeaMark.BLACK_RED_BLACK);
-		setLightColour("W");
+		setLightColour("W"); //$NON-NLS-1$
 		setTopMark(true);
-		setRegion(Main.pref.get("tomsplugin.IALA").equals("B"));
-
-		if (keys.containsKey("name"))
-			setName(keys.get("name"));
-
-		if (keys.containsKey("seamark:name"))
-			setName(keys.get("seamark:name"));
-
-		if (keys.containsKey("seamark:buoy_isolated_danger:name"))
-			setName(keys.get("seamark:buoy_isolated_danger:name"));
-		else if (keys.containsKey("seamark:beacon_isolated_danger:name"))
-			setName(keys.get("seamark:beacon_isolated_danger:name"));
-		else if (keys.containsKey("seamark:light_float:name"))
-			setName(keys.get("seamark:light_float:name"));
-
-		if (keys.containsKey("seamark:buoy_isolated_danger:shape")) {
-			str = keys.get("seamark:buoy_isolated_danger:shape");
-
-			if (str.equals("pillar"))
+		setRegion(Main.pref.get("tomsplugin.IALA").equals("B")); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (keys.containsKey("name")) //$NON-NLS-1$
+			setName(keys.get("name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_isolated_danger:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:buoy_isolated_danger:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:beacon_isolated_danger:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:beacon_isolated_danger:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:light_float:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:light_float:name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_isolated_danger:shape")) { //$NON-NLS-1$
+			str = keys.get("seamark:buoy_isolated_danger:shape"); //$NON-NLS-1$
+
+			if (str.equals("pillar")) //$NON-NLS-1$
 				setStyleIndex(ISOL_PILLAR);
-			else if (str.equals("spar"))
+			else if (str.equals("spar")) //$NON-NLS-1$
 				setStyleIndex(ISOL_SPAR);
-		} else if (keys.containsKey("seamark:beacon_isolated_danger:colour")) {
-			if (keys.containsKey("seamark:beacon_isolated_danger:shape")) {
-				str = keys.get("seamark:beacon_isolated_danger:shape");
-
-				if (str.equals("tower"))
+		} else if (keys.containsKey("seamark:beacon_isolated_danger:colour")) { //$NON-NLS-1$
+			if (keys.containsKey("seamark:beacon_isolated_danger:shape")) { //$NON-NLS-1$
+				str = keys.get("seamark:beacon_isolated_danger:shape"); //$NON-NLS-1$
+
+				if (str.equals("tower")) //$NON-NLS-1$
 					setStyleIndex(ISOL_TOWER);
 				else
@@ -76,27 +77,27 @@
 			} else
 				setStyleIndex(ISOL_BEACON);
-		} else if (keys.containsKey("seamark:type")
-				&& (keys.get("seamark:type").equals("light_float"))) {
+		} else if (keys.containsKey("seamark:type") //$NON-NLS-1$
+				&& (keys.get("seamark:type").equals("light_float"))) { //$NON-NLS-1$ //$NON-NLS-2$
 			setStyleIndex(CARD_FLOAT);
 		}
 
-		if (keys.containsKey("seamark:topmark:shape")
-				|| keys.containsKey("seamark:topmark:colour")) {
+		if (keys.containsKey("seamark:topmark:shape") //$NON-NLS-1$
+				|| keys.containsKey("seamark:topmark:colour")) { //$NON-NLS-1$
 			setTopMark(true);
 		}
 
-		if (keys.containsKey("seamark:light:colour")) {
-			str = keys.get("seamark:light:colour");
-
-			if (keys.containsKey("seamark:light:character")) {
+		if (keys.containsKey("seamark:light:colour")) { //$NON-NLS-1$
+			str = keys.get("seamark:light:colour"); //$NON-NLS-1$
+
+			if (keys.containsKey("seamark:light:character")) { //$NON-NLS-1$
 				setLightGroup(keys);
-				String c = keys.get("seamark:light:character");
+				String c = keys.get("seamark:light:character"); //$NON-NLS-1$
 				setLightChar(c);
 				setLightPeriod(keys);
 			}
 
-			if (str.equals("white")) {
+			if (str.equals("white")) { //$NON-NLS-1$
 				setFired(true);
-				setLightColour("W");
+				setLightColour("W"); //$NON-NLS-1$
 			}
 		}
@@ -124,27 +125,27 @@
 			dlg.cM01Fired.setVisible(true);
 			
-			String image = "/images/Cardinal";
+			String image = "/images/Cardinal"; //$NON-NLS-1$
 
 			switch (getStyleIndex()) {
 			case ISOL_PILLAR:
-				image += "_Pillar_Single";
+				image += "_Pillar_Single"; //$NON-NLS-1$
 				break;
 			case ISOL_SPAR:
-				image += "_Spar_Single";
+				image += "_Spar_Single"; //$NON-NLS-1$
 				break;
 			case ISOL_BEACON:
-				image += "_Beacon_Single";
+				image += "_Beacon_Single"; //$NON-NLS-1$
 				break;
 			case ISOL_TOWER:
-				image += "_Tower_Single";
+				image += "_Tower_Single"; //$NON-NLS-1$
 				break;
 			case ISOL_FLOAT:
-				image += "_Float_Single";
+				image += "_Float_Single"; //$NON-NLS-1$
 				break;
 			default:
 			}
 
-			if (!image.equals("/images/Cardinal")) {
-				image += ".png";
+			if (!image.equals("/images/Cardinal")) { //$NON-NLS-1$
+				image += ".png"; //$NON-NLS-1$
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
 			} else
@@ -152,5 +153,5 @@
 		} else {
 			dlg.tfM01Name.setEnabled(false);
-			dlg.tfM01Name.setText("");
+			dlg.tfM01Name.setText(""); //$NON-NLS-1$
 			dlg.cM01TopMark.setVisible(false);
 			dlg.cM01Radar.setVisible(false);
@@ -170,23 +171,23 @@
 		switch (getStyleIndex()) {
 		case ISOL_PILLAR:
-			super.saveSign("buoy_isolated_danger");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_isolated_danger:shape", "pillar"));
+			super.saveSign("buoy_isolated_danger"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_isolated_danger:shape", "pillar")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case ISOL_SPAR:
-			super.saveSign("buoy_isolated_danger");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_isolated_danger:shape", "spar"));
+			super.saveSign("buoy_isolated_danger"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_isolated_danger:shape", "spar")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case ISOL_BEACON:
-			super.saveSign("beacon_isolated_danger");
+			super.saveSign("beacon_isolated_danger"); //$NON-NLS-1$
 			break;
 		case ISOL_TOWER:
-			super.saveSign("beacon_isolated_danger");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_isolated_danger:shape", "tower"));
+			super.saveSign("beacon_isolated_danger"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_isolated_danger:shape", "tower")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case ISOL_FLOAT:
-			super.saveSign("light_float");
+			super.saveSign("light_float"); //$NON-NLS-1$
 			break;
 		default:
@@ -197,7 +198,7 @@
 		case ISOL_SPAR:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_isolated_danger:colour_pattern", "horizontal stripes"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_isolated_danger:colour", "black;red;black"));
+					"seamark:buoy_isolated_danger:colour_pattern", "horizontal stripes")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_isolated_danger:colour", "black;red;black")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case ISOL_BEACON:
@@ -205,19 +206,19 @@
 			Main.main.undoRedo
 					.add(new ChangePropertyCommand(node,
-							"seamark:beacon_isolated_danger:colour_pattern",
-							"horizontal stripes"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_isolated_danger:colour", "black;red;black"));
+							"seamark:beacon_isolated_danger:colour_pattern", //$NON-NLS-1$
+							"horizontal stripes")); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_isolated_danger:colour", "black;red;black")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case ISOL_FLOAT:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:light_float:colour_pattern", "horizontal stripes"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:light_float:colour", "black;red;black"));
-			break;
-		}
-
-		saveTopMarkData("2 spheres", "black");
-		saveLightData("white");
+					"seamark:light_float:colour_pattern", "horizontal stripes")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:light_float:colour", "black;red;black")); //$NON-NLS-1$ //$NON-NLS-2$
+			break;
+		}
+
+		saveTopMarkData("2 spheres", "black"); //$NON-NLS-1$ //$NON-NLS-2$
+		saveLightData("white"); //$NON-NLS-1$
 		saveRadarFogData();
 
@@ -225,5 +226,5 @@
 
 	public void setLightColour() {
-		super.setLightColour("W");
+		super.setLightColour("W"); //$NON-NLS-1$
 	}
 
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 23078)
@@ -293,5 +293,5 @@
 
 		dlg.cbM01StyleOfMark.removeAllItems();
-		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.11")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("SmpDialogAction.213")); //$NON-NLS-1$
 
 		switch (type) {
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 23078)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 
+import toms.Messages;
 import toms.dialogs.SmpDialogAction;
 import toms.seamarks.SeaMark;
@@ -31,10 +32,10 @@
 
 		dlg.cbM01Kennung.removeAllItems();
-		dlg.cbM01Kennung.addItem("Not set");
-		dlg.cbM01Kennung.addItem("Fl");
-		dlg.cbM01Kennung.addItem("Fl()");
-		dlg.cbM01Kennung.addItem("Oc()");
-		dlg.cbM01Kennung.addItem("Q");
-		dlg.cbM01Kennung.addItem("IQ");
+		dlg.cbM01Kennung.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Fl"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Fl()"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Oc()"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Q"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("IQ"); //$NON-NLS-1$
 		dlg.cbM01Kennung.setSelectedIndex(0);
 
@@ -73,20 +74,20 @@
 			case SeaMark.LIGHT_HOUSE:
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
-						"/images/Light_House.png")));
+						"/images/Light_House.png"))); //$NON-NLS-1$
 				break;
 
 			case SeaMark.LIGHT_MAJOR:
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
-						"/images/Light_Major.png")));
+						"/images/Light_Major.png"))); //$NON-NLS-1$
 				break;
 
 			case SeaMark.LIGHT_MINOR:
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
-						"/images/Light_Minor.png")));
+						"/images/Light_Minor.png"))); //$NON-NLS-1$
 				break;
 
 			case SeaMark.LIGHT_VESSEL:
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(
-						"/images/Major_Float.png")));
+						"/images/Major_Float.png"))); //$NON-NLS-1$
 				break;
 
@@ -105,15 +106,15 @@
 		switch (getStyleIndex()) {
 		case LIGHT_HOUSE:
-			super.saveSign("lighthouse");
+			super.saveSign("lighthouse"); //$NON-NLS-1$
 			break;
 		case LIGHT_MAJOR:
-			super.saveSign("major_light");
+			super.saveSign("major_light"); //$NON-NLS-1$
 			break;
 		case LIGHT_MINOR:
-			super.saveSign("minor_light");
+			super.saveSign("minor_light"); //$NON-NLS-1$
 			break;
 		default:
 		}
-		saveLightData("white");
+		saveLightData("white"); //$NON-NLS-1$
 		saveRadarFogData();
 	}
@@ -135,13 +136,13 @@
 		keys = node.getKeys();
 
-		if (keys.containsKey("seamark:light:colour")) {
-			str = keys.get("seamark:light:colour");
+		if (keys.containsKey("seamark:light:colour")) { //$NON-NLS-1$
+			str = keys.get("seamark:light:colour"); //$NON-NLS-1$
 
-			if (keys.containsKey("seamark:light:character")) {
+			if (keys.containsKey("seamark:light:character")) { //$NON-NLS-1$
 				setLightGroup(keys);
 
-				String c = keys.get("seamark:light:character");
-				if (getLightGroup() != "")
-					c = c + "(" + getLightGroup() + ")";
+				String c = keys.get("seamark:light:character"); //$NON-NLS-1$
+				if (getLightGroup() != "") //$NON-NLS-1$
+					c = c + "(" + getLightGroup() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 				setLightChar(c);
 				setLightPeriod(keys);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 23078)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 
+import toms.Messages;
 import toms.dialogs.SmpDialogAction;
 import toms.seamarks.SeaMark;
@@ -27,75 +28,75 @@
 
 		dlg.cbM01StyleOfMark.removeAllItems();
-		dlg.cbM01StyleOfMark.addItem("Not set");
-		dlg.cbM01StyleOfMark.addItem("Pillar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Spar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Sphere Buoy");
-		dlg.cbM01StyleOfMark.addItem("Beacon");
-		dlg.cbM01StyleOfMark.addItem("Float");
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.01")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.04")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.08")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.05")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
 		dlg.cbM01StyleOfMark.setVisible(true);
 		dlg.lM01StyleOfMark.setVisible(true);
 
 		dlg.cbM01Kennung.removeAllItems();
-		dlg.cbM01Kennung.addItem("Not set");
-		dlg.cbM01Kennung.addItem("Iso");
-		dlg.cbM01Kennung.addItem("Oc");
-		dlg.cbM01Kennung.addItem("LFl");
-		dlg.cbM01Kennung.addItem("Mo()");
+		dlg.cbM01Kennung.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Iso"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Oc"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("LFl"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Mo()"); //$NON-NLS-1$
 
 		setBuoyIndex(SAFE_WATER);
 		setColour(SeaMark.RED_WHITE);
-		setLightColour("W");
-		setRegion(Main.pref.get("tomsplugin.IALA").equals("B"));
-
-		if (keys.containsKey("name"))
-			setName(keys.get("name"));
-
-		if (keys.containsKey("seamark:name"))
-			setName(keys.get("seamark:name"));
-
-		if (keys.containsKey("seamark:buoy_safe_water:name"))
-			setName(keys.get("seamark:buoy_safe_water:name"));
-		else if (keys.containsKey("seamark:beacon_safe_water:name"))
-			setName(keys.get("seamark:beacon_safe_water:name"));
-		else if (keys.containsKey("seamark:light_float:name"))
-			setName(keys.get("seamark:light_float:name"));
-
-		if (keys.containsKey("seamark:buoy_safe_water:shape")) {
-			str = keys.get("seamark:buoy_safe_water:shape");
-
-			if (str.equals("pillar"))
+		setLightColour("W"); //$NON-NLS-1$
+		setRegion(Main.pref.get("tomsplugin.IALA").equals("B")); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (keys.containsKey("name")) //$NON-NLS-1$
+			setName(keys.get("name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_safe_water:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:buoy_safe_water:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:beacon_safe_water:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:beacon_safe_water:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:light_float:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:light_float:name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_safe_water:shape")) { //$NON-NLS-1$
+			str = keys.get("seamark:buoy_safe_water:shape"); //$NON-NLS-1$
+
+			if (str.equals("pillar")) //$NON-NLS-1$
 				setStyleIndex(SAFE_PILLAR);
-			else if (str.equals("spar"))
+			else if (str.equals("spar")) //$NON-NLS-1$
 				setStyleIndex(SAFE_SPAR);
-			else if (str.equals("sphere"))
+			else if (str.equals("sphere")) //$NON-NLS-1$
 				setStyleIndex(SAFE_SPHERE);
-		} else if ((keys.containsKey("seamark:type"))
-				&& (keys.get("seamark:type").equals("light_float"))) {
+		} else if ((keys.containsKey("seamark:type")) //$NON-NLS-1$
+				&& (keys.get("seamark:type").equals("light_float"))) { //$NON-NLS-1$ //$NON-NLS-2$
 			setStyleIndex(SAFE_FLOAT);
-		} else if ((keys.containsKey("seamark:type"))
-				&& (keys.get("seamark:type").equals("beacon_safe_water"))) {
+		} else if ((keys.containsKey("seamark:type")) //$NON-NLS-1$
+				&& (keys.get("seamark:type").equals("beacon_safe_water"))) { //$NON-NLS-1$ //$NON-NLS-2$
 			setStyleIndex(SAFE_BEACON);
 		}
 
-		if (keys.containsKey("seamark:light:colour")) {
-			str = keys.get("seamark:light:colour");
-
-			if (keys.containsKey("seamark:light:character")) {
+		if (keys.containsKey("seamark:light:colour")) { //$NON-NLS-1$
+			str = keys.get("seamark:light:colour"); //$NON-NLS-1$
+
+			if (keys.containsKey("seamark:light:character")) { //$NON-NLS-1$
 				setLightGroup(keys);
-				String c = keys.get("seamark:light:character");
-				if (getLightGroup() != "")
-					c = c + "(" + getLightGroup() + ")";
+				String c = keys.get("seamark:light:character"); //$NON-NLS-1$
+				if (getLightGroup() != "") //$NON-NLS-1$
+					c = c + "(" + getLightGroup() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 				setLightChar(c);
 				setLightPeriod(keys);
 			}
 
-			if (str.equals("white")) {
+			if (str.equals("white")) { //$NON-NLS-1$
 				setFired(true);
-				setLightColour("W");
+				setLightColour("W"); //$NON-NLS-1$
 			}
 		}
 
-		if (keys.containsKey("seamark:topmark:shape")
-				|| keys.containsKey("seamark:topmark:colour")) {
+		if (keys.containsKey("seamark:topmark:shape") //$NON-NLS-1$
+				|| keys.containsKey("seamark:topmark:colour")) { //$NON-NLS-1$
 			setTopMark(true);
 		}
@@ -130,29 +131,29 @@
 			dlg.cM01Fired.setEnabled(true);
 
-			String image = "/images/Safe_Water";
+			String image = "/images/Safe_Water"; //$NON-NLS-1$
 
 			switch (getStyleIndex()) {
 			case SAFE_PILLAR:
-				image += "_Pillar";
+				image += "_Pillar"; //$NON-NLS-1$
 				break;
 			case SAFE_SPAR:
-				image += "_Spar";
+				image += "_Spar"; //$NON-NLS-1$
 				break;
 			case SAFE_SPHERE:
-				image += "_Sphere";
+				image += "_Sphere"; //$NON-NLS-1$
 				break;
 			case SAFE_BEACON:
-				image += "_Beacon";
+				image += "_Beacon"; //$NON-NLS-1$
 				break;
 			case SAFE_FLOAT:
-				image += "_Float";
+				image += "_Float"; //$NON-NLS-1$
 				break;
 			default:
 			}
 
-			if (!image.equals("/images/Safe_Water")) {
+			if (!image.equals("/images/Safe_Water")) { //$NON-NLS-1$
 				if (hasTopMark())
-					image += "_Sphere";
-				image += ".png";
+					image += "_Sphere"; //$NON-NLS-1$
+				image += ".png"; //$NON-NLS-1$
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
 			} else
@@ -170,23 +171,23 @@
 		switch (getStyleIndex()) {
 		case SAFE_PILLAR:
-			super.saveSign("buoy_safe_water");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safe_water:shape", "pillar"));
+			super.saveSign("buoy_safe_water"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_safe_water:shape", "pillar")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SAFE_SPAR:
-			super.saveSign("buoy_safe_water");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safe_water:shape", "spar"));
+			super.saveSign("buoy_safe_water"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_safe_water:shape", "spar")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SAFE_SPHERE:
-			super.saveSign("buoy_safe_water");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safe_water:shape", "sphere"));
+			super.saveSign("buoy_safe_water"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_safe_water:shape", "sphere")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SAFE_BEACON:
-			super.saveSign("beacon_safe_water");
+			super.saveSign("beacon_safe_water"); //$NON-NLS-1$
 			break;
 		case SAFE_FLOAT:
-			super.saveSign("light_float");
+			super.saveSign("light_float"); //$NON-NLS-1$
 			break;
 		default:
@@ -198,29 +199,29 @@
 		case SAFE_SPHERE:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safe_water:colour_pattern", "vertical stripes"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_safe_water:colour", "red;white"));
+					"seamark:buoy_safe_water:colour_pattern", "vertical stripes")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_safe_water:colour", "red;white")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SAFE_BEACON:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_safe_water:colour_pattern", "vertical stripes"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_safe_water:colour", "red;white"));
+					"seamark:beacon_safe_water:colour_pattern", "vertical stripes")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_safe_water:colour", "red;white")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SAFE_FLOAT:
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:light_float:colour_pattern", "vertical stripes"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:light_float:colour", "red;white"));
+					"seamark:light_float:colour_pattern", "vertical stripes")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:light_float:colour", "red;white")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		default:
 		}
-		saveTopMarkData("spherical", "red");
-		saveLightData("white");
+		saveTopMarkData("spherical", "red"); //$NON-NLS-1$ //$NON-NLS-2$
+		saveLightData("white"); //$NON-NLS-1$
 		saveRadarFogData();
 	}
 
 	public void setLightColour() {
-		super.setLightColour("W");
+		super.setLightColour("W"); //$NON-NLS-1$
 	}
 
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 23077)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 23078)
@@ -12,4 +12,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 
+import toms.Messages;
 import toms.dialogs.SmpDialogAction;
 import toms.seamarks.SeaMark;
@@ -27,23 +28,23 @@
 
 		dlg.cbM01StyleOfMark.removeAllItems();
-		dlg.cbM01StyleOfMark.addItem("Not set");
-		dlg.cbM01StyleOfMark.addItem("Pillar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Spar Buoy");
-		dlg.cbM01StyleOfMark.addItem("Sphere Buoy");
-		dlg.cbM01StyleOfMark.addItem("Barrel");
-		dlg.cbM01StyleOfMark.addItem("Float");
-		dlg.cbM01StyleOfMark.addItem("Beacon");
-		dlg.cbM01StyleOfMark.addItem("Tower");
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.01")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.04")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.08")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.09")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.07")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.05")); //$NON-NLS-1$
+		dlg.cbM01StyleOfMark.addItem(Messages.getString("Buoy.06")); //$NON-NLS-1$
 		dlg.cbM01StyleOfMark.setVisible(true);
 		dlg.lM01StyleOfMark.setVisible(true);
 
 		dlg.cbM01Kennung.removeAllItems();
-		dlg.cbM01Kennung.addItem("Not set");
-		dlg.cbM01Kennung.addItem("Fl");
-		dlg.cbM01Kennung.addItem("Fl()");
-		dlg.cbM01Kennung.addItem("Oc");
-		dlg.cbM01Kennung.addItem("Oc()");
-		dlg.cbM01Kennung.addItem("Q");
-		dlg.cbM01Kennung.addItem("IQ");
+		dlg.cbM01Kennung.addItem(Messages.getString("SmpDialogAction.212")); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Fl"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Fl()"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Oc"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Oc()"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("Q"); //$NON-NLS-1$
+		dlg.cbM01Kennung.addItem("IQ"); //$NON-NLS-1$
 		dlg.cbM01Kennung.setSelectedIndex(0);
 
@@ -52,64 +53,64 @@
 		setBuoyIndex(SPECIAL_PURPOSE);
 		setColour(SeaMark.YELLOW);
-		setLightColour("W");
-		setRegion(Main.pref.get("tomsplugin.IALA").equals("B"));
-
-		if (keys.containsKey("name"))
-			setName(keys.get("name"));
-
-		if (keys.containsKey("seamark:name"))
-			setName(keys.get("seamark:name"));
-
-		if (keys.containsKey("seamark:buoy_special_purpose:name"))
-			setName(keys.get("seamark:buoy_special_purpose:name"));
-		else if (keys.containsKey("seamark:beacon_special_purpose:name"))
-			setName(keys.get("seamark:beacon_special_purpose:name"));
-		else if (keys.containsKey("seamark:light_float:name"))
-			setName(keys.get("seamark:light_float:name"));
-
-		if (keys.containsKey("seamark:buoy_special_purpose:shape")) {
-			str = keys.get("seamark:buoy_special_purpose:shape");
-
-			if (str.equals("pillar"))
+		setLightColour("W"); //$NON-NLS-1$
+		setRegion(Main.pref.get("tomsplugin.IALA").equals("B")); //$NON-NLS-1$ //$NON-NLS-2$
+
+		if (keys.containsKey("name")) //$NON-NLS-1$
+			setName(keys.get("name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_special_purpose:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:buoy_special_purpose:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:beacon_special_purpose:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:beacon_special_purpose:name")); //$NON-NLS-1$
+		else if (keys.containsKey("seamark:light_float:name")) //$NON-NLS-1$
+			setName(keys.get("seamark:light_float:name")); //$NON-NLS-1$
+
+		if (keys.containsKey("seamark:buoy_special_purpose:shape")) { //$NON-NLS-1$
+			str = keys.get("seamark:buoy_special_purpose:shape"); //$NON-NLS-1$
+
+			if (str.equals("pillar")) //$NON-NLS-1$
 				setStyleIndex(SPEC_PILLAR);
-			else if (str.equals("spar"))
+			else if (str.equals("spar")) //$NON-NLS-1$
 				setStyleIndex(SPEC_SPAR);
-			else if (str.equals("sphere"))
+			else if (str.equals("sphere")) //$NON-NLS-1$
 				setStyleIndex(SPEC_SPHERE);
-			else if (str.equals("barrel"))
+			else if (str.equals("barrel")) //$NON-NLS-1$
 				setStyleIndex(SPEC_BARREL);
 		}
 
-		if ((keys.containsKey("seamark:type") && keys.get("seamark:type").equals(
-				"beacon_special_purpose"))
-				|| keys.containsKey("seamark:beacon_special_purpose:colour")
-				|| keys.containsKey("seamark:beacon_special_purpose:shape")) {
-			if (keys.containsKey("seamark:beacon_special_purpose:shape")
-					&& keys.get("seamark:beacon_special_purpose:shape").equals("tower"))
+		if ((keys.containsKey("seamark:type") && keys.get("seamark:type").equals( //$NON-NLS-1$ //$NON-NLS-2$
+				"beacon_special_purpose")) //$NON-NLS-1$
+				|| keys.containsKey("seamark:beacon_special_purpose:colour") //$NON-NLS-1$
+				|| keys.containsKey("seamark:beacon_special_purpose:shape")) { //$NON-NLS-1$
+			if (keys.containsKey("seamark:beacon_special_purpose:shape") //$NON-NLS-1$
+					&& keys.get("seamark:beacon_special_purpose:shape").equals("tower")) //$NON-NLS-1$ //$NON-NLS-2$
 				setStyleIndex(SPEC_TOWER);
 			else
 				setStyleIndex(SPEC_BEACON);
-		} else if (keys.containsKey("seamark:light_float:colour")
-				&& keys.get("seamark:light_float:colour").equals("yellow"))
+		} else if (keys.containsKey("seamark:light_float:colour") //$NON-NLS-1$
+				&& keys.get("seamark:light_float:colour").equals("yellow")) //$NON-NLS-1$ //$NON-NLS-2$
 			setStyleIndex(SPEC_FLOAT);
 
 		keys = node.getKeys();
-		if (keys.containsKey("seamark:topmark:shape")) {
-			str = keys.get("seamark:topmark:shape");
-
-			if (str.equals("x-shape")) {
+		if (keys.containsKey("seamark:topmark:shape")) { //$NON-NLS-1$
+			str = keys.get("seamark:topmark:shape"); //$NON-NLS-1$
+
+			if (str.equals("x-shape")) { //$NON-NLS-1$
 				setTopMark(true);
 			}
 		}
 
-		if (keys.containsKey("seamark:light:colour")) {
-			str = keys.get("seamark:light:colour");
-
-			if (keys.containsKey("seamark:light:character")) {
+		if (keys.containsKey("seamark:light:colour")) { //$NON-NLS-1$
+			str = keys.get("seamark:light:colour"); //$NON-NLS-1$
+
+			if (keys.containsKey("seamark:light:character")) { //$NON-NLS-1$
 				setLightGroup(keys);
 
-				String c = keys.get("seamark:light:character");
-				if (getLightGroup() != "")
-					c = c + "(" + getLightGroup() + ")";
+				String c = keys.get("seamark:light:character"); //$NON-NLS-1$
+				if (getLightGroup() != "") //$NON-NLS-1$
+					c = c + "(" + getLightGroup() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 
 				setLightChar(c);
@@ -117,7 +118,7 @@
 			}
 
-			if (str.equals("white")) {
+			if (str.equals("white")) { //$NON-NLS-1$
 				setFired(true);
-				setLightColour("W");
+				setLightColour("W"); //$NON-NLS-1$
 			}
 		}
@@ -170,35 +171,35 @@
 			dlg.cM01Fired.setEnabled(true);
 
-			String image = "/images/Special_Purpose";
+			String image = "/images/Special_Purpose"; //$NON-NLS-1$
 
 			switch (getStyleIndex()) {
 			case SPEC_PILLAR:
-				image += "_Pillar";
+				image += "_Pillar"; //$NON-NLS-1$
 				break;
 			case SPEC_SPAR:
-				image += "_Spar";
+				image += "_Spar"; //$NON-NLS-1$
 				break;
 			case SPEC_SPHERE:
-				image += "_Sphere";
+				image += "_Sphere"; //$NON-NLS-1$
 				break;
 			case SPEC_BARREL:
-				image += "_Barrel";
+				image += "_Barrel"; //$NON-NLS-1$
 				break;
 			case SPEC_FLOAT:
-				image += "_Float";
+				image += "_Float"; //$NON-NLS-1$
 				break;
 			case SPEC_BEACON:
-				image += "_Beacon";
+				image += "_Beacon"; //$NON-NLS-1$
 				break;
 			case SPEC_TOWER:
-				image += "_Tower";
+				image += "_Tower"; //$NON-NLS-1$
 				break;
 			default:
 			}
 
-			if (!image.equals("/images/Special_Purpose")) {
+			if (!image.equals("/images/Special_Purpose")) { //$NON-NLS-1$
 				if (hasTopMark())
-					image += "_CrossY";
-				image += ".png";
+					image += "_CrossY"; //$NON-NLS-1$
+				image += ".png"; //$NON-NLS-1$
 				dlg.lM01Icon.setIcon(new ImageIcon(getClass().getResource(image)));
 			} else
@@ -216,57 +217,57 @@
 		switch (getStyleIndex()) {
 		case SPEC_PILLAR:
-			super.saveSign("buoy_special_purpose");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:shape", "pillar"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:colour", "yellow"));
+			super.saveSign("buoy_special_purpose"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:shape", "pillar")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SPEC_SPAR:
-			super.saveSign("buoy_special_purpose");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:shape", "spar"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:colour", "yellow"));
+			super.saveSign("buoy_special_purpose"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:shape", "spar")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SPEC_SPHERE:
-			super.saveSign("buoy_special_purpose");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:shape", "sphere"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:colour", "yellow"));
+			super.saveSign("buoy_special_purpose"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:shape", "sphere")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SPEC_BARREL:
-			super.saveSign("buoy_special_purpose");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:shape", "barrel"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:buoy_special_purpose:colour", "yellow"));
+			super.saveSign("buoy_special_purpose"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:shape", "barrel")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:buoy_special_purpose:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SPEC_FLOAT:
-			super.saveSign("light_float");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:light_float:colour", "yellow"));
+			super.saveSign("light_float"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:light_float:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SPEC_BEACON:
-			super.saveSign("beacon_special_purpose");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_special_purpose:colour", "yellow"));
+			super.saveSign("beacon_special_purpose"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_special_purpose:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		case SPEC_TOWER:
-			super.saveSign("beacon_special_purpose");
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_special_purpose:shape", "tower"));
-			Main.main.undoRedo.add(new ChangePropertyCommand(node,
-					"seamark:beacon_special_purpose:colour", "yellow"));
+			super.saveSign("beacon_special_purpose"); //$NON-NLS-1$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_special_purpose:shape", "tower")); //$NON-NLS-1$ //$NON-NLS-2$
+			Main.main.undoRedo.add(new ChangePropertyCommand(node,
+					"seamark:beacon_special_purpose:colour", "yellow")); //$NON-NLS-1$ //$NON-NLS-2$
 			break;
 		default:
 		}
-		saveTopMarkData("x-shape", "yellow");
-		saveLightData("white");
+		saveTopMarkData("x-shape", "yellow"); //$NON-NLS-1$ //$NON-NLS-2$
+		saveLightData("white"); //$NON-NLS-1$
 		saveRadarFogData();
 	}
 
 	public void setLightColour() {
-		super.setLightColour("W");
+		super.setLightColour("W"); //$NON-NLS-1$
 	}