diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5b422e6625..55737854ab 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,28 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-04 00:06 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/lang2po.hb
+    + more translation comments
+    + added source comments for core-lang translation source.
+      (only the order of lang_id values is signficant, the
+      actual values aren't)
+    + minor code reabability
+
+  * utils/hbmk2/hbmk2.hbp
+    + enabled Galician translation
+
+  * config/lang.hb
+  * contrib/hbrun/doc/hbrun.fr_FR.md -> contrib/hbrun/doc/hbrun.fr.md
+  * utils/hbmk2/doc/hbmk2.fr_FR.md -> utils/hbmk2/doc/hbmk2.fr.md
+  * utils/hbmk2/po/hbmk2.fr_FR.po -> utils/hbmk2/po/hbmk2.fr.po
+  * utils/hbmk2/hbmk2.hbp
+    * fr_FR -> fr (to be in sync with lang modules and until there is
+      no demand for fr_CA)
+
+  * contrib/make.hb
+    * whitespace
+
 2013-04-03 16:09 UTC+0200 Viktor Szakats (harbour syenar.net)
   * config/lang2po.hb
     + further clarifications to some translations
diff --git a/config/lang.hb b/config/lang.hb
index 64eaa32e5a..c1ffddeb3e 100644
--- a/config/lang.hb
+++ b/config/lang.hb
@@ -41,7 +41,6 @@ STATIC sc_hLangMapping := { ;
    "zh_CN.GB2312" => "zh_sim", ;
    "sr"           => "sr_cyr", ;
    "sr@latin"     => "sr_lat", ;
-   "fr_FR"        => "fr", ;  /* TODO: Synchronize Harbour with Transifex */
    "es_ES"        => "es" }   /* TODO: Synchronize Harbour with Transifex */
 
 PROCEDURE Main( cCommand, cMain, ... )
diff --git a/config/lang2po.hb b/config/lang2po.hb
index 3e9a9eda35..48569040a3 100644
--- a/config/lang2po.hb
+++ b/config/lang2po.hb
@@ -36,26 +36,27 @@ STATIC FUNCTION LangToPO( cLang )
          cPO += Item( ;
             hb_langMessage( tmp, "en" ), ;
             iif( hb_langMessage( tmp, "en" ) == hb_langMessage( tmp, cLang ) .AND. ;
-               ! NonTranslatable( hb_langMessage( tmp, "en" ) ) .AND. ;
-               nPos != 28 .AND. Len( hb_langMessage( tmp, "en" ) ) > 1, "", hb_langMessage( tmp, cLang ) ), ;
+               Translatable( hb_langMessage( tmp, "en" ) ) .AND. ;
+               nPos != 28 .AND. ;  /* Copy "Ins" translation even if the same as original */
+               Len( hb_langMessage( tmp, "en" ) ) > 1, "", hb_langMessage( tmp, cLang ) ), ;
             nPos++ )
       ENDIF
    NEXT
 
    RETURN hb_StrShrink( cPO, Len( hb_eol() ) )
 
-STATIC FUNCTION NonTranslatable( cString )
+STATIC FUNCTION Translatable( cString )
 
    LOCAL tmp
 
    FOR tmp := 1 TO Len( cString )
       IF IsAlpha( SubStr( cString, tmp, 1 ) ) .OR. ;
          IsDigit( SubStr( cString, tmp, 1 ) )
-         RETURN .F.
+         RETURN .T.
       ENDIF
    NEXT
 
-   RETURN .T.
+   RETURN .F.
 
 #define LEFTEQUAL( l, r )       ( Left( l, Len( r ) ) == r )
 
@@ -128,6 +129,7 @@ STATIC FUNCTION Item( cOri, cTrs, nPos )
 
    RETURN ;
       iif( Empty( cComment ), "", "#  " + cComment + hb_eol() ) + ;
+      "#: lang_id:" + hb_ntos( nPos ) + hb_eol() + ;
       "#, c-format" + hb_eol() + ;
       "msgid " + ItemString( iif( Len( cOri ) == 0 .AND. nPos != 0, "{" + StrZero( nPos, 3, 0 ) + "}", cOri ) ) + ;
       "msgstr " + ItemString( cTrs ) + hb_eol()
@@ -163,7 +165,8 @@ STATIC FUNCTION Comment( nPos )
    CASE 25
    CASE 26
    CASE 27  ; RETURN "Keep the '*' decorations and internal space padding intact."
-   CASE 29  ; RETURN "Abbrev of 'Overwrite' using same length as 'Ins', can be spaces only (fill with 3 spaces if in doubt)."
+   CASE 28  ; RETURN "Abbrev of 'Insert' (as 'insert mode' in editing)."
+   CASE 29  ; RETURN "Abbrev of 'Overwrite' using same length as 'Ins', can be spaces only (fill with 3 spaces if in doubt, or match the length of translation of 'Ins')."
    CASE 31  ; RETURN "Must have one space padding on the right (after ':' character)."
    CASE 32  ; RETURN "One space padding on each side."
    CASE 102 ; RETURN "Local date format, where YYYY=year, MM=month, DD=day. DO NOT TRANSLATE 'YYYY', 'MM' or 'DD', only reorder and set delimiter per country standards."
diff --git a/contrib/hbrun/doc/hbrun.fr_FR.md b/contrib/hbrun/doc/hbrun.fr.md
similarity index 100%
rename from contrib/hbrun/doc/hbrun.fr_FR.md
rename to contrib/hbrun/doc/hbrun.fr.md
diff --git a/contrib/make.hb b/contrib/make.hb
index 483d136b00..cd5cbaf0ea 100755
--- a/contrib/make.hb
+++ b/contrib/make.hb
@@ -1,5 +1,4 @@
 #!/usr/bin/hbrun --hb:gtcgi
-
 /*
  * Harbour Project source code:
  * Package build orchestrator script
diff --git a/utils/hbmk2/doc/hbmk2.fr_FR.md b/utils/hbmk2/doc/hbmk2.fr.md
similarity index 100%
rename from utils/hbmk2/doc/hbmk2.fr_FR.md
rename to utils/hbmk2/doc/hbmk2.fr.md
diff --git a/utils/hbmk2/hbmk2.hbp b/utils/hbmk2/hbmk2.hbp
index 67e7585dfa..205d1c2b91 100644
--- a/utils/hbmk2/hbmk2.hbp
+++ b/utils/hbmk2/hbmk2.hbp
@@ -29,7 +29,7 @@ hbmk2.rc
 # localization
 po/hbmk2.%{hb_lng}.po
 -hbl=hbmk2.%{hb_lng}.hbl
--lng=el,es_419,es_ES,fr_FR,hu,it,pt_BR
+-lng=el,es_419,es_ES,fr,gl,hu,it,pt_BR
 
 # localization (automatization)
 -3rd=_langhb_docext=.md
diff --git a/utils/hbmk2/po/hbmk2.fr_FR.po b/utils/hbmk2/po/hbmk2.fr.po
similarity index 100%
rename from utils/hbmk2/po/hbmk2.fr_FR.po
rename to utils/hbmk2/po/hbmk2.fr.po