diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8fdfd41a8d..7da77da901 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,81 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-07-24 01:55 UTC+0200 Viktor Szakats (harbour syenar.net)
+  + src/lang/be.c
+  + src/lang/bg.c
+  + src/lang/ca.c
+  + src/lang/cs.c
+  + src/lang/de.c
+  + src/lang/el.c
+  + src/lang/en_tpl.c
+  + src/lang/eo.c
+  + src/lang/es.c
+  + src/lang/eu.c
+  + src/lang/fr.c
+  + src/lang/gl.c
+  + src/lang/he.c
+  + src/lang/hr.c
+  + src/lang/hu.c
+  + src/lang/id.c
+  + src/lang/is.c
+  + src/lang/it.c
+  + src/lang/ko.c
+  + src/lang/lt.c
+  + src/lang/nl.c
+  + src/lang/pl.c
+  + src/lang/pt.c
+  + src/lang/ro.c
+  + src/lang/ru.c
+  + src/lang/sk.c
+  + src/lang/sl.c
+  + src/lang/sr_cyr.c
+  + src/lang/sr_lat.c
+  + src/lang/sv.c
+  + src/lang/tr.c
+  + src/lang/uk.c
+  + src/lang/zh_sim.c
+  + src/lang/zh_tra.c
+  - src/lang/msg_tpl.c
+  - src/lang/msgbeutf.c
+  - src/lang/msgbgutf.c
+  - src/lang/msgcautf.c
+  - src/lang/msgcsutf.c
+  - src/lang/msgdeutf.c
+  - src/lang/msgelutf.c
+  - src/lang/msgeoutf.c
+  - src/lang/msgesutf.c
+  - src/lang/msgeuutf.c
+  - src/lang/msgfrutf.c
+  - src/lang/msgglutf.c
+  - src/lang/msgheutf.c
+  - src/lang/msghrutf.c
+  - src/lang/msghuutf.c
+  - src/lang/msgidutf.c
+  - src/lang/msgisutf.c
+  - src/lang/msgitutf.c
+  - src/lang/msgkoutf.c
+  - src/lang/msgltutf.c
+  - src/lang/msgnlutf.c
+  - src/lang/msgplutf.c
+  - src/lang/msgptutf.c
+  - src/lang/msgroutf.c
+  - src/lang/msgruutf.c
+  - src/lang/msgskutf.c
+  - src/lang/msgslutf.c
+  - src/lang/msgsrlat.c
+  - src/lang/msgsrutf.c
+  - src/lang/msgsvutf.c
+  - src/lang/msgtrutf.c
+  - src/lang/msguautf.c
+  - src/lang/msgzhsim.c
+  - src/lang/msgzhutf.c
+  * src/lang/Makefile
+    % shortened language module names, deleted UTF prefix,
+      since every one of them is now UTF and only-UTF,
+      cleaned postfixes for languages with multiple flavors
+    ! fixed UA -> UK
+
 2012-07-24 01:43 UTC+0200 Viktor Szakats (harbour syenar.net)
   + src/lang/msgzhsim.c
   - src/lang/msgko.c
diff --git a/harbour/src/lang/Makefile b/harbour/src/lang/Makefile
index 02f5d170ca..b63eff71f6 100644
--- a/harbour/src/lang/Makefile
+++ b/harbour/src/lang/Makefile
@@ -5,39 +5,39 @@
 ROOT := ../../
 
 C_SOURCES := \
