diff --git a/4dev/locale/Readme.md b/4dev/locale/Readme.md
new file mode 100644
index 00000000..d6814fb7
--- /dev/null
+++ b/4dev/locale/Readme.md
@@ -0,0 +1,52 @@
+# Translation files
+
+## Source file name convetion
+
+Locale Name . Domain . Encoding .po
+
+## Name parte explenations
+
+### Locale Name Examples
+
+If underscore in name the long version is checked first, then the short version:
+en_US@latin -> en_US -> en
+
+* en
+* en_US
+* en_US@latin
+
+### Domain
+
+For current case auto set CONTENT_PATH is used
+
+* admin
+* frontend
+
+### Encoding
+
+if not set UTF-8 is assumed. Any other utf8 encoding is changed to UTF-8
+
+* UTF-8
+* SJIS
+* EUC
+
+## File name example source
+
+`ja_US.admin.UTF-8.po`
+
+## Folder layout
+
+`includes/locale/ja/LC_MESSAGES/frontend.mo`
+
+ALTERNATE LOCALE NAMES:
+* ja
+* ja_JP
+* ja.UTF-8
+* ja_JP.UTF-8
+
+ja_JP.UTF-8: Locale Name
+frontend: dmain (CONTENT_PATH)
+
+## command
+
+`msgfmt -o www/includes/locale/ja_JP/LC_MESSAGES/frontend.UTF-8.mo 4dev/lang/ja_US.admin.UTF-8.po`
diff --git a/4dev/lang/admin/messages_en_utf8.po b/4dev/locale/en_US.admin.UTF-8.po
similarity index 97%
rename from 4dev/lang/admin/messages_en_utf8.po
rename to 4dev/locale/en_US.admin.UTF-8.po
index 8f946d4d..e6241638 100644
--- a/4dev/lang/admin/messages_en_utf8.po
+++ b/4dev/locale/en_US.admin.UTF-8.po
@@ -26,7 +26,7 @@ msgid "Month"
 msgstr "Month"
 
 msgid "INPUT TEST"
-msgstr "OUTPUT TEST EN"
+msgstr "OUTPUT TEST ADMIN EN"
 
 msgid "I should be translated"
 msgstr "I should be translated: I WAS TRANSLATED"
diff --git a/4dev/locale/en_US.frontend.UTF-8.po b/4dev/locale/en_US.frontend.UTF-8.po
new file mode 100644
index 00000000..6e9f76f2
--- /dev/null
+++ b/4dev/locale/en_US.frontend.UTF-8.po
@@ -0,0 +1,2 @@
+msgid "INPUT TEST"
+msgstr "OUTPUT TEST FRONTEND EN"
diff --git a/4dev/lang/admin/messages_ja_utf8.po b/4dev/locale/ja_JP.admin.UTF-8.po
similarity index 97%
rename from 4dev/lang/admin/messages_ja_utf8.po
rename to 4dev/locale/ja_JP.admin.UTF-8.po
index b5ef1dfc..4d49c4a9 100644
--- a/4dev/lang/admin/messages_ja_utf8.po
+++ b/4dev/locale/ja_JP.admin.UTF-8.po
@@ -63,7 +63,7 @@ msgid "Sun"
 msgstr "日"
 
 msgid "INPUT TEST"
-msgstr "OUTPUT TEST JA"
+msgstr "OUTPUT TEST ADMIN JA"
 
 # login string
 msgid "Hello %s"
diff --git a/4dev/locale/ja_JP.frontend.UTF-8.po b/4dev/locale/ja_JP.frontend.UTF-8.po
new file mode 100644
index 00000000..91c739b2
--- /dev/null
+++ b/4dev/locale/ja_JP.frontend.UTF-8.po
@@ -0,0 +1,2 @@
+msgid "INPUT TEST"
+msgstr "OUTPUT TEST FRONTEND JA"
diff --git a/www/includes/lang/admin/en_utf8.mo b/www/includes/lang/admin/en_utf8.mo
deleted file mode 100644
index 6b528088..00000000
Binary files a/www/includes/lang/admin/en_utf8.mo and /dev/null differ
diff --git a/www/includes/lang/admin/en_utf8.mo b/www/includes/lang/admin/en_utf8.mo
new file mode 120000
index 00000000..d3db0998
--- /dev/null
+++ b/www/includes/lang/admin/en_utf8.mo
@@ -0,0 +1 @@
+../../locale/en_US/LC_MESSAGES/admin.mo
\ No newline at end of file
diff --git a/www/includes/lang/admin/ja_utf8.mo b/www/includes/lang/admin/ja_utf8.mo
deleted file mode 100644
index 39986a93..00000000
Binary files a/www/includes/lang/admin/ja_utf8.mo and /dev/null differ
diff --git a/www/includes/lang/admin/ja_utf8.mo b/www/includes/lang/admin/ja_utf8.mo
new file mode 120000
index 00000000..a4aff9e3
--- /dev/null
+++ b/www/includes/lang/admin/ja_utf8.mo
@@ -0,0 +1 @@
+../../locale/ja/LC_MESSAGES/admin.mo
\ No newline at end of file
diff --git a/www/includes/lang/frontend/en_utf8.mo b/www/includes/lang/frontend/en_utf8.mo
new file mode 120000
index 00000000..0cc45273
--- /dev/null
+++ b/www/includes/lang/frontend/en_utf8.mo
@@ -0,0 +1 @@
+../../locale/en_US/LC_MESSAGES/frontend.mo
\ No newline at end of file
diff --git a/www/includes/lang/frontend/ja_utf8.mo b/www/includes/lang/frontend/ja_utf8.mo
new file mode 120000
index 00000000..b5d54477
--- /dev/null
+++ b/www/includes/lang/frontend/ja_utf8.mo
@@ -0,0 +1 @@
+../../locale/ja/LC_MESSAGES/frontend.mo
\ No newline at end of file
diff --git a/www/includes/locale/en_US/LC_MESSAGES/admin.mo b/www/includes/locale/en_US/LC_MESSAGES/admin.mo
new file mode 100644
index 00000000..da820bb0
Binary files /dev/null and b/www/includes/locale/en_US/LC_MESSAGES/admin.mo differ
diff --git a/www/includes/locale/en_US/LC_MESSAGES/frontend.mo b/www/includes/locale/en_US/LC_MESSAGES/frontend.mo
new file mode 100644
index 00000000..5e0a6ebd
Binary files /dev/null and b/www/includes/locale/en_US/LC_MESSAGES/frontend.mo differ
diff --git a/www/includes/locale/ja/LC_MESSAGES/admin.mo b/www/includes/locale/ja/LC_MESSAGES/admin.mo
new file mode 100644
index 00000000..6d2ebed8
Binary files /dev/null and b/www/includes/locale/ja/LC_MESSAGES/admin.mo differ
diff --git a/www/includes/locale/ja/LC_MESSAGES/frontend.mo b/www/includes/locale/ja/LC_MESSAGES/frontend.mo
new file mode 100644
index 00000000..07971795
Binary files /dev/null and b/www/includes/locale/ja/LC_MESSAGES/frontend.mo differ