diff --git a/install/src/org/compiere/install/SetupRes_ja.java b/install/src/org/compiere/install/SetupRes_ja.java
index 83039df94d..f4da9765ba 100644
--- a/install/src/org/compiere/install/SetupRes_ja.java
+++ b/install/src/org/compiere/install/SetupRes_ja.java
@@ -28,29 +28,29 @@ public class SetupRes_ja extends ListResourceBundle
 {
 	/**	Translation Info	*/
 	static final Object[][] contents = new String[][]{
-	{ "AdempiereServerSetup", 	"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec \u30b5\u30fc\u30d0 \u8a2d\u5b9a" },
+	{ "AdempiereServerSetup", 	"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec \u30b5\u30fc\u30d0\u30fc \u8a2d\u5b9a" },
 	{ "Ok", 					"Ok" },
 	{ "File", 					"\u30d5\u30a1\u30a4\u30eb" },
 	{ "Exit", 					"\u7d42\u4e86" },
 	{ "Help", 					"\u30d8\u30eb\u30d7" },
-	{ "PleaseCheck", 			"\u78ba\u304b\u3081\u3066\u4e0b\u3055\u3044" },
-	{ "UnableToConnect", 		"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u306b\u63a5\u7d9a\u304c\u3067\u304d\u306a\u3044" },
+	{ "PleaseCheck", 			"\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044" },
+	{ "UnableToConnect", 		"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u306b\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093" },
 	//
-	{ "AdempiereHomeInfo", 		"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0\u30d5\u30a9\u30eb\u30c0" },
-	{ "AdempiereHome", 			"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0" },
-	{ "WebPortInfo", 			"\u30a6\u30a8\u30d6 (HTML) \u30dd\u30fc\u30c8" },
-	{ "WebPort", 				"\u30a6\u30a8\u30d6 \u30dd\u30fc\u30c8" },
+	{ "AdempiereHomeInfo", 		"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0\u30d5\u30a9\u30eb\u30c0" },
+	{ "AdempiereHome", 			"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0" },
+	{ "WebPortInfo", 			"\u30a6\u30a7\u30d6 (HTML) \u30dd\u30fc\u30c8" },
+	{ "WebPort", 				"\u30a6\u30a7\u30d6 \u30dd\u30fc\u30c8" },
 	{ "AppsServerInfo", 		"\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u540d" },
 	{ "AppsServer", 			"\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0" },
 	{ "DatabaseTypeInfo", 		"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9" },
 	{ "DatabaseType", 			"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9" },
 	{ "DatabaseNameInfo", 		"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u540d" },
 	{ "DatabaseName", 			"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u540d (SID)" },
-	{ "DatabasePortInfo", 		"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 \u30ea\u30bb\u30ca\u30fc \u30dd\u30fc\u30c8" },
+	{ "DatabasePortInfo", 		"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 \u5f85\u53d7\u3051 \u30dd\u30fc\u30c8" },
 	{ "DatabasePort", 			"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 \u30dd\u30fc\u30c8" },
-	{ "DatabaseUserInfo", 		"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d" },
+	{ "DatabaseUserInfo", 		"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d" },
 	{ "DatabaseUser", 			"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e6\u30fc\u30b6\u540d" },
-	{ "DatabasePasswordInfo", 	"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9" },
+	{ "DatabasePasswordInfo", 	"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9" },
 	{ "DatabasePassword", 		"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u30ef\u30fc\u30c9" },
 	{ "TNSNameInfo", 			"\u30b0\u30ed\u30fc\u30d0\u30eb\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u540d (TNS)" },
 	{ "TNSName", 				"TNS" },
@@ -58,7 +58,7 @@ public class SetupRes_ja extends ListResourceBundle
 	{ "SystemPassword", 		"\u30b7\u30b9\u30c6\u30e0\u30d1\u30b9\u30ef\u30fc\u30c9" },
 	{ "MailServerInfo", 		"\u30e1\u30fc\u30eb\u30fb\u30b5\u30fc\u30d0" },
 	{ "MailServer", 			"\u30e1\u30fc\u30eb\u30fb\u30b5\u30fc\u30d0" },
-	{ "AdminEMailInfo", 		"\u30a2\u30c9\u30df\u30cb\u30b9\u30c8\u30ec\u30fc\u30c8\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9" },
+	{ "AdminEMailInfo", 		"\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9" },
 	{ "AdminEMail", 			"\u30e1\u30fc\u30eb" },
 	{ "DatabaseServerInfo", 	"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30b5\u30fc\u30d0\u540d" },
 	{ "DatabaseServer", 		"\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30b5\u30fc\u30d0\u540d" },
@@ -66,9 +66,9 @@ public class SetupRes_ja extends ListResourceBundle
 	{ "JavaHome", 				"Java\u306e\u30db\u30fc\u30e0" },
 	{ "JNPPortInfo", 			"\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u306eJNP \u30dd\u30fc\u30c8" },
 	{ "JNPPort", 				"JNP \u30dd\u30fc\u30c8" },
-	{ "MailUserInfo", 			"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d" },
+	{ "MailUserInfo", 			"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6\u540d" },
 	{ "MailUser", 				"\u30e1\u30fc\u30eb\u30e6\u30fc\u30b6" },
-	{ "MailPasswordInfo", 		"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9" },
+	{ "MailPasswordInfo", 		"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9" },
 	{ "MailPassword", 			"\u30e1\u30fc\u30eb\u30d1\u30b9\u30ef\u30fc\u30c9" },
 	//
 	{ "JavaType",				"Java VM"},
@@ -87,7 +87,7 @@ public class SetupRes_ja extends ListResourceBundle
 	//
 	{ "ServerError", 			"\u30b5\u30fc\u30d0\u8a2d\u5b9a\u30a8\u30e9\u30fc" },
 	{ "ErrorJavaHome", 			"Java\u306e\u30db\u30fc\u30e0\u30a8\u30e9\u30fc" },
-	{ "ErrorAdempiereHome", 		"\u30b3\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0\u30a8\u30e9\u30fc" },
+	{ "ErrorAdempiereHome", 	"\u30a2\u30c7\u30f3\u30d4\u30a8\u30fc\u30ec\u306e\u30db\u30fc\u30e0\u30da\u30fc\u30b8\u30a8\u30e9\u30fc" },
 	{ "ErrorAppsServer", 		"\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30fb\u30b5\u30fc\u30d0\u306e\u30a8\u30e9\u30fc\uff1alocalhost" },
 	{ "ErrorWebPort", 			"\u30a6\u30a8\u30d6\u30dd\u30fc\u30c8\u306e\u30a8\u30e9\u30fc" },
 	{ "ErrorJNPPort", 			"JNP\u30dd\u30fc\u30c8\u306e\u30a8\u30e9\u30fc" },