diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java
index 0e9ff2c0c4..0c7fd90512 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocationDialog.java
@@ -208,11 +208,6 @@ public class VLocationDialog extends CDialog
 
 	private boolean inCountryAction;
 	private boolean inOKAction;
-	
-	/** The "route" key  */
-	private static final String TO_ROUTE = Msg.getMsg(Env.getCtx(), "Route");
-	/** The "to link" key  */
-	private static final String TO_LINK = Msg.getMsg(Env.getCtx(), "Map");
 
 	private JButton toLink  	= new JButton();
 	private JButton toRoute 	= new JButton();
@@ -235,14 +230,14 @@ public class VLocationDialog extends CDialog
 		southPanel.add(confirmPanel, BorderLayout.NORTH);
 		
 		//BEGIN fernandinho/ricardo
-		toLink.setText(TO_LINK);
+		toLink.setText(Msg.getMsg(Env.getCtx(), "Map"));
 		toLink.addActionListener(this);
 		toLink.setMargin(ConfirmPanel.s_insets);
 		confirmPanel.addComponent(toLink);
 		if (MLocation.LOCATION_MAPS_URL_PREFIX == null)
 			toLink.setVisible(false);
 
-		toRoute.setText(TO_ROUTE);
+		toRoute.setText(Msg.getMsg(Env.getCtx(), "Route"));
 		toRoute.addActionListener(this);
 		toRoute.setMargin(ConfirmPanel.s_insets);
 		confirmPanel.addComponent(toRoute);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
index 25b4010f4b..7b1ab14f57 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocationDialog.java
@@ -130,11 +130,6 @@ public class WLocationDialog extends Window implements EventListener<Event>
 	private boolean inCountryAction;
 	private boolean inOKAction;
 
-	/** The "route" key  */
-	private static final String TO_ROUTE = Msg.getMsg(Env.getCtx(), "Route");
-	/** The "to link" key  */
-	private static final String TO_LINK = Msg.getMsg(Env.getCtx(), "Map");
-
 	private Button toLink;
 	private Button toRoute;
 	private GridField m_GridField = null;
@@ -263,10 +258,10 @@ public class WLocationDialog extends Window implements EventListener<Event>
 		confirmPanel = new ConfirmPanel(true);
 		confirmPanel.addActionListener(this);
 
-		toLink = new Button(TO_LINK);
+		toLink = new Button(Msg.getMsg(Env.getCtx(), "Map"));
 		LayoutUtils.addSclass("txt-btn", toLink);
 		toLink.addEventListener(Events.ON_CLICK,this);
-		toRoute = new Button(TO_ROUTE);
+		toRoute = new Button(Msg.getMsg(Env.getCtx(), "Route"));
 		LayoutUtils.addSclass("txt-btn", toRoute);
 		toRoute.addEventListener(Events.ON_CLICK,this);