-   msgbeutf.c \
-   msgbgutf.c \
-   msgcautf.c \
-   msgcsutf.c \
-   msgdeutf.c \
-   msgelutf.c \
-   msgeoutf.c \
-   msgesutf.c \
-   msgeuutf.c \
-   msgfrutf.c \
-   msgglutf.c \
-   msgheutf.c \
-   msghrutf.c \
-   msghuutf.c \
-   msgidutf.c \
-   msgisutf.c \
-   msgitutf.c \
-   msgkoutf.c \
-   msgltutf.c \
-   msgnlutf.c \
-   msgplutf.c \
-   msgptutf.c \
-   msgroutf.c \
-   msgruutf.c \
-   msgskutf.c \
-   msgslutf.c \
-   msgsrlat.c \
-   msgsrutf.c \
-   msgsvutf.c \
-   msgtrutf.c \
-   msguautf.c \
-   msgzhsim.c \
-   msgzhutf.c \
+   be.c \
+   bg.c \
+   ca.c \
+   cs.c \
+   de.c \
+   el.c \
+   eo.c \
+   es.c \
+   eu.c \
+   fr.c \
+   gl.c \
+   he.c \
+   hr.c \
+   hu.c \
+   id.c \
+   is.c \
+   it.c \
+   ko.c \
+   lt.c \
+   nl.c \
+   pl.c \
+   pt.c \
+   ro.c \
+   ru.c \
+   sk.c \
+   sl.c \
+   sr_cyr.c \
+   sr_lat.c \
+   sv.c \
+   tr.c \
+   uk.c \
+   zh_sim.c \
+   zh_tra.c \
 
 LIBNAME := hblang
 
