diff --git a/4dev/locale/Readme.md b/4dev/locale/Readme.md
index d6814fb7..9175e46b 100644
--- a/4dev/locale/Readme.md
+++ b/4dev/locale/Readme.md
@@ -13,6 +13,7 @@ en_US@latin -> en_US -> en
 
 * en
 * en_US
+* en_US.UTF-8
 * en_US@latin
 
 ### Domain
@@ -32,7 +33,9 @@ if not set UTF-8 is assumed. Any other utf8 encoding is changed to UTF-8
 
 ## File name example source
 
-`ja_US.admin.UTF-8.po`
+`ja-admin.po`
+
+First part is LOCALE, second part is domain. Separator is `-`
 
 ## Folder layout
 
@@ -49,4 +52,4 @@ 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`
+`msgfmt -o www/includes/locale/ja/LC_MESSAGES/frontend.mo 4dev/lang/ja.admin.po`
diff --git a/4dev/locale/en_US.admin.UTF-8.po b/4dev/locale/en_US-admin.po
similarity index 100%
rename from 4dev/locale/en_US.admin.UTF-8.po
rename to 4dev/locale/en_US-admin.po
diff --git a/4dev/locale/en_US.frontend.UTF-8.po b/4dev/locale/en_US-frontend.po
similarity index 100%
rename from 4dev/locale/en_US.frontend.UTF-8.po
rename to 4dev/locale/en_US-frontend.po
diff --git a/4dev/locale/ja_JP.admin.UTF-8.po b/4dev/locale/ja-admin.po
similarity index 100%
rename from 4dev/locale/ja_JP.admin.UTF-8.po
rename to 4dev/locale/ja-admin.po
diff --git a/4dev/locale/ja_JP.frontend.UTF-8.po b/4dev/locale/ja-frontend.po
similarity index 100%
rename from 4dev/locale/ja_JP.frontend.UTF-8.po
rename to 4dev/locale/ja-frontend.po
diff --git a/4dev/tests/includes/create_po.sh b/4dev/tests/includes/create_po.sh
index d549d19a..0162152e 100755
--- a/4dev/tests/includes/create_po.sh
+++ b/4dev/tests/includes/create_po.sh
@@ -7,7 +7,10 @@ if [ ! -f "locale/en_US/LC_MESSAGES/admin.mo" ]; then
 	exit;
 fi;
 
-msgfmt -o locale/en_US/LC_MESSAGES/admin.mo locale/en_US.admin.UTF-8.po
-msgfmt -o locale/en_US/LC_MESSAGES/frontend.mo locale/en_US.frontend.UTF-8.po
-msgfmt -o locale/ja_JP/LC_MESSAGES/admin.mo locale/ja_JP.admin.UTF-8.po
-msgfmt -o locale/ja_JP/LC_MESSAGES/frontend.mo locale/ja_JP.frontend.UTF-8.po
+for file in $(ls -1 locale/*.po); do
+	echo $file;
+	file=$(basename $file .po);
+	locale=$(echo "${file}" | cut -d "-" -f 1);
+	domain=$(echo "${file}" | cut -d "-" -f 2);
+	msgfmt -o locale/${locale}/LC_MESSAGES/${domain}.mo locale/${locale}-${domain}.po;
+done;
diff --git a/4dev/tests/includes/locale/en_US.admin.UTF-8.po b/4dev/tests/includes/locale/en_US-admin.po
similarity index 100%
rename from 4dev/tests/includes/locale/en_US.admin.UTF-8.po
rename to 4dev/tests/includes/locale/en_US-admin.po
diff --git a/4dev/tests/includes/locale/en_US.frontend.UTF-8.po b/4dev/tests/includes/locale/en_US-frontend.po
similarity index 100%
rename from 4dev/tests/includes/locale/en_US.frontend.UTF-8.po
rename to 4dev/tests/includes/locale/en_US-frontend.po
diff --git a/4dev/tests/includes/locale/ja_JP.admin.UTF-8.po b/4dev/tests/includes/locale/ja_JP-admin.po
similarity index 100%
rename from 4dev/tests/includes/locale/ja_JP.admin.UTF-8.po
rename to 4dev/tests/includes/locale/ja_JP-admin.po
diff --git a/4dev/tests/includes/locale/ja_JP.frontend.UTF-8.po b/4dev/tests/includes/locale/ja_JP-frontend.po
similarity index 100%
rename from 4dev/tests/includes/locale/ja_JP.frontend.UTF-8.po
rename to 4dev/tests/includes/locale/ja_JP-frontend.po