Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java	(revision 24555)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java	(revision 24556)
@@ -72,5 +72,5 @@
 	@Override
 	public String getInfo() {
-		return "Seamark editor";
+		return Messages.getString("TabInfo");
 	}
 
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 24555)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 24556)
@@ -38,5 +38,4 @@
 import oseam.OSeaM;
 
-
 public class OSeaMAction {
 
@@ -46,7 +45,7 @@
 	private JButton specButton = null;
 	private JButton lightButton = null;
-	
+
 	public OSeaMAction() {
-		
+
 		String str = Main.pref.get("mappaint.style.sources");
 		if (!str.contains("dev.openseamap.org")) {
@@ -67,9 +66,9 @@
 			oseamPanel.setLayout(null);
 			oseamPanel.setSize(new Dimension(400, 360));
-//System.out.println("file=" + Messages.getString("ChanButton"));
-			oseamPanel.add(getChanButton(),  null);
-			oseamPanel.add(getHazButton(),  null);
-			oseamPanel.add(getSpecButton(),  null);
-			oseamPanel.add(getLightButton(),  null);
+			// System.out.println("file=" + Messages.getString("ChanButton"));
+			oseamPanel.add(getChanButton(), null);
+			oseamPanel.add(getHazButton(), null);
+			oseamPanel.add(getSpecButton(), null);
+			oseamPanel.add(getLightButton(), null);
 		}
 		return oseamPanel;
@@ -79,16 +78,18 @@
 		if (chanButton == null) {
 			chanButton = new JButton();
-			chanButton.setBounds(new Rectangle(340, 56, 50, 50));
+			chanButton.setBounds(new Rectangle(5, 5, 50, 50));
 			chanButton.setText("");
-			chanButton.setIcon(new ImageIcon(getClass().getResource(Messages.getString("ChanButton"))));
-			chanButton.setToolTipText("Channel Marks");
+			chanButton.setIcon(new ImageIcon(getClass().getResource(
+					Messages.getString("ChanButton"))));
+			chanButton.setToolTipText(Messages.getString("ChanTip"));
 			chanButton.addActionListener(new java.awt.event.ActionListener() {
 				public void actionPerformed(java.awt.event.ActionEvent e) {
-/*					panelLimits.setVisible(false);
-					panelServices.setVisible(false);
-					panelEnv.setVisible(false);
-					panelRelations.setVisible(false);
-					panelGeneral.setVisible(true);
-*/				}
+					/*
+					 * panelLimits.setVisible(false);
+					 * panelServices.setVisible(false);
+					 * panelEnv.setVisible(false);
+					 * panelRelations.setVisible(false);
+					 * panelGeneral.setVisible(true);
+					 */}
 			});
 		}
@@ -99,16 +100,18 @@
 		if (hazButton == null) {
 			hazButton = new JButton();
-			hazButton.setBounds(new Rectangle(340, 111, 50, 50));
+			hazButton.setBounds(new Rectangle(60, 5, 50, 50));
 			hazButton.setText("");
-			hazButton.setIcon(new ImageIcon(getClass().getResource(Messages.getString("HazButton"))));
-			hazButton.setToolTipText("Danger Marks");
+			hazButton.setIcon(new ImageIcon(getClass().getResource(
+					Messages.getString("HazButton"))));
+			hazButton.setToolTipText(Messages.getString("HazTip"));
 			hazButton.addActionListener(new java.awt.event.ActionListener() {
 				public void actionPerformed(java.awt.event.ActionEvent e) {
-/*					panelLimits.setVisible(false);
-					panelServices.setVisible(false);
-					panelEnv.setVisible(false);
-					panelRelations.setVisible(false);
-					panelGeneral.setVisible(true);
-*/				}
+					/*
+					 * panelLimits.setVisible(false);
+					 * panelServices.setVisible(false);
+					 * panelEnv.setVisible(false);
+					 * panelRelations.setVisible(false);
+					 * panelGeneral.setVisible(true);
+					 */}
 			});
 		}