diff --git a/harbour/src/lang/msgbeutf.c b/harbour/src/lang/be.c
similarity index 100%
rename from harbour/src/lang/msgbeutf.c
rename to harbour/src/lang/be.c
diff --git a/harbour/src/lang/msgbgutf.c b/harbour/src/lang/bg.c
similarity index 100%
rename from harbour/src/lang/msgbgutf.c
rename to harbour/src/lang/bg.c
diff --git a/harbour/src/lang/msgcautf.c b/harbour/src/lang/ca.c
similarity index 100%
rename from harbour/src/lang/msgcautf.c
rename to harbour/src/lang/ca.c
diff --git a/harbour/src/lang/msgcsutf.c b/harbour/src/lang/cs.c
similarity index 100%
rename from harbour/src/lang/msgcsutf.c
rename to harbour/src/lang/cs.c
diff --git a/harbour/src/lang/msgdeutf.c b/harbour/src/lang/de.c
similarity index 100%
rename from harbour/src/lang/msgdeutf.c
rename to harbour/src/lang/de.c
diff --git a/harbour/src/lang/msgelutf.c b/harbour/src/lang/el.c
similarity index 100%
rename from harbour/src/lang/msgelutf.c
rename to harbour/src/lang/el.c
diff --git a/harbour/src/lang/msg_tpl.c b/harbour/src/lang/en_tpl.c
similarity index 100%
rename from harbour/src/lang/msg_tpl.c
rename to harbour/src/lang/en_tpl.c
diff --git a/harbour/src/lang/msgeoutf.c b/harbour/src/lang/eo.c
similarity index 100%
rename from harbour/src/lang/msgeoutf.c
rename to harbour/src/lang/eo.c
diff --git a/harbour/src/lang/msgesutf.c b/harbour/src/lang/es.c
similarity index 100%
rename from harbour/src/lang/msgesutf.c
rename to harbour/src/lang/es.c
diff --git a/harbour/src/lang/msgeuutf.c b/harbour/src/lang/eu.c
similarity index 100%
rename from harbour/src/lang/msgeuutf.c
rename to harbour/src/lang/eu.c
diff --git a/harbour/src/lang/msgfrutf.c b/harbour/src/lang/fr.c
similarity index 100%
rename from harbour/src/lang/msgfrutf.c
rename to harbour/src/lang/fr.c
diff --git a/harbour/src/lang/msgglutf.c b/harbour/src/lang/gl.c
similarity index 100%
rename from harbour/src/lang/msgglutf.c
rename to harbour/src/lang/gl.c
diff --git a/harbour/src/lang/msgheutf.c b/harbour/src/lang/he.c
similarity index 100%
rename from harbour/src/lang/msgheutf.c
rename to harbour/src/lang/he.c
diff --git a/harbour/src/lang/msghrutf.c b/harbour/src/lang/hr.c
similarity index 100%
rename from harbour/src/lang/msghrutf.c
rename to harbour/src/lang/hr.c
diff --git a/harbour/src/lang/msghuutf.c b/harbour/src/lang/hu.c
similarity index 100%
rename from harbour/src/lang/msghuutf.c
rename to harbour/src/lang/hu.c
diff --git a/harbour/src/lang/msgidutf.c b/harbour/src/lang/id.c
similarity index 100%
rename from harbour/src/lang/msgidutf.c
rename to harbour/src/lang/id.c
diff --git a/harbour/src/lang/msgisutf.c b/harbour/src/lang/is.c
similarity index 100%
rename from harbour/src/lang/msgisutf.c
rename to harbour/src/lang/is.c
diff --git a/harbour/src/lang/msgitutf.c b/harbour/src/lang/it.c
similarity index 100%
rename from harbour/src/lang/msgitutf.c
rename to harbour/src/lang/it.c
diff --git a/harbour/src/lang/msgkoutf.c b/harbour/src/lang/ko.c
similarity index 100%
rename from harbour/src/lang/msgkoutf.c
rename to harbour/src/lang/ko.c
diff --git a/harbour/src/lang/msgltutf.c b/harbour/src/lang/lt.c
similarity index 100%
rename from harbour/src/lang/msgltutf.c
rename to harbour/src/lang/lt.c
diff --git a/harbour/src/lang/msgnlutf.c b/harbour/src/lang/nl.c
similarity index 100%
rename from harbour/src/lang/msgnlutf.c
rename to harbour/src/lang/nl.c
diff --git a/harbour/src/lang/msgplutf.c b/harbour/src/lang/pl.c
similarity index 100%
rename from harbour/src/lang/msgplutf.c
rename to harbour/src/lang/pl.c
diff --git a/harbour/src/lang/msgptutf.c b/harbour/src/lang/pt.c
similarity index 100%
rename from harbour/src/lang/msgptutf.c
rename to harbour/src/lang/pt.c
diff --git a/harbour/src/lang/msgroutf.c b/harbour/src/lang/ro.c
similarity index 100%
rename from harbour/src/lang/msgroutf.c
rename to harbour/src/lang/ro.c
diff --git a/harbour/src/lang/msgruutf.c b/harbour/src/lang/ru.c
similarity index 100%
rename from harbour/src/lang/msgruutf.c
rename to harbour/src/lang/ru.c
diff --git a/harbour/src/lang/msgskutf.c b/harbour/src/lang/sk.c
similarity index 100%
rename from harbour/src/lang/msgskutf.c
rename to harbour/src/lang/sk.c
diff --git a/harbour/src/lang/msgslutf.c b/harbour/src/lang/sl.c
similarity index 100%
rename from harbour/src/lang/msgslutf.c
rename to harbour/src/lang/sl.c
diff --git a/harbour/src/lang/msgsrutf.c b/harbour/src/lang/sr_cyr.c
similarity index 100%
rename from harbour/src/lang/msgsrutf.c
rename to harbour/src/lang/sr_cyr.c
diff --git a/harbour/src/lang/msgsrlat.c b/harbour/src/lang/sr_lat.c
similarity index 100%
rename from harbour/src/lang/msgsrlat.c
rename to harbour/src/lang/sr_lat.c
diff --git a/harbour/src/lang/msgsvutf.c b/harbour/src/lang/sv.c
similarity index 100%
rename from harbour/src/lang/msgsvutf.c
rename to harbour/src/lang/sv.c
diff --git a/harbour/src/lang/msgtrutf.c b/harbour/src/lang/tr.c
similarity index 100%
rename from harbour/src/lang/msgtrutf.c
rename to harbour/src/lang/tr.c
diff --git a/harbour/src/lang/msguautf.c b/harbour/src/lang/uk.c
similarity index 100%
rename from harbour/src/lang/msguautf.c
rename to harbour/src/lang/uk.c
diff --git a/harbour/src/lang/msgzhsim.c b/harbour/src/lang/zh_sim.c
similarity index 100%
rename from harbour/src/lang/msgzhsim.c
rename to harbour/src/lang/zh_sim.c
diff --git a/harbour/src/lang/msgzhutf.c b/harbour/src/lang/zh_tra.c
similarity index 100%
rename from harbour/src/lang/msgzhutf.c
rename to harbour/src/lang/zh_tra.c