diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 838ca135ef..eaa609dd91 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,38 @@
past entries belonging to author(s): Viktor Szakats.
*/
+2010-02-20 21:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+ + doc/en
+ - doc/en-EN
+ - contrib/hbgt/doc/en-EN
+ + contrib/hbgt/doc/en
+ - contrib/hbziparc/doc/en-EN
+ + contrib/hbziparc/doc/en
+ - contrib/rddads/doc/en-EN
+ + contrib/rddads/doc/en
+ - contrib/hbgd/doc/en-EN
+ + contrib/hbgd/doc/en
+ - contrib/hbmisc/doc/en-EN
+ + contrib/hbmisc/doc/en
+ - contrib/hbbtree/doc/en-EN
+ + contrib/hbbtree/doc/en
+ - examples/hbdoc/examples/core_en
+ + examples/hbdoc/examples/en
+ - examples/hbdoc/examples/core_es
+ + examples/hbdoc/examples/es
+ * Renamed to use IETF complient language ID.
+
+ - examples/hbdoc/examples/hbmisc
+ - Deleted.
+
+ * utils/hbmk2/hbmk2.pt_BR.po
+ * utils/hbmk2/hbmk2.hu_HU.po
+ * utils/hbmk2/hbmk2.prg
+ ! Fixed to not use "en-EN" language code, but plain "en".
+
+ * examples/hbdoc2/hbdoc2.prg
+ * "en-en" -> "en"
+
2010-02-20 20:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/hbwin.ch
! Renamed HB_WIN_RGB_BROWN to HB_WIN_RGB_YELLOW to match
diff --git a/harbour/contrib/hbbtree/doc/en-EN/hb_btree.txt b/harbour/contrib/hbbtree/doc/en/hb_btree.txt
similarity index 100%
rename from harbour/contrib/hbbtree/doc/en-EN/hb_btree.txt
rename to harbour/contrib/hbbtree/doc/en/hb_btree.txt
diff --git a/harbour/contrib/hbgd/doc/en-EN/hbgd.txt b/harbour/contrib/hbgd/doc/en/hbgd.txt
similarity index 100%
rename from harbour/contrib/hbgd/doc/en-EN/hbgd.txt
rename to harbour/contrib/hbgd/doc/en/hbgd.txt
diff --git a/harbour/contrib/hbgt/doc/en-EN/hbgt.txt b/harbour/contrib/hbgt/doc/en/hbgt.txt
similarity index 100%
rename from harbour/contrib/hbgt/doc/en-EN/hbgt.txt
rename to harbour/contrib/hbgt/doc/en/hbgt.txt
diff --git a/harbour/contrib/hbmisc/doc/en-EN/dates2.txt b/harbour/contrib/hbmisc/doc/en/dates2.txt
similarity index 100%
rename from harbour/contrib/hbmisc/doc/en-EN/dates2.txt
rename to harbour/contrib/hbmisc/doc/en/dates2.txt
diff --git a/harbour/contrib/hbmisc/doc/en-EN/ht_class.txt b/harbour/contrib/hbmisc/doc/en/ht_class.txt
similarity index 100%
rename from harbour/contrib/hbmisc/doc/en-EN/ht_class.txt
rename to harbour/contrib/hbmisc/doc/en/ht_class.txt
diff --git a/harbour/contrib/hbmisc/doc/en-EN/ht_conv.txt b/harbour/contrib/hbmisc/doc/en/ht_conv.txt
similarity index 100%
rename from harbour/contrib/hbmisc/doc/en-EN/ht_conv.txt
rename to harbour/contrib/hbmisc/doc/en/ht_conv.txt
diff --git a/harbour/contrib/hbmisc/doc/en-EN/ht_dbf.txt b/harbour/contrib/hbmisc/doc/en/ht_dbf.txt
similarity index 100%
rename from harbour/contrib/hbmisc/doc/en-EN/ht_dbf.txt
rename to harbour/contrib/hbmisc/doc/en/ht_dbf.txt
diff --git a/harbour/contrib/hbmisc/doc/en-EN/ht_doc.txt b/harbour/contrib/hbmisc/doc/en/ht_doc.txt
similarity index 100%
rename from harbour/contrib/hbmisc/doc/en-EN/ht_doc.txt
rename to harbour/contrib/hbmisc/doc/en/ht_doc.txt
diff --git a/harbour/contrib/hbmisc/doc/en-EN/ht_file.txt b/harbour/contrib/hbmisc/doc/en/ht_file.txt
similarity index 100%
rename from harbour/contrib/hbmisc/doc/en-EN/ht_file.txt
rename to harbour/contrib/hbmisc/doc/en/ht_file.txt
diff --git a/harbour/contrib/hbmisc/doc/en-EN/ht_str.txt b/harbour/contrib/hbmisc/doc/en/ht_str.txt
similarity index 100%
rename from harbour/contrib/hbmisc/doc/en-EN/ht_str.txt
rename to harbour/contrib/hbmisc/doc/en/ht_str.txt
diff --git a/harbour/contrib/hbziparc/doc/en-EN/hbziparc.txt b/harbour/contrib/hbziparc/doc/en/hbziparc.txt
similarity index 100%
rename from harbour/contrib/hbziparc/doc/en-EN/hbziparc.txt
rename to harbour/contrib/hbziparc/doc/en/hbziparc.txt
diff --git a/harbour/contrib/rddads/doc/en-EN/adsfuncs.txt b/harbour/contrib/rddads/doc/en/adsfuncs.txt
similarity index 100%
rename from harbour/contrib/rddads/doc/en-EN/adsfuncs.txt
rename to harbour/contrib/rddads/doc/en/adsfuncs.txt
diff --git a/harbour/contrib/rddads/doc/en-EN/readme.txt b/harbour/contrib/rddads/doc/en/readme.txt
similarity index 100%
rename from harbour/contrib/rddads/doc/en-EN/readme.txt
rename to harbour/contrib/rddads/doc/en/readme.txt
diff --git a/harbour/doc/en-EN/1stread.txt b/harbour/doc/en/1stread.txt
similarity index 100%
rename from harbour/doc/en-EN/1stread.txt
rename to harbour/doc/en/1stread.txt
diff --git a/harbour/doc/en-EN/Makefile b/harbour/doc/en/Makefile
similarity index 100%
rename from harbour/doc/en-EN/Makefile
rename to harbour/doc/en/Makefile
diff --git a/harbour/doc/en-EN/array.txt b/harbour/doc/en/array.txt
similarity index 100%
rename from harbour/doc/en-EN/array.txt
rename to harbour/doc/en/array.txt
diff --git a/harbour/doc/en-EN/binnum.txt b/harbour/doc/en/binnum.txt
similarity index 100%
rename from harbour/doc/en-EN/binnum.txt
rename to harbour/doc/en/binnum.txt
diff --git a/harbour/doc/en-EN/browse.txt b/harbour/doc/en/browse.txt
similarity index 100%
rename from harbour/doc/en-EN/browse.txt
rename to harbour/doc/en/browse.txt
diff --git a/harbour/doc/en-EN/clipper.txt b/harbour/doc/en/clipper.txt
similarity index 100%
rename from harbour/doc/en-EN/clipper.txt
rename to harbour/doc/en/clipper.txt
diff --git a/harbour/doc/en-EN/cmdline.txt b/harbour/doc/en/cmdline.txt
similarity index 100%
rename from harbour/doc/en-EN/cmdline.txt
rename to harbour/doc/en/cmdline.txt
diff --git a/harbour/doc/en-EN/command.txt b/harbour/doc/en/command.txt
similarity index 100%
rename from harbour/doc/en-EN/command.txt
rename to harbour/doc/en/command.txt
diff --git a/harbour/doc/en-EN/compiler.txt b/harbour/doc/en/compiler.txt
similarity index 100%
rename from harbour/doc/en-EN/compiler.txt
rename to harbour/doc/en/compiler.txt
diff --git a/harbour/doc/en-EN/datetime.txt b/harbour/doc/en/datetime.txt
similarity index 100%
rename from harbour/doc/en-EN/datetime.txt
rename to harbour/doc/en/datetime.txt
diff --git a/harbour/doc/en-EN/dbdelim.txt b/harbour/doc/en/dbdelim.txt
similarity index 100%
rename from harbour/doc/en-EN/dbdelim.txt
rename to harbour/doc/en/dbdelim.txt
diff --git a/harbour/doc/en-EN/dbsdf.txt b/harbour/doc/en/dbsdf.txt
similarity index 100%
rename from harbour/doc/en-EN/dbsdf.txt
rename to harbour/doc/en/dbsdf.txt
diff --git a/harbour/doc/en-EN/dbstrux.txt b/harbour/doc/en/dbstrux.txt
similarity index 100%
rename from harbour/doc/en-EN/dbstrux.txt
rename to harbour/doc/en/dbstrux.txt
diff --git a/harbour/doc/en-EN/dir.txt b/harbour/doc/en/dir.txt
similarity index 100%
rename from harbour/doc/en-EN/dir.txt
rename to harbour/doc/en/dir.txt
diff --git a/harbour/doc/en-EN/diskspac.txt b/harbour/doc/en/diskspac.txt
similarity index 100%
rename from harbour/doc/en-EN/diskspac.txt
rename to harbour/doc/en/diskspac.txt
diff --git a/harbour/doc/en-EN/errsys.txt b/harbour/doc/en/errsys.txt
similarity index 100%
rename from harbour/doc/en-EN/errsys.txt
rename to harbour/doc/en/errsys.txt
diff --git a/harbour/doc/en-EN/eval.txt b/harbour/doc/en/eval.txt
similarity index 100%
rename from harbour/doc/en-EN/eval.txt
rename to harbour/doc/en/eval.txt
diff --git a/harbour/doc/en-EN/file.txt b/harbour/doc/en/file.txt
similarity index 100%
rename from harbour/doc/en-EN/file.txt
rename to harbour/doc/en/file.txt
diff --git a/harbour/doc/en-EN/garbage.txt b/harbour/doc/en/garbage.txt
similarity index 100%
rename from harbour/doc/en-EN/garbage.txt
rename to harbour/doc/en/garbage.txt
diff --git a/harbour/doc/en-EN/gnulice.txt b/harbour/doc/en/gnulice.txt
similarity index 100%
rename from harbour/doc/en-EN/gnulice.txt
rename to harbour/doc/en/gnulice.txt
diff --git a/harbour/doc/en-EN/gtslang.txt b/harbour/doc/en/gtslang.txt
similarity index 100%
rename from harbour/doc/en-EN/gtslang.txt
rename to harbour/doc/en/gtslang.txt
diff --git a/harbour/doc/en-EN/harbext.txt b/harbour/doc/en/harbext.txt
similarity index 100%
rename from harbour/doc/en-EN/harbext.txt
rename to harbour/doc/en/harbext.txt
diff --git a/harbour/doc/en-EN/hashes.txt b/harbour/doc/en/hashes.txt
similarity index 100%
rename from harbour/doc/en-EN/hashes.txt
rename to harbour/doc/en/hashes.txt
diff --git a/harbour/doc/en-EN/hb_api.txt b/harbour/doc/en/hb_api.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_api.txt
rename to harbour/doc/en/hb_api.txt
diff --git a/harbour/doc/en-EN/hb_apier.txt b/harbour/doc/en/hb_apier.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_apier.txt
rename to harbour/doc/en/hb_apier.txt
diff --git a/harbour/doc/en-EN/hb_apifs.txt b/harbour/doc/en/hb_apifs.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_apifs.txt
rename to harbour/doc/en/hb_apifs.txt
diff --git a/harbour/doc/en-EN/hb_apigt.txt b/harbour/doc/en/hb_apigt.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_apigt.txt
rename to harbour/doc/en/hb_apigt.txt
diff --git a/harbour/doc/en-EN/hb_apiit.txt b/harbour/doc/en/hb_apiit.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_apiit.txt
rename to harbour/doc/en/hb_apiit.txt
diff --git a/harbour/doc/en-EN/hb_apiln.txt b/harbour/doc/en/hb_apiln.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_apiln.txt
rename to harbour/doc/en/hb_apiln.txt
diff --git a/harbour/doc/en-EN/hb_apird.txt b/harbour/doc/en/hb_apird.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_apird.txt
rename to harbour/doc/en/hb_apird.txt
diff --git a/harbour/doc/en-EN/hb_compa.txt b/harbour/doc/en/hb_compa.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_compa.txt
rename to harbour/doc/en/hb_compa.txt
diff --git a/harbour/doc/en-EN/hb_date.txt b/harbour/doc/en/hb_date.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_date.txt
rename to harbour/doc/en/hb_date.txt
diff --git a/harbour/doc/en-EN/hb_macro.txt b/harbour/doc/en/hb_macro.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_macro.txt
rename to harbour/doc/en/hb_macro.txt
diff --git a/harbour/doc/en-EN/hb_set.txt b/harbour/doc/en/hb_set.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_set.txt
rename to harbour/doc/en/hb_set.txt
diff --git a/harbour/doc/en-EN/hb_vm.txt b/harbour/doc/en/hb_vm.txt
similarity index 100%
rename from harbour/doc/en-EN/hb_vm.txt
rename to harbour/doc/en/hb_vm.txt
diff --git a/harbour/doc/en-EN/hbinet.txt b/harbour/doc/en/hbinet.txt
similarity index 100%
rename from harbour/doc/en-EN/hbinet.txt
rename to harbour/doc/en/hbinet.txt
diff --git a/harbour/doc/en-EN/hvm.txt b/harbour/doc/en/hvm.txt
similarity index 100%
rename from harbour/doc/en-EN/hvm.txt
rename to harbour/doc/en/hvm.txt
diff --git a/harbour/doc/en-EN/idle.txt b/harbour/doc/en/idle.txt
similarity index 100%
rename from harbour/doc/en-EN/idle.txt
rename to harbour/doc/en/idle.txt
diff --git a/harbour/doc/en-EN/input.txt b/harbour/doc/en/input.txt
similarity index 100%
rename from harbour/doc/en-EN/input.txt
rename to harbour/doc/en/input.txt
diff --git a/harbour/doc/en-EN/lang.txt b/harbour/doc/en/lang.txt
similarity index 100%
rename from harbour/doc/en-EN/lang.txt
rename to harbour/doc/en/lang.txt
diff --git a/harbour/doc/en-EN/license.txt b/harbour/doc/en/license.txt
similarity index 100%
rename from harbour/doc/en-EN/license.txt
rename to harbour/doc/en/license.txt
diff --git a/harbour/doc/en-EN/macro.txt b/harbour/doc/en/macro.txt
similarity index 100%
rename from harbour/doc/en-EN/macro.txt
rename to harbour/doc/en/macro.txt
diff --git a/harbour/doc/en-EN/math.txt b/harbour/doc/en/math.txt
similarity index 100%
rename from harbour/doc/en-EN/math.txt
rename to harbour/doc/en/math.txt
diff --git a/harbour/doc/en-EN/memo.txt b/harbour/doc/en/memo.txt
similarity index 100%
rename from harbour/doc/en-EN/memo.txt
rename to harbour/doc/en/memo.txt
diff --git a/harbour/doc/en-EN/memvar2.txt b/harbour/doc/en/memvar2.txt
similarity index 100%
rename from harbour/doc/en-EN/memvar2.txt
rename to harbour/doc/en/memvar2.txt
diff --git a/harbour/doc/en-EN/menu.txt b/harbour/doc/en/menu.txt
similarity index 100%
rename from harbour/doc/en-EN/menu.txt
rename to harbour/doc/en/menu.txt
diff --git a/harbour/doc/en-EN/misc.txt b/harbour/doc/en/misc.txt
similarity index 100%
rename from harbour/doc/en-EN/misc.txt
rename to harbour/doc/en/misc.txt
diff --git a/harbour/doc/en-EN/nation.txt b/harbour/doc/en/nation.txt
similarity index 100%
rename from harbour/doc/en-EN/nation.txt
rename to harbour/doc/en/nation.txt
diff --git a/harbour/doc/en-EN/objfunc.txt b/harbour/doc/en/objfunc.txt
similarity index 100%
rename from harbour/doc/en-EN/objfunc.txt
rename to harbour/doc/en/objfunc.txt
diff --git a/harbour/doc/en-EN/rdd.txt b/harbour/doc/en/rdd.txt
similarity index 100%
rename from harbour/doc/en-EN/rdd.txt
rename to harbour/doc/en/rdd.txt
diff --git a/harbour/doc/en-EN/rdddb.txt b/harbour/doc/en/rdddb.txt
similarity index 100%
rename from harbour/doc/en-EN/rdddb.txt
rename to harbour/doc/en/rdddb.txt
diff --git a/harbour/doc/en-EN/rddmisc.txt b/harbour/doc/en/rddmisc.txt
similarity index 100%
rename from harbour/doc/en-EN/rddmisc.txt
rename to harbour/doc/en/rddmisc.txt
diff --git a/harbour/doc/en-EN/rddord.txt b/harbour/doc/en/rddord.txt
similarity index 100%
rename from harbour/doc/en-EN/rddord.txt
rename to harbour/doc/en/rddord.txt
diff --git a/harbour/doc/en-EN/readme.txt b/harbour/doc/en/readme.txt
similarity index 100%
rename from harbour/doc/en-EN/readme.txt
rename to harbour/doc/en/readme.txt
diff --git a/harbour/doc/en-EN/sayget.txt b/harbour/doc/en/sayget.txt
similarity index 100%
rename from harbour/doc/en-EN/sayget.txt
rename to harbour/doc/en/sayget.txt
diff --git a/harbour/doc/en-EN/set.txt b/harbour/doc/en/set.txt
similarity index 100%
rename from harbour/doc/en-EN/set.txt
rename to harbour/doc/en/set.txt
diff --git a/harbour/doc/en-EN/setmode.txt b/harbour/doc/en/setmode.txt
similarity index 100%
rename from harbour/doc/en-EN/setmode.txt
rename to harbour/doc/en/setmode.txt
diff --git a/harbour/doc/en-EN/string.txt b/harbour/doc/en/string.txt
similarity index 100%
rename from harbour/doc/en-EN/string.txt
rename to harbour/doc/en/string.txt
diff --git a/harbour/doc/en-EN/strotype.txt b/harbour/doc/en/strotype.txt
similarity index 100%
rename from harbour/doc/en-EN/strotype.txt
rename to harbour/doc/en/strotype.txt
diff --git a/harbour/doc/en-EN/subcodes.txt b/harbour/doc/en/subcodes.txt
similarity index 100%
rename from harbour/doc/en-EN/subcodes.txt
rename to harbour/doc/en/subcodes.txt
diff --git a/harbour/doc/en-EN/tbrowse.txt b/harbour/doc/en/tbrowse.txt
similarity index 100%
rename from harbour/doc/en-EN/tbrowse.txt
rename to harbour/doc/en/tbrowse.txt
diff --git a/harbour/doc/en-EN/tclass.txt b/harbour/doc/en/tclass.txt
similarity index 100%
rename from harbour/doc/en-EN/tclass.txt
rename to harbour/doc/en/tclass.txt
diff --git a/harbour/doc/en-EN/terminal.txt b/harbour/doc/en/terminal.txt
similarity index 100%
rename from harbour/doc/en-EN/terminal.txt
rename to harbour/doc/en/terminal.txt
diff --git a/harbour/doc/en-EN/tgetlist.txt b/harbour/doc/en/tgetlist.txt
similarity index 100%
rename from harbour/doc/en-EN/tgetlist.txt
rename to harbour/doc/en/tgetlist.txt
diff --git a/harbour/doc/en-EN/tlabel.txt b/harbour/doc/en/tlabel.txt
similarity index 100%
rename from harbour/doc/en-EN/tlabel.txt
rename to harbour/doc/en/tlabel.txt
diff --git a/harbour/doc/en-EN/treport.txt b/harbour/doc/en/treport.txt
similarity index 100%
rename from harbour/doc/en-EN/treport.txt
rename to harbour/doc/en/treport.txt
diff --git a/harbour/doc/en-EN/var.txt b/harbour/doc/en/var.txt
similarity index 100%
rename from harbour/doc/en-EN/var.txt
rename to harbour/doc/en/var.txt
diff --git a/harbour/examples/hbdoc/examples/core_en/genhtm.lnk b/harbour/examples/hbdoc/examples/en/genhtm.lnk
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_en/genhtm.lnk
rename to harbour/examples/hbdoc/examples/en/genhtm.lnk
diff --git a/harbour/examples/hbdoc/examples/core_en/genhtm.rsp b/harbour/examples/hbdoc/examples/en/genhtm.rsp
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_en/genhtm.rsp
rename to harbour/examples/hbdoc/examples/en/genhtm.rsp
diff --git a/harbour/examples/hbdoc/examples/core_en/readme.txt b/harbour/examples/hbdoc/examples/en/readme.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_en/readme.txt
rename to harbour/examples/hbdoc/examples/en/readme.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/array.txt b/harbour/examples/hbdoc/examples/es/array.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/array.txt
rename to harbour/examples/hbdoc/examples/es/array.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/binnum.txt b/harbour/examples/hbdoc/examples/es/binnum.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/binnum.txt
rename to harbour/examples/hbdoc/examples/es/binnum.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/browse.txt b/harbour/examples/hbdoc/examples/es/browse.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/browse.txt
rename to harbour/examples/hbdoc/examples/es/browse.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/clipper.txt b/harbour/examples/hbdoc/examples/es/clipper.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/clipper.txt
rename to harbour/examples/hbdoc/examples/es/clipper.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/cmdline.txt b/harbour/examples/hbdoc/examples/es/cmdline.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/cmdline.txt
rename to harbour/examples/hbdoc/examples/es/cmdline.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/codebloc.txt b/harbour/examples/hbdoc/examples/es/codebloc.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/codebloc.txt
rename to harbour/examples/hbdoc/examples/es/codebloc.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/codestyl.txt b/harbour/examples/hbdoc/examples/es/codestyl.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/codestyl.txt
rename to harbour/examples/hbdoc/examples/es/codestyl.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/command.txt b/harbour/examples/hbdoc/examples/es/command.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/command.txt
rename to harbour/examples/hbdoc/examples/es/command.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/compiler.txt b/harbour/examples/hbdoc/examples/es/compiler.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/compiler.txt
rename to harbour/examples/hbdoc/examples/es/compiler.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/datetime.txt b/harbour/examples/hbdoc/examples/es/datetime.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/datetime.txt
rename to harbour/examples/hbdoc/examples/es/datetime.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/dbdelim.txt b/harbour/examples/hbdoc/examples/es/dbdelim.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/dbdelim.txt
rename to harbour/examples/hbdoc/examples/es/dbdelim.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/dbsdf.txt b/harbour/examples/hbdoc/examples/es/dbsdf.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/dbsdf.txt
rename to harbour/examples/hbdoc/examples/es/dbsdf.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/dbstrux.txt b/harbour/examples/hbdoc/examples/es/dbstrux.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/dbstrux.txt
rename to harbour/examples/hbdoc/examples/es/dbstrux.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/dir.txt b/harbour/examples/hbdoc/examples/es/dir.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/dir.txt
rename to harbour/examples/hbdoc/examples/es/dir.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/dirstruc.txt b/harbour/examples/hbdoc/examples/es/dirstruc.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/dirstruc.txt
rename to harbour/examples/hbdoc/examples/es/dirstruc.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/diskspac.txt b/harbour/examples/hbdoc/examples/es/diskspac.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/diskspac.txt
rename to harbour/examples/hbdoc/examples/es/diskspac.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/errsys.txt b/harbour/examples/hbdoc/examples/es/errsys.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/errsys.txt
rename to harbour/examples/hbdoc/examples/es/errsys.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/eval.txt b/harbour/examples/hbdoc/examples/es/eval.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/eval.txt
rename to harbour/examples/hbdoc/examples/es/eval.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/file.txt b/harbour/examples/hbdoc/examples/es/file.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/file.txt
rename to harbour/examples/hbdoc/examples/es/file.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/garbage.txt b/harbour/examples/hbdoc/examples/es/garbage.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/garbage.txt
rename to harbour/examples/hbdoc/examples/es/garbage.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/gnulice.txt b/harbour/examples/hbdoc/examples/es/gnulice.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/gnulice.txt
rename to harbour/examples/hbdoc/examples/es/gnulice.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/harbext.txt b/harbour/examples/hbdoc/examples/es/harbext.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/harbext.txt
rename to harbour/examples/hbdoc/examples/es/harbext.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/hb_apiln.txt b/harbour/examples/hbdoc/examples/es/hb_apiln.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/hb_apiln.txt
rename to harbour/examples/hbdoc/examples/es/hb_apiln.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/hb_set.txt b/harbour/examples/hbdoc/examples/es/hb_set.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/hb_set.txt
rename to harbour/examples/hbdoc/examples/es/hb_set.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/hb_vm.txt b/harbour/examples/hbdoc/examples/es/hb_vm.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/hb_vm.txt
rename to harbour/examples/hbdoc/examples/es/hb_vm.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/howtobsd.txt b/harbour/examples/hbdoc/examples/es/howtobsd.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/howtobsd.txt
rename to harbour/examples/hbdoc/examples/es/howtobsd.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/hvm.txt b/harbour/examples/hbdoc/examples/es/hvm.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/hvm.txt
rename to harbour/examples/hbdoc/examples/es/hvm.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/idle.txt b/harbour/examples/hbdoc/examples/es/idle.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/idle.txt
rename to harbour/examples/hbdoc/examples/es/idle.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/input.txt b/harbour/examples/hbdoc/examples/es/input.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/input.txt
rename to harbour/examples/hbdoc/examples/es/input.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/lang.txt b/harbour/examples/hbdoc/examples/es/lang.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/lang.txt
rename to harbour/examples/hbdoc/examples/es/lang.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/license.txt b/harbour/examples/hbdoc/examples/es/license.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/license.txt
rename to harbour/examples/hbdoc/examples/es/license.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/macro.txt b/harbour/examples/hbdoc/examples/es/macro.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/macro.txt
rename to harbour/examples/hbdoc/examples/es/macro.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/math.txt b/harbour/examples/hbdoc/examples/es/math.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/math.txt
rename to harbour/examples/hbdoc/examples/es/math.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/memo.txt b/harbour/examples/hbdoc/examples/es/memo.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/memo.txt
rename to harbour/examples/hbdoc/examples/es/memo.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/memvar2.txt b/harbour/examples/hbdoc/examples/es/memvar2.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/memvar2.txt
rename to harbour/examples/hbdoc/examples/es/memvar2.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/misc.txt b/harbour/examples/hbdoc/examples/es/misc.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/misc.txt
rename to harbour/examples/hbdoc/examples/es/misc.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/nation.txt b/harbour/examples/hbdoc/examples/es/nation.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/nation.txt
rename to harbour/examples/hbdoc/examples/es/nation.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/objfunc.txt b/harbour/examples/hbdoc/examples/es/objfunc.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/objfunc.txt
rename to harbour/examples/hbdoc/examples/es/objfunc.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/pcode.txt b/harbour/examples/hbdoc/examples/es/pcode.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/pcode.txt
rename to harbour/examples/hbdoc/examples/es/pcode.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/pragma.txt b/harbour/examples/hbdoc/examples/es/pragma.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/pragma.txt
rename to harbour/examples/hbdoc/examples/es/pragma.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/rdd.txt b/harbour/examples/hbdoc/examples/es/rdd.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/rdd.txt
rename to harbour/examples/hbdoc/examples/es/rdd.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/readme.txt b/harbour/examples/hbdoc/examples/es/readme.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/readme.txt
rename to harbour/examples/hbdoc/examples/es/readme.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/sayget.txt b/harbour/examples/hbdoc/examples/es/sayget.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/sayget.txt
rename to harbour/examples/hbdoc/examples/es/sayget.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/setmode.txt b/harbour/examples/hbdoc/examples/es/setmode.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/setmode.txt
rename to harbour/examples/hbdoc/examples/es/setmode.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/statics.txt b/harbour/examples/hbdoc/examples/es/statics.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/statics.txt
rename to harbour/examples/hbdoc/examples/es/statics.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/strotype.txt b/harbour/examples/hbdoc/examples/es/strotype.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/strotype.txt
rename to harbour/examples/hbdoc/examples/es/strotype.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/subcodes.txt b/harbour/examples/hbdoc/examples/es/subcodes.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/subcodes.txt
rename to harbour/examples/hbdoc/examples/es/subcodes.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/tbrowse.txt b/harbour/examples/hbdoc/examples/es/tbrowse.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/tbrowse.txt
rename to harbour/examples/hbdoc/examples/es/tbrowse.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/tclass.txt b/harbour/examples/hbdoc/examples/es/tclass.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/tclass.txt
rename to harbour/examples/hbdoc/examples/es/tclass.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/tgetlist.txt b/harbour/examples/hbdoc/examples/es/tgetlist.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/tgetlist.txt
rename to harbour/examples/hbdoc/examples/es/tgetlist.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/tlabel.txt b/harbour/examples/hbdoc/examples/es/tlabel.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/tlabel.txt
rename to harbour/examples/hbdoc/examples/es/tlabel.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/tracing.txt b/harbour/examples/hbdoc/examples/es/tracing.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/tracing.txt
rename to harbour/examples/hbdoc/examples/es/tracing.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/treport.txt b/harbour/examples/hbdoc/examples/es/treport.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/treport.txt
rename to harbour/examples/hbdoc/examples/es/treport.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/var.txt b/harbour/examples/hbdoc/examples/es/var.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/var.txt
rename to harbour/examples/hbdoc/examples/es/var.txt
diff --git a/harbour/examples/hbdoc/examples/core_es/vm.txt b/harbour/examples/hbdoc/examples/es/vm.txt
similarity index 100%
rename from harbour/examples/hbdoc/examples/core_es/vm.txt
rename to harbour/examples/hbdoc/examples/es/vm.txt
diff --git a/harbour/examples/hbdoc/examples/hbmisc/hbmisc.lnk b/harbour/examples/hbdoc/examples/hbmisc/hbmisc.lnk
deleted file mode 100644
index d3a662623c..0000000000
--- a/harbour/examples/hbdoc/examples/hbmisc/hbmisc.lnk
+++ /dev/null
@@ -1,6 +0,0 @@
-!name: Harbour tools help- GT lib
-!credits: The Harbour Project
- Luiz Rafael Culik
-!menu: Functions
-Functions overview.ngo
-
diff --git a/harbour/examples/hbdoc/examples/hbmisc/hbmisc.rsp b/harbour/examples/hbdoc/examples/hbmisc/hbmisc.rsp
deleted file mode 100644
index 0c288fa8f5..0000000000
--- a/harbour/examples/hbdoc/examples/hbmisc/hbmisc.rsp
+++ /dev/null
@@ -1,7 +0,0 @@
-en\ht_class.txt
-en\ht_conv.txt
-en\ht_dbf.txt
-en\ht_doc.txt
-en\ht_file.txt
-en\ht_str.txt
-en\dates2.txt
diff --git a/harbour/examples/hbdoc/examples/hbmisc/readme.txt b/harbour/examples/hbdoc/examples/hbmisc/readme.txt
deleted file mode 100644
index a3d7f64fe3..0000000000
--- a/harbour/examples/hbdoc/examples/hbmisc/readme.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * $Id$
- */
-
-Converted from an MS-DOS batch file for reference.
-(the script and hbdoc has various problems, and it doesn't
-currently work)
-
-@echo off
-rem
-rem $Id$
-rem
-
-if "%1" =="/OS2" goto OS2
-if "%1" =="/os2" goto OS2
-if "%1" =="/NGI" goto NG
-if "%1" =="/ngi" goto NG
-if "%1" =="/RTF" goto RTF
-if "%1" =="/rtf" goto RTF
-if "%1" =="/HTM" goto HTM
-if "%1" =="/htm" goto HTM
-ECHO Assembling input files
-:help
- echo.
- echo Usage gendoc type
- echo where type is:
- echo /rtf for Winhelp output
- echo /os2 for Os/2 help output
- echo /ngi for Norton Guide output
- echo /htm for HTML output
- goto END
-
-ECHO Assembling input files
-:NG
-hbdoc /ngi hbmisc.lnk hbmisc.rsp
-REM Compile the sources
-Echo Compiling the sources
-Echo Processing Input Files
-Copy ngi\funcam.txt+ngi\funcn_.txt overview.ngi
-Echo Compiling Sources
-ngxc overview.ngi
-Echo Linking the Guide
-ngxl hbmisc.lnk
-del *.ngi
-del *.ngo
-del ngi\*.txt
-del ngi\*.ngi
-del hbmisc.lnk
-ren hbmisc.old hbmisc.lnk
-
-GOTO END
-:OS2
- hbdoc /OS2 hbmisc.lnk hbmisc.rsp
-GOTO END
-:RTF
- hbdoc /RTF hbmisc.lnk hbmisc.rsp
- hcw harbour.hpj
-del hbmisc.lnk
-ren hbmisc.old hbmisc.lnk
-
-GOTO END
-:HTM
- hbdoc /HTM hbmisc.lnk hbmisc.rsp
- GOTO END
-:END
-del ass*.bat
diff --git a/harbour/examples/hbdoc2/hbdoc2.prg b/harbour/examples/hbdoc2/hbdoc2.prg
index 34210cf91d..9899d46576 100644
--- a/harbour/examples/hbdoc2/hbdoc2.prg
+++ b/harbour/examples/hbdoc2/hbdoc2.prg
@@ -79,19 +79,19 @@ todo - treat '' / as an non-conformance condition
todo - look for embedded 'fixed'
these files have
- *..\..\doc\en-en\cmdline.txt txt\lineutility.txt
- ..\..\doc\en-en\dbstrux.txt txt\dbstrux.txt
- *..\..\doc\en-en\file.txt txt\file.txt
- ..\..\doc\en-en\input.txt txt\input.txt
- ..\..\doc\en-en\lang.txt txt\lang.txt
- ..\..\doc\en-en\menu.txt txt\menu.txt
- ..\..\doc\en-en\objfunc.txt txt\objfunc.txt
- ..\..\doc\en-en\rdddb.txt txt\rdddb.txt
- ..\..\doc\en-en\sayget.txt txt\sayget.txt
- ..\..\doc\en-en\set.txt txt\set.txt
- ..\..\doc\en-en\setmode.txt txt\setmode.txt
- ..\..\doc\en-en\string.txt txt\string.txt
- ..\..\doc\en-en\var.txt txt\var.txt
+ *..\..\doc\en\cmdline.txt txt\lineutility.txt
+ ..\..\doc\en\dbstrux.txt txt\dbstrux.txt
+ *..\..\doc\en\file.txt txt\file.txt
+ ..\..\doc\en\input.txt txt\input.txt
+ ..\..\doc\en\lang.txt txt\lang.txt
+ ..\..\doc\en\menu.txt txt\menu.txt
+ ..\..\doc\en\objfunc.txt txt\objfunc.txt
+ ..\..\doc\en\rdddb.txt txt\rdddb.txt
+ ..\..\doc\en\sayget.txt txt\sayget.txt
+ ..\..\doc\en\set.txt txt\set.txt
+ ..\..\doc\en\setmode.txt txt\setmode.txt
+ ..\..\doc\en\string.txt txt\string.txt
+ ..\..\doc\en\var.txt txt\var.txt
done - recognize and accept ; see macro.txt output esp. hb_setmacro
done - list 'compliance' and 'platforms' within help
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index d94d727538..d3502a43e2 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -699,8 +699,8 @@ msgstr "Ford
#: hbmk2.prg:7941
#, c-format
-msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\\n-lng=en-EN,hu-HU,de"
-msgstr "nyelvek listája, amelyek a .pot/.po és .hbl/.po állományokban levő %1$s makrókba kerülnek behelyettesítésre. Vesszővel elválasztott lista:\\n-lng=en-EN,hu-HU,de"
+msgid "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\\n-lng=en,hu-HU,de"
+msgstr "nyelvek listája, amelyek a .pot/.po és .hbl/.po állományokban levő %1$s makrókba kerülnek behelyettesítésre. Vesszővel elválasztott lista:\\n-lng=en,hu-HU,de"
#: hbmk2.prg:7959
#, c-format
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index e0026c207b..7ca78ce1fb 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -8241,7 +8241,7 @@ STATIC PROCEDURE GetUILangCDP( /* @ */ cLNG, /* @ */ cCDP )
IF Empty( cLNG := GetEnv( "HB_LANG" ) )
IF Empty( cLNG := hb_UserLang() )
- cLNG := "en-EN"
+ cLNG := "en"
ENDIF
ENDIF
@@ -8253,7 +8253,7 @@ STATIC PROCEDURE GetUILangCDP( /* @ */ cLNG, /* @ */ cCDP )
STATIC PROCEDURE SetUILang( hbmk )
LOCAL tmp
- IF hbmk[ _HBMK_cUILNG ] == "en-EN"
+ IF hbmk[ _HBMK_cUILNG ] == "en"
hb_i18n_set( NIL )
ELSE
tmp := "${hb_root}hbmk2.${hb_lng}.hbl"
@@ -8282,7 +8282,8 @@ STATIC PROCEDURE ShowHeader( hbmk )
"Copyright (c) 1999-2010, Viktor Szakats" + _OUT_EOL +;
"http://www.harbour-project.org/" + _OUT_EOL )
- IF !( hbmk[ _HBMK_cUILNG ] == "en-EN" ) .AND. ;
+ IF !( hbmk[ _HBMK_cUILNG ] == "en" ) .AND. ;
+ !( hbmk[ _HBMK_cUILNG ] == "en-GB" ) .AND. ;
!( hbmk[ _HBMK_cUILNG ] == "en-US" )
OutStd( hb_StrFormat( I_( "Translation (%1$s): (add your name here)" ), hbmk[ _HBMK_cUILNG ] ) + _OUT_EOL )
ENDIF
@@ -8384,7 +8385,7 @@ STATIC PROCEDURE ShowHelp( lLong )
{ "-workdir=" , hb_StrFormat( I_( "working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)" ), _WORKDIR_BASE_ ) },;
NIL,;
{ "-hbl[=