@@ -119,16 +122,18 @@
 		if (specButton == null) {
 			specButton = new JButton();
-			specButton.setBounds(new Rectangle(340, 166, 50, 50));
+			specButton.setBounds(new Rectangle(115, 5, 50, 50));
 			specButton.setText("");
-			specButton.setIcon(new ImageIcon(getClass().getResource(Messages.getString("SpecButton"))));
-			specButton.setToolTipText("Special Marks");
+			specButton.setIcon(new ImageIcon(getClass().getResource(
+					Messages.getString("SpecButton"))));
+			specButton.setToolTipText(Messages.getString("SpecTip"));
 			specButton.addActionListener(new java.awt.event.ActionListener() {
 				public void actionPerformed(java.awt.event.ActionEvent e) {
-/*					panelLimits.setVisible(false);
-					panelServices.setVisible(false);
-					panelEnv.setVisible(false);
-					panelRelations.setVisible(false);
-					panelGeneral.setVisible(true);
-*/				}
+					/*
+					 * panelLimits.setVisible(false);
+					 * panelServices.setVisible(false);
+					 * panelEnv.setVisible(false);
+					 * panelRelations.setVisible(false);
+					 * panelGeneral.setVisible(true);
+					 */}
 			});
 		}
@@ -139,16 +144,18 @@
 		if (lightButton == null) {
 			lightButton = new JButton();
-			lightButton.setBounds(new Rectangle(340, 221, 50, 50));
+			lightButton.setBounds(new Rectangle(170, 5, 50, 50));
 			lightButton.setText("");
-			lightButton.setIcon(new ImageIcon(getClass().getResource(Messages.getString("LightsButton"))));
-			lightButton.setToolTipText("Light Marks");
+			lightButton.setIcon(new ImageIcon(getClass().getResource(
+					Messages.getString("LightsButton"))));
+			lightButton.setToolTipText(Messages.getString("LightsTip"));
 			lightButton.addActionListener(new java.awt.event.ActionListener() {
 				public void actionPerformed(java.awt.event.ActionEvent e) {
-/*					panelLimits.setVisible(false);
-					panelServices.setVisible(false);
-					panelEnv.setVisible(false);
-					panelRelations.setVisible(false);
-					panelGeneral.setVisible(true);
-*/				}
+					/*
+					 * panelLimits.setVisible(false);
+					 * panelServices.setVisible(false);
+					 * panelEnv.setVisible(false);
+					 * panelRelations.setVisible(false);
+					 * panelGeneral.setVisible(true);
+					 */}
 			});
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties	(revision 24555)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties	(revision 24556)
@@ -1,5 +1,10 @@
+TabInfo=Seamark editor
 TabName=Seamarks
 ChanButton=/images/ChanButton.png
+ChanTip=Channel marks
 HazButton=/images/HazButton.png
+HazTip=Danger marks
 SpecButton=/images/SpecButton.png
+SpecTip=Special marks
 LightsButton=/images/LightsButton.png
+LightsTip=Lights marks
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties	(revision 24555)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties	(revision 24556)
@@ -1,5 +1,10 @@
+TabInfo=Seamark editor
 TabName=Seezeichen
 ChanButton=/images/ChanButton_de.png
+ChanTip=Channel marks
 HazButton=/images/HazButton_de.png
+HazTip=Danger marks
 SpecButton=/images/SpecButton_de.png
+SpecTip=Special marks
 LightsButton=/images/LightsButton_de.png
+LightsTip=Lights marks
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties	(revision 24555)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties	(revision 24556)
@@ -1,5 +1,10 @@
+TabInfo=Seamark editor
 TabName=Seamarks
 ChanButton=/images/ChanButton.png
+ChanTip=Channel marks
 HazButton=/images/HazButton.png
+HazTip=Danger marks
 SpecButton=/images/SpecButton.png
+SpecTip=Special marks
 LightsButton=/images/LightsButton.png
+LightsTip=Lights marks