From 203523f991d1754a82ebe88ea50ff3bcda48a47f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 15 Feb 2013 01:15:58 +0000
Subject: [PATCH] 2013-02-15 02:11 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.*.po   * utils/hbmk2/hbmk2.prg     ! fixed most hacks
 around embedded newlines in hbmk2's       own output messages. Now they are
 handled natively,       which will fix output that contains "\n" as normal   
    part of the text, f.e. "C:\name\", and makes the       newlines in .po
 files standard.

  * ChangeLog.txt
  * utils/hbmk2/hbmk2.prg
    ! "Markdown" cased correctly

  * src/rtl/strxchg.c
    + SVN props

  * contrib/hbtip/httpcli.prg
    * cleanups
---
 harbour/ChangeLog.txt              | 23 +++++++-
 harbour/contrib/hbtip/httpcli.prg  | 16 +++---
 harbour/utils/hbmk2/hbmk2.es_PE.po | 78 +++++++++++++-------------
 harbour/utils/hbmk2/hbmk2.hu_HU.po | 66 +++++++++++-----------
 harbour/utils/hbmk2/hbmk2.prg      | 90 ++++++++++++++++--------------
 harbour/utils/hbmk2/hbmk2.pt_BR.po | 66 +++++++++++-----------
 6 files changed, 181 insertions(+), 158 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 52183bfaf2..1ccc53a553 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,25 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-02-15 02:11 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.*.po
+  * utils/hbmk2/hbmk2.prg
+    ! fixed most hacks around embedded newlines in hbmk2's
+      own output messages. Now they are handled natively,
+      which will fix output that contains "\n" as normal
+      part of the text, f.e. "C:\name\", and makes the
+      newlines in .po files standard.
+
+  * ChangeLog.txt
+  * utils/hbmk2/hbmk2.prg
+    ! "Markdown" cased correctly
+
+  * src/rtl/strxchg.c
+    + SVN props
+
+  * contrib/hbtip/httpcli.prg
+    * cleanups
+
 2013-02-15 01:53 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/include/harbour.hbx
   * harbour/src/rtl/Makefile
@@ -212,9 +231,9 @@
 
 2013-02-11 21:51 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
-    + ability to output help text in MarkDown format:
+    + ability to output help text in Markdown format:
         hbmk2 --longhelpmd > man.md
-      view it with any MarkDown compatible viewer, or
+      view it with any Markdown compatible viewer, or
       convert to HTML/PDF/MANPAGE/TROFF/etc.
 
 2013-02-11 14:51 UTC+0100 Viktor Szakats (harbour syenar.net)
diff --git a/harbour/contrib/hbtip/httpcli.prg b/harbour/contrib/hbtip/httpcli.prg
index 9c9f1426b9..2d93bc5f94 100644
--- a/harbour/contrib/hbtip/httpcli.prg
+++ b/harbour/contrib/hbtip/httpcli.prg
@@ -84,7 +84,6 @@ CREATE CLASS TIPClientHTTP FROM TIPClient
    METHOD Attach( cName, cFileName, cType )
    METHOD PostMultiPart( xPostData, cQuery )
    METHOD WriteAll( cFile )
-
    METHOD StandardFields()
 
    PROTECTED:
@@ -181,7 +180,7 @@ METHOD PostByVerb( xPostData, cQuery, cVerb ) CLASS TIPClientHTTP
    // End of header
    ::inetSendAll( ::SocketCon, ::cCRLF )
 
-   IF ::inetErrorCode( ::SocketCon  ) ==  0
+   IF ::inetErrorCode( ::SocketCon ) ==  0
       ::inetSendAll( ::SocketCon, cData )
       ::bInitialized := .T.
       RETURN ::ReadHeaders()
@@ -199,14 +198,13 @@ METHOD StandardFields() CLASS TIPClientHTTP
    ::inetSendAll( ::SocketCon, "Connection: close" + ::cCRLF )
 
    // Perform a basic authentication request
-   IF ::cAuthMode == "Basic" .AND. ! ( "Authorization" $ ::hFields )
+   IF ::cAuthMode == "Basic" .AND. !( "Authorization" $ ::hFields )
       oEncoder := TIPEncoderBase64():New()
       oEncoder:bHttpExcept := .T.
       ::inetSendAll( ::SocketCon, "Authorization: Basic " + ;
          oEncoder:Encode(  ::oUrl:cUserID + ":" + ::oUrl:cPassword ) + ::cCRLF )
    ENDIF
 
-
    // send cookies
    cCookies := ::getCookies()
    IF ! Empty( cCookies )
@@ -354,7 +352,6 @@ METHOD Read( nLen ) CLASS TIPClientHTTP
       ::nLength := -1
       // chunked data is followed by a blank line
       /* cLine := */ ::InetRecvLine( ::SocketCon, @nPos, 1024 )
-
    ENDIF
 
    RETURN cData
@@ -393,7 +390,7 @@ METHOD setCookie( cLine ) CLASS TIPClientHTTP
       cDefaultPath := "/"
    ENDIF
    // this function currently ignores expires, secure and other tags that may be in the cookie for now...
-   //   ?"Setting COOKIE:",cLine
+   //   ? "Setting COOKIE:", cLine
    aParam := hb_regexSplit( ";", cLine )
    cName := cValue := ""
    cHost := cDefaultHost
@@ -582,10 +579,11 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS TIPClientHTTP
          // nRead := FRead( nFile, @cBuf, nBuf )
          cBuf := FReadStr( nFile, nBuf )
          nRead := hb_BLen( cBuf )
-/*       IF nRead < nBuf
+#if 0
+         IF nRead < nBuf
             cBuf := PadR( cBuf, nRead )
          ENDIF
-*/
+#endif
          cData += cBuf
       ENDDO
       FClose( nFile )
@@ -607,7 +605,7 @@ METHOD PostMultiPart( xPostData, cQuery ) CLASS TIPClientHTTP
    // End of header
    ::inetSendAll( ::SocketCon, ::cCRLF )
 
-   IF ::inetErrorCode( ::SocketCon  ) ==  0
+   IF ::inetErrorCode( ::SocketCon ) ==  0
       ::inetSendAll( ::SocketCon, cData )
       ::bInitialized := .T.
       RETURN ::ReadHeaders()
diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po
index b50a037854..74080ba7f2 100644
--- a/harbour/utils/hbmk2/hbmk2.es_PE.po
+++ b/harbour/utils/hbmk2/hbmk2.es_PE.po
@@ -48,8 +48,8 @@ msgstr "fuerza modo C++/C"
 
 #: hbmk2.prg:1104 hbmk2.prg:1450 hbmk2.prg:1561
 #, c-format
-msgid "Error: %1$s not set, failed to autodetect.\\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory."
-msgstr "Error: %1$s no definido, fallo autodetección.\\nPor favor, ejecute esta herramienta desde su ubicación original dentro de la carpeta de instalación de Harbour o configure la variable de entorno %1$s hacia el directorio raíz de Harbour."
+msgid "Error: %1$s not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory."
+msgstr "Error: %1$s no definido, fallo autodetección.\nPor favor, ejecute esta herramienta desde su ubicación original dentro de la carpeta de instalación de Harbour o configure la variable de entorno %1$s hacia el directorio raíz de Harbour."
 
 #: hbmk2.prg:953 hbmk2.prg:1268 hbmk2.prg:1341
 #, c-format
@@ -98,8 +98,8 @@ msgstr "Compilador C detectado automáticamente: %1$s"
 
 #: hbmk2.prg:1301 hbmk2.prg:1673 hbmk2.prg:1756
 #, c-format
-msgid "Could not detect any supported C compiler in your PATH.\\nSetup one or set -comp= option to one of these values: %1$s"
-msgstr "No se pudo detectar ningún compilador C en su PATH.\\nPor favor, utilice la opción -comp= para especificar uno de estos valores: %1$s"
+msgid "Could not detect any supported C compiler in your PATH.\nSetup one or set -comp= option to one of these values: %1$s"
+msgstr "No se pudo detectar ningún compilador C en su PATH.\nPor favor, utilice la opción -comp= para especificar uno de estos valores: %1$s"
 
 #: hbmk2.prg:1307 hbmk2.prg:1679 hbmk2.prg:1762
 #, c-format
@@ -113,8 +113,8 @@ msgstr "Usando Harbour: %1$s %2$s %3$s %4$s"
 
 #: hbmk2.prg:1299 hbmk2.prg:1671 hbmk2.prg:1754
 #, c-format
-msgid "Choose a C compiler by using -comp= option.\\nYou have the following choices on your platform: %1$s"
-msgstr "Por favor, elija un compilador C usando la Opción: -comp=.\\ntiene las siguientes opciones en su plataforma: %1$s"
+msgid "Choose a C compiler by using -comp= option.\nYou have the following choices on your platform: %1$s"
+msgstr "Por favor, elija un compilador C usando la Opción: -comp=.\ntiene las siguientes opciones en su plataforma: %1$s"
 
 #: hbmk2.prg:1380 hbmk2.prg:1855 hbmk2.prg:1954
 #, c-format
@@ -303,8 +303,8 @@ msgstr "Enlazando... %1$s"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "set C compiler warning level\\n<lev> can be: max, yes, low, no, def (default: yes)"
-msgstr "Configure nivel de advertencia (warnings) del compilador C\\n<lev> puede ser: max, yes, low, no, def (default: yes)"
+msgid "set C compiler warning level\n<lev> can be: max, yes, low, no, def (default: yes)"
+msgstr "Configure nivel de advertencia (warnings) del compilador C\n<lev> puede ser: max, yes, low, no, def (default: yes)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -453,13 +453,13 @@ msgstr "activa (o desactiva) beep simple en caso de éxito, doble beep en caso d
 
 #: hbmk2.prg:7942
 #, c-format
-msgid "working directory for incremental build mode\\n(default: %1$s/plat/comp)"
-msgstr "directorio de trabajo para el modo de compilación incremental\\n(default: %1$s/plat/comp)"
+msgid "working directory for incremental build mode\n(default: %1$s/plat/comp)"
+msgstr "directorio de trabajo para el modo de compilación incremental\n(default: %1$s/plat/comp)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "compress executable/dynamic lib (needs UPX)\\n<lev> can be: yes, no, min, max"
-msgstr "comprime executable/librería dinamica (necesita UPX)\\n<lev> puede ser: yes, no, min, max"
+msgid "compress executable/dynamic lib (needs UPX)\n<lev> can be: yes, no, min, max"
+msgstr "comprime executable/librería dinamica (necesita UPX)\n<lev> puede ser: yes, no, min, max"
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
@@ -468,18 +468,18 @@ msgstr "Múltiples parámetros son aceptados -l, -L, -i y <script>."
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "Regular Harbour compiler options are also accepted as is.\\n(see them with -harbourhelp option)"
-msgstr "las opciones regulares de compilador Harbour también son aceptadas.\\n(Verlos con la opción -harbourhelp)"
+msgid "Regular Harbour compiler options are also accepted as is.\n(see them with -harbourhelp option)"
+msgstr "las opciones regulares de compilador Harbour también son aceptadas.\n(Verlos con la opción -harbourhelp)"
 
 #: hbmk2.prg:7960 hbmk2.prg:13120
 #, c-format
-msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' character are ignored"
+msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\nLines starting with '#' character are ignored"
 msgstr "Opciones de .hbc (que debe estar en líneas separadas): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\nLas líneas que empiezan con en carácter '#' son ignoradas"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "stop after creating the object files\\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
-msgstr "para después de la creación de los archivos objeto\\ncrear un enlace/copia a %1$s para hbcmp/clipper resultará el mismo efecto"
+msgid "stop after creating the object files\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
+msgstr "para después de la creación de los archivos objeto\ncrear un enlace/copia a %1$s para hbcmp/clipper resultará el mismo efecto"
 
 #: hbmk2.prg:7960
 #, c-format
@@ -488,8 +488,8 @@ msgstr "<script> puede ser: <@script>, <script.hbm> o <script.hbp>: opciones de
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "select C compiler.\\nSpecial value:\\n - bld: use original build settings (default on *nix)"
-msgstr "Seleccione compilador C.\\nValor especial:\\n - bld: use configuración de construcción original (default en *nix)"
+msgid "select C compiler.\nSpecial value:\n - bld: use original build settings (default on *nix)"
+msgstr "Seleccione compilador C.\nValor especial:\n - bld: use configuración de construcción original (default en *nix)"
 
 #: hbmk2.prg:7825 hbmk2.prg:11479 hbmk2.prg:12934
 #, c-format
@@ -523,13 +523,13 @@ msgstr "pone <archivo> como icono del aplicativo. <archivo> debe ser un formato
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "control source header parsing (in incremental build mode)\\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off"
-msgstr "control y análisis de encabezado de código fuente (en el modo de compilación incremental)\\n<m> puede ser: native (compilador utiliza para extraer las dependencias), full (por defecto, usa el analizador de texto simple en el archivo completo), off"
+msgid "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off"
+msgstr "control y análisis de encabezado de código fuente (en el modo de compilación incremental)\n<m> puede ser: native (compilador utiliza para extraer las dependencias), full (por defecto, usa el analizador de texto simple en el archivo completo), off"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, 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,hu-HU,de"
-msgstr "lista de idiomas a ser reemplazados en %1$s macros en archivos .pot/.po y nombres de archivos y salida .hbl/.po. Lista separada por comas:\\n-lng=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 "lista de idiomas a ser reemplazados en %1$s macros en archivos .pot/.po y nombres de archivos y salida .hbl/.po. Lista separada por comas:\n-lng=en,hu-HU,de"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -808,8 +808,8 @@ msgstr "Tiempo de ejecución: %1$ds"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "emulate Clipper compatible linker behavior\\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
-msgstr "emula comportamiento de linkeditor compatible con clipper\\ncrear link o copiar %1$s para rtlink/blinker/exospace resultará el mismo efecto"
+msgid "emulate Clipper compatible linker behavior\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
+msgstr "emula comportamiento de linkeditor compatible con clipper\ncrear link o copiar %1$s para rtlink/blinker/exospace resultará el mismo efecto"
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
@@ -943,8 +943,8 @@ msgstr "no agregue lista adicional de librerías del sistema a lista de librerí
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "Platform filters are accepted in each .hbc line and with several options.\\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
-msgstr "filtros para plataformas son aceptados en cada linea de archivo .hbc y con varias opciones.\\nFormato de filtro: {[!][<plataforma>|<compilador>|<cpu>|<palabra-clave>]}. Filtros pueden ser combinados usando los operadores '&', '|' y agrupados en parénteses. Ej.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
+msgid "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
+msgstr "filtros para plataformas son aceptados en cada linea de archivo .hbc y con varias opciones.\nFormato de filtro: {[!][<plataforma>|<compilador>|<cpu>|<palabra-clave>]}. Filtros pueden ser combinados usando los operadores '&', '|' y agrupados en parénteses. Ej.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
 
 #: hbmk2.prg:7555 hbmk2.prg:7672 hbmk2.prg:7755 hbmk2.prg:11163 hbmk2.prg:11284 hbmk2.prg:11408 hbmk2.prg:12183 hbmk2.prg:12311 hbmk2.prg:12459
 #, c-format
@@ -968,8 +968,8 @@ msgstr "compilación limpia (en modo incremental)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
-msgstr "para después de creación de archivos objeto y aceptar flags de puro C\\ncrear un link o copiar %1$s a hbcc resultará el mismo efecto"
+msgid "stop after creating the object files and accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect"
+msgstr "para después de creación de archivos objeto y aceptar flags de puro C\ncrear un link o copiar %1$s a hbcc resultará el mismo efecto"
 
 #: hbmk2.prg:7808 hbmk2.prg:11462 hbmk2.prg:12913
 #, c-format
@@ -1043,8 +1043,8 @@ msgstr "crear biblioteca de importación (en modo -hbdyn/-hbexe) Nombre de <outp
 
 #: hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "working directory\\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)"
-msgstr "Trabajando en directorio\\n(por defecto: %1$s/plat/comp en modo incremental, de otra manera en directorio temporal del OS)"
+msgid "working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)"
+msgstr "Trabajando en directorio\n(por defecto: %1$s/plat/comp en modo incremental, de otra manera en directorio temporal del OS)"
 
 #: hbmk2.prg:6519 hbmk2.prg:7245
 #, c-format
@@ -1103,8 +1103,8 @@ msgstr "Error: Falla creando biblioteca de importación %1$s desde %2$s."
 
 #: hbmk2.prg:7934 hbmk2.prg:8776
 #, c-format
-msgid "Error: Executing plugin: %1$s at %3$s(%4$d)\\n'%2$s'"
-msgstr "Error: Ejecutando plugin: %1$s en %3$s(%4$d)\\n'%2$s'"
+msgid "Error: Executing plugin: %1$s at %3$s(%4$d)\n'%2$s'"
+msgstr "Error: Ejecutando plugin: %1$s en %3$s(%4$d)\n'%2$s'"
 
 #: hbmk2.prg:11512 hbmk2.prg:12970
 #, c-format
@@ -1308,8 +1308,8 @@ msgstr "Error: Falta dependencia: %1$s"
 
 #: hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "<script> can be:\\n  <@script> or <script.hbm>: command line options in file\\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\\n  <script.hbc>: package configuration file"
-msgstr "<script> puede ser:\\n <@script> o <script.hbm>: comandos de opciones de línea en el archivo\\n <script.hbp>: comandos de opciones de línea en el archivo, también marca un nuevo destino si se especifica en la línea de comandos\\n <script.hbc>: archivo de configuración de paquetes"
+msgid "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file"
+msgstr "<script> puede ser:\n <@script> o <script.hbm>: comandos de opciones de línea en el archivo\n <script.hbp>: comandos de opciones de línea en el archivo, también marca un nuevo destino si se especifica en la línea de comandos\n <script.hbc>: archivo de configuración de paquetes"
 
 #: hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -1523,8 +1523,8 @@ msgstr "Crear encabezado Harbour (en formato .hbx) con todos los símbolos exter
 
 #: hbmk2.prg:13102
 #, c-format
-msgid "accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
-msgstr "acepta raw C flags\\ncreate enlace/copia %1$s para hbcc para el mismo efecto"
+msgid "accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect"
+msgstr "acepta raw C flags\ncreate enlace/copia %1$s para hbcc para el mismo efecto"
 
 #: hbmk2.prg:13102
 #, c-format
@@ -1538,8 +1538,8 @@ msgstr "Advertencia: No se puede encontrar %1$s"
 
 #: hbmk2.prg:13102
 #, c-format
-msgid "control source header parsing (in incremental build mode)\\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off"
-msgstr "analizando fuente de control de encabezado (en construcción en modo incremental)\\n<m> puede ser: nativo (compilador utilizado para extraer las dependencias), completa (por defecto, utiliza analizador de texto simple en el fichero entero), dep, off"
+msgid "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off"
+msgstr "analizando fuente de control de encabezado (en construcción en modo incremental)\n<m> puede ser: nativo (compilador utilizado para extraer las dependencias), completa (por defecto, utiliza analizador de texto simple en el fichero entero), dep, off"
 
 #: hbmk2.prg:10233
 #, c-format
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index 2ca9662424..17655a60f6 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -99,8 +99,8 @@ msgstr "Figyelem: Hibás -gt érték figyelmen kívül hagyva: %1$s"
 
 #: hbmk2.prg:7959 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "Platform filters are accepted in each .hbc line and with several options.\\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
-msgstr "A szűrők az egyes .hbc sorokban használhatók és számos opció esetén támogatottak.\\nSzűrő formátum: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Szűrők kombinálhatók '&', '|' operátorokkal és zárójelekkel csoportosíthatók. Pl.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
+msgid "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
+msgstr "A szűrők az egyes .hbc sorokban használhatók és számos opció esetén támogatottak.\nSzűrő formátum: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Szűrők kombinálhatók '&', '|' operátorokkal és zárójelekkel csoportosíthatók. Pl.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
 
 #: hbmk2.prg:4128 hbmk2.prg:5633 hbmk2.prg:6212
 #, c-format
@@ -109,8 +109,8 @@ msgstr "Figyelem: C/C++ fordító parancsállománya ne hozható létre, folytat
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "compress executable/dynamic lib (needs UPX)\\n<lev> can be: yes, no, min, max"
-msgstr "tömörítse a végeredményt (UPX szükséges)\\n<lev> lehet: yes, no, min, max"
+msgid "compress executable/dynamic lib (needs UPX)\n<lev> can be: yes, no, min, max"
+msgstr "tömörítse a végeredményt (UPX szükséges)\n<lev> lehet: yes, no, min, max"
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -124,8 +124,8 @@ msgstr "egyszeri sípolás sikeres végrehajtás esetén, dupla sípolás hiba e
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "stop after creating the object files\\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
-msgstr "álljon meg az object állományok létrehozása után\\nA %1$s program hbcmp/clipper nevekre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "stop after creating the object files\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
+msgstr "álljon meg az object állományok létrehozása után\nA %1$s program hbcmp/clipper nevekre való másolásával/átnevezésével hasonló hatás érhet el"
 
 #: hbmk2.prg:1296 hbmk2.prg:1667 hbmk2.prg:1750
 #, c-format
@@ -369,13 +369,13 @@ msgstr "C fordító debug információ hozzáadása (vagy sem). Harbour szintű
 
 #: hbmk2.prg:1300 hbmk2.prg:1671 hbmk2.prg:1754
 #, c-format
-msgid "Choose a C compiler by using -comp= option.\\nYou have the following choices on your platform: %1$s"
-msgstr "Kérem, válasszon C fordítót a -comp= kapcsoló segítségével.\\nA következő lehetőségek közül választhat: %1$s"
+msgid "Choose a C compiler by using -comp= option.\nYou have the following choices on your platform: %1$s"
+msgstr "Kérem, válasszon C fordítót a -comp= kapcsoló segítségével.\nA következő lehetőségek közül választhat: %1$s"
 
 #: hbmk2.prg:7941 hbmk2.prg:11633
 #, c-format
-msgid "control source header parsing (in incremental build mode)\\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off"
-msgstr "finomhangolja a forrásállományok automatikus fejléc detektálást (lépcsőzetes üzemmódban)\\n<m> lehet: native, full (default), off"
+msgid "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off"
+msgstr "finomhangolja a forrásállományok automatikus fejléc detektálást (lépcsőzetes üzemmódban)\n<m> lehet: native, full (default), off"
 
 #: hbmk2.prg:7850 hbmk2.prg:11512 hbmk2.prg:12970
 #, c-format
@@ -384,8 +384,8 @@ msgstr "szerkessze be a GT<name> GT meghajtót. Több ilyen is megadható, az el
 
 #: hbmk2.prg:7941 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
-msgstr "álljon meg az object állományok létrehozása után és továbbítsa a kapcsolókat a C fordítónak\\nA %1$s program hbcc névre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "stop after creating the object files and accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect"
+msgstr "álljon meg az object állományok létrehozása után és továbbítsa a kapcsolókat a C fordítónak\nA %1$s program hbcc névre való másolásával/átnevezésével hasonló hatás érhet el"
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -399,8 +399,8 @@ msgstr ""
 
 #: hbmk2.prg:1105 hbmk2.prg:1450 hbmk2.prg:1561
 #, c-format
-msgid "Error: %1$s not set, failed to autodetect.\\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory."
-msgstr "Hiba: %1$s nincs megadva, automata detektálás nem járt sikerrel.\\nKérem, futtassa ezt a programot a Harbour könyvtárán belüli eredeti helyéről vagy állítsa be a %1$s környezeti változót a Harbour gyökér könyvtárára."
+msgid "Error: %1$s not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory."
+msgstr "Hiba: %1$s nincs megadva, automata detektálás nem járt sikerrel.\nKérem, futtassa ezt a programot a Harbour könyvtárán belüli eredeti helyéről vagy állítsa be a %1$s környezeti változót a Harbour gyökér könyvtárára."
 
 #: hbmk2.prg:2096 hbmk2.prg:2938 hbmk2.prg:3276
 #, c-format
@@ -489,7 +489,7 @@ msgstr "felülbírálja az alapértelmezett nyelvet. Hasonlóan HB_LANG környez
 
 #: hbmk2.prg:7959 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "Regular Harbour compiler options are also accepted as is.\\n(see them with -harbourhelp option)"
+msgid "Regular Harbour compiler options are also accepted as is.\n(see them with -harbourhelp option)"
 msgstr "Normál Harbour fordító kapcsolók is megadhatók."
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
@@ -599,13 +599,13 @@ msgstr "Figyelem: Statikus függvénykönyvtár létrehozás parancsállománya
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "set C compiler warning level\\n<lev> can be: max, yes, low, no, def (default: yes)"
+msgid "set C compiler warning level\n<lev> can be: max, yes, low, no, def (default: yes)"
 msgstr ""
 
 #: hbmk2.prg:7941
 #, c-format
-msgid "working directory for incremental build mode\\n(default: %1$s/plat/comp)"
-msgstr "munkakönyvtár lépcsőzetes üzemmód használatakor\\n(alapértelmezés: %1$s/plat/ford)"
+msgid "working directory for incremental build mode\n(default: %1$s/plat/comp)"
+msgstr "munkakönyvtár lépcsőzetes üzemmód használatakor\n(alapértelmezés: %1$s/plat/ford)"
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -619,8 +619,8 @@ msgstr ""
 
 #: hbmk2.prg:1302 hbmk2.prg:1673 hbmk2.prg:1756
 #, c-format
-msgid "Could not detect any supported C compiler in your PATH.\\nSetup one or set -comp= option to one of these values: %1$s"
-msgstr "Nem sikerült automatikusan detektálni egyetlen C fordítót sem a PATH-ban.\\nKérem, telepítsen egyet vagy állítsa a -comp= kapcsolót a következő értékek valamelyikére: %1$s"
+msgid "Could not detect any supported C compiler in your PATH.\nSetup one or set -comp= option to one of these values: %1$s"
+msgstr "Nem sikerült automatikusan detektálni egyetlen C fordítót sem a PATH-ban.\nKérem, telepítsen egyet vagy állítsa a -comp= kapcsolót a következő értékek valamelyikére: %1$s"
 
 #: hbmk2.prg:7824 hbmk2.prg:11479 hbmk2.prg:12934
 #, c-format
@@ -684,8 +684,8 @@ msgstr "Fordítás..."
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, 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,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"
+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 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
@@ -804,8 +804,8 @@ msgstr "szerkessze be <libname> függvénykönyvtárat. <libname>-ben nem szerep
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "emulate Clipper compatible linker behavior\\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
-msgstr "emuláljon Clipper kompatibilis szerkesztő üzemmódot.\\nA %1$s program rtlink/blinker/exospace nevekre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "emulate Clipper compatible linker behavior\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
+msgstr "emuláljon Clipper kompatibilis szerkesztő üzemmódot.\nA %1$s program rtlink/blinker/exospace nevekre való másolásával/átnevezésével hasonló hatás érhet el"
 
 #: hbmk2.prg:7941
 #, c-format
@@ -954,8 +954,8 @@ msgstr "felülbírálja az alapértelmezett cél platformot (alapértelmezés: a
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "override C compiler autodetection\\nSpecial value:\\n - bld: use original build settings (default on *nix)"
-msgstr "felülbírálja a C fordító detektálást\\nSpeciális érték:\\n - bld: használja a Harbour fordításához használtat (*nix-okon alapértelmezés)"
+msgid "override C compiler autodetection\nSpecial value:\n - bld: use original build settings (default on *nix)"
+msgstr "felülbírálja a C fordító detektálást\nSpeciális érték:\n - bld: használja a Harbour fordításához használtat (*nix-okon alapértelmezés)"
 
 #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -994,8 +994,8 @@ msgstr "cél futtatása"
 
 #: hbmk2.prg:7959 hbmk2.prg:13120
 #, c-format
-msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' character are ignored"
-msgstr ".hbc opciók (külön sorokba írandók): libs=[<libnevek>], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[<libnevek>], frameworks=[<framework-ök>], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], headers=[Harbour fejléc fájlok], incpaths=[útvonalak], instfiles=[fájlok], instpaths=[útvonalak], autohbcs=[<.ch>:<.hbc>], plugins=[plugin-ek], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<ok>, stop=<ok>, echo=<szöveg>\\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja"
+msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\nLines starting with '#' character are ignored"
+msgstr ".hbc opciók (külön sorokba írandók): libs=[<libnevek>], hbcs=[<.hbc nevek>], gt=[gtnév], syslibs=[<libnevek>], frameworks=[<framework-ök>], prgflags=[Harbour opciók], cflags=[C fordító opciók], resflags=[erőforrás fordító kapcsolók], ldflags=[szerkesztő kapcsolók], libpaths=[útvonalak], sources=[forrás fájlok], headers=[Harbour fejléc fájlok], incpaths=[útvonalak], instfiles=[fájlok], instpaths=[útvonalak], autohbcs=[<.ch>:<.hbc>], plugins=[plugin-ek], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<ok>, stop=<ok>, echo=<szöveg>\n'#' karakterrel kezdődő sorokat figyelmen kívül hagyja"
 
 #: hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -1039,7 +1039,7 @@ msgstr ""
 
 #: hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "working directory\\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)"
+msgid "working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)"
 msgstr ""
 
 #: hbmk2.prg:6519 hbmk2.prg:7245
@@ -1099,7 +1099,7 @@ msgstr ""
 
 #: hbmk2.prg:7934 hbmk2.prg:8776
 #, c-format
-msgid "Error: Executing plugin: %1$s at %3$s(%4$d)\\n'%2$s'"
+msgid "Error: Executing plugin: %1$s at %3$s(%4$d)\n'%2$s'"
 msgstr ""
 
 #: hbmk2.prg:11512 hbmk2.prg:12970
@@ -1304,7 +1304,7 @@ msgstr ""
 
 #: hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "<script> can be:\\n  <@script> or <script.hbm>: command line options in file\\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\\n  <script.hbc>: package configuration file"
+msgid "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file"
 msgstr ""
 
 #: hbmk2.prg:11633 hbmk2.prg:13102
@@ -1519,7 +1519,7 @@ msgstr ""
 
 #: hbmk2.prg:13102
 #, c-format
-msgid "accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
+msgid "accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect"
 msgstr ""
 
 #: hbmk2.prg:13102
@@ -1534,7 +1534,7 @@ msgstr ""
 
 #: hbmk2.prg:13102
 #, c-format
-msgid "control source header parsing (in incremental build mode)\\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off"
+msgid "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off"
 msgstr ""
 
 #: hbmk2.prg:10233
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index c666159bc2..a7b09b661e 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -508,7 +508,7 @@ EXTERNAL hbmk_KEYW
 
 #define _HBMK_lSysLoc           152
 #define _HBMK_lDumpInfo         153
-#define _HBMK_lMarkDown         154
+#define _HBMK_lMarkdown         154
 
 #define _HBMK_MAX_              154
 
@@ -938,7 +938,7 @@ STATIC FUNCTION hbmk_new()
    hbmk[ _HBMK_aLIBPATH ] := {}
 
    hbmk[ _HBMK_lDumpInfo ] := .F.
-   hbmk[ _HBMK_lMarkDown ] := .F.
+   hbmk[ _HBMK_lMarkdown ] := .F.
 
    RETURN hbmk
 
@@ -1490,7 +1490,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       CASE cParamL == "-longhelpmd" .OR. ;
            cParamL == "--longhelpmd"
 
-         hbmk[ _HBMK_lMarkDown ] := .T.
+         hbmk[ _HBMK_lMarkdown ] := .T.
 
          ShowHeader( hbmk )
          ShowHelp( hbmk, .T., .T. )
@@ -1860,7 +1860,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    IF hbmk[ _HBMK_nHBMODE ] != _HBMODE_RAW_C
 
       IF ! hbmk_harbour_dirlayout_detect( hbmk, .F. )
-         hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: %1$s not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory." ), _HBMK_ENV_INSTALL_PFX ) )
+         hbmk_OutErr( hbmk, hb_StrFormat( I_( e"Error: %1$s not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory." ), _HBMK_ENV_INSTALL_PFX ) )
          RETURN _ERRLEV_FAILHBDETECT
       ENDIF
 
@@ -2056,9 +2056,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
             ENDIF
          ELSE
             IF Empty( aCOMPDET )
-               _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Choose a C compiler by using -comp= option.\nYou have the following choices on your platform: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
+               _hbmk_OutErr( hbmk, hb_StrFormat( I_( e"Choose a C compiler by using -comp= option.\nYou have the following choices on your platform: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
             ELSE
-               _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Could not detect any supported C compiler in your PATH.\nSetup one or set -comp= option to one of these values: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
+               _hbmk_OutErr( hbmk, hb_StrFormat( I_( e"Could not detect any supported C compiler in your PATH.\nSetup one or set -comp= option to one of these values: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
             ENDIF
             RETURN _ERRLEV_UNKNCOMP
          ENDIF
@@ -9442,7 +9442,7 @@ STATIC FUNCTION PlugIn_call_low( hbmk, cName, hrb, ctx )
       ENDIF
    RECOVER USING oError
       IF ! hbmk[ _HBMK_lQuiet ]
-         _hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Executing plugin: %1$s at %3$s(%4$d)\n'%2$s'" ), cName, hbmk_ErrorMessage( oError ), oError:cargo[ 1 ], oError:cargo[ 2 ] ) )
+         _hbmk_OutErr( hbmk, hb_StrFormat( I_( e"Error: Executing plugin: %1$s at %3$s(%4$d)\n'%2$s'" ), cName, hbmk_ErrorMessage( oError ), oError:cargo[ 1 ], oError:cargo[ 2 ] ) )
       ENDIF
    END /* SEQUENCE */
 
@@ -13220,7 +13220,7 @@ STATIC PROCEDURE __hbshell( cFile, ... )
    hbmk_init_stage2( hbmk )
    IF ! hbmk_harbour_dirlayout_detect( hbmk, .T. )
       IF __hbshell_CanLoadDyn()
-         OutErr( StrTran( I_( "hbshell: Warning: Failed to detect Harbour.\nRun this tool from its original location inside the Harbour installation." ), "\n", hb_eol() ) + _OUT_EOL )
+         OutErr( StrTran( I_( e"hbshell: Warning: Failed to detect Harbour.\nRun this tool from its original location inside the Harbour installation." ), e"\n", hb_eol() ) + _OUT_EOL )
       ENDIF
    ENDIF
    hbmk[ _HBMK_cCOMP ] := hb_Version( HB_VERSION_BUILD_COMP )
@@ -13687,7 +13687,7 @@ STATIC FUNCTION __hbshell_plugins_load( hPlugins, aParams )
             ENDIF
          RECOVER USING oError
             plugin[ _PLUGIN_hHRB ] := NIL
-            OutErr( hb_StrFormat( I_( "hbshell: Error: Loading shell plugin: %1$s\n'%2$s'" ), cFile:__enumKey(), hbmk_ErrorMessage( oError ) ) + _OUT_EOL )
+            OutErr( StrTran( hb_StrFormat( I_( e"hbshell: Error: Loading shell plugin: %1$s\n'%2$s'" ), cFile:__enumKey(), hbmk_ErrorMessage( oError ) ), e"\n", hb_eol() ) + _OUT_EOL )
          END /* SEQUENCE */
       ENDIF
 
@@ -14827,7 +14827,7 @@ INIT PROCEDURE ClipInit()
 
    RETURN
 
-STATIC FUNCTION ToMarkDown( cText )
+STATIC FUNCTION ToMarkdown( cText )
 
    cText := StrTran( cText, "&", "&amp;" ) /* keep it at top */
    cText := StrTran( cText, "<", "&lt;" )
@@ -14852,6 +14852,12 @@ STATIC FUNCTION ToMarkDown( cText )
    cText := StrTran( cText, "(c)", "&copy;" )
    cText := StrTran( cText, "--", "\-\-" )
 
+#if 0
+   /* experiments with Markdown formatting */
+   cText := StrTran( cText, "&lt;", "*&lt;" )
+   cText := StrTran( cText, "&gt;", "&gt;*" )
+#endif
+
    RETURN cText
 
 STATIC PROCEDURE ShowHeader( hbmk )
@@ -14866,9 +14872,9 @@ STATIC PROCEDURE ShowHeader( hbmk )
       "Copyright (c) 1999-2013, Viktor Szakáts" + _OUT_EOL +;
       "%1$s" + _OUT_EOL
 
-   IF hbmk[ _HBMK_lMarkDown ]
-      hb_SetTermCP( "UTF8EX" ) /* UTF-8 output for MarkDown */
-      cText := StrTran( ToMarkDown( cText ), _OUT_EOL, "  " + _OUT_EOL )
+   IF hbmk[ _HBMK_lMarkdown ]
+      hb_SetTermCP( "UTF8EX" ) /* UTF-8 output for Markdown */
+      cText := StrTran( ToMarkdown( cText ), _OUT_EOL, "  " + _OUT_EOL )
       cURL := "<" + cURL + ">"
    ENDIF
 
@@ -14881,8 +14887,8 @@ STATIC PROCEDURE ShowHeader( hbmk )
       cTrsTextI := I_( cTrsText )
       IF !( cTrsText == cTrsTextI ) .AND. ! Empty( cTrsTextI )
          cText := hb_StrFormat( cTrsTextI, hbmk[ _HBMK_cUILNG ] ) + _OUT_EOL
-         IF hbmk[ _HBMK_lMarkDown ]
-            cText := StrTran( ToMarkDown( cText ), _OUT_EOL, "  " + _OUT_EOL )
+         IF hbmk[ _HBMK_lMarkdown ]
+            cText := StrTran( ToMarkdown( cText ), _OUT_EOL, "  " + _OUT_EOL )
          ENDIF
          OutStd( cText )
       ENDIF
@@ -14977,8 +14983,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
       { "-nolibgrouping[-]"  , I_( "disable library grouping on gcc based compilers" ) }, ;
       { "-nomiscsyslib[-]"   , I_( "do not add extra list of system libraries to default library list" ) }, ;
       { "-traceonly"         , I_( "show commands to be executed, but do not execute them" ) }, ;
-      { "-warn=<lev>"        , I_( "set C compiler warning level\n<lev> can be: max, yes, low, no, def (default: yes)" ) }, ;
-      { "-compr=<lev>"       , I_( "compress executable/dynamic lib (needs UPX)\n<lev> can be: yes, no, min, max" ) }, ;
+      { "-warn=<lev>"        , I_( e"set C compiler warning level\n<lev> can be: max, yes, low, no, def (default: yes)" ) }, ;
+      { "-compr=<lev>"       , I_( e"compress executable/dynamic lib (needs UPX)\n<lev> can be: yes, no, min, max" ) }, ;
       { "-run[-]"            , I_( "run/do not run output executable" ) }, ;
       { "-vcshead=<file>"    , I_( "generate .ch header file with local repository information. SVN, CVS, Git, Mercurial, Bazaar, Fossil and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" ) }, ;
       { "-tshead=<file>"     , I_( "generate .ch header file with timestamp information. Generated header will define preprocessor constants _HBMK_BUILD_DATE_, _HBMK_BUILD_TIME_, _HBMK_BUILD_TIMESTAMP_ with the date/time of build" ) }, ;
@@ -15013,14 +15019,14 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
       { "-3rd=<f>"           , hb_StrFormat( I_( "options/flags reserved for 3rd party tools, always ignored by %1$s itself" ), _SELF_NAME_ ) }, ;
       { "-env:<e>[<o>[<v>]]" , I_( "alter local environment. <e> is the name of the environment variable to alter. <o> can be '=' to set/override, '-' to delete, '+' to append to the end of existing value, '#' to insert to the beginning of existing value. <v> is the value to set/append/insert." ) }, ;
       { "-jobs=<n>"          , I_( "start n compilation threads (multiprocess platforms only)" ) }, ;
-      { "-head=<m>"          , I_( "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off" ) }, ;
+      { "-head=<m>"          , I_( e"control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off" ) }, ;
       { "-rebuild"           , I_( "rebuild (in incremental build mode)" ) }, ;
       { "-rebuildall"        , I_( "rebuild with sub-projects (in incremental build mode)" ) }, ;
       { "-clean"             , I_( "clean (in incremental build mode)" ) }, ;
-      { "-workdir=<dir>"     , hb_StrFormat( I_( "working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)" ), _WORKDIR_BASE_ ) }, ;
+      { "-workdir=<dir>"     , hb_StrFormat( I_( e"working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)" ), _WORKDIR_BASE_ ) }, ;
       NIL, ;
       { "-hbl[=<output>]"    , hb_StrFormat( I_( "output .hbl filename. %1$s macro is accepted in filename" ), _LNG_MARKER ) }, ;
-      { "-lng=<languages>"   , hb_StrFormat( I_( "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" ), _LNG_MARKER ) }, ;
+      { "-lng=<languages>"   , hb_StrFormat( I_( e"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" ), _LNG_MARKER ) }, ;
       { "-po=<output>"       , I_( "create/update .po file from source. Merge it with previous .po file of the same name" ) }, ;
       { "-minipo[-]"         , I_( "do (not) add Harbour version number and source file reference to .po (default: add them)" ) }, ;
       { "-rebuildpo"         , I_( "recreate .po file, thus removing all obsolete entries in it" ) }, ;
@@ -15053,8 +15059,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
       NIL, ;
       { "-hbrun"             , I_( "run target" ) }, ;
       { "-hbraw"             , I_( "stop after running Harbour compiler" ) }, ;
-      { "-hbcmp|-clipper"    , hb_StrFormat( I_( "stop after creating the object files\ncreate link/copy %1$s to hbcmp/clipper for the same effect" ), _SELF_NAME_ ) }, ;
-      { "-hbcc"              , hb_StrFormat( I_( "accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect" ), _SELF_NAME_ ) }, ;
+      { "-hbcmp|-clipper"    , hb_StrFormat( I_( e"stop after creating the object files\ncreate link/copy %1$s to hbcmp/clipper for the same effect" ), _SELF_NAME_ ) }, ;
+      { "-hbcc"              , hb_StrFormat( I_( e"accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect" ), _SELF_NAME_ ) }, ;
       { "-hblnk"             , I_( "accept raw linker flags" ) }, ;
       { "-autohbm[-]"        , hb_StrFormat( I_( "enable (or disable) processing of %1$s in current directory (default: yes)" ), _HBMK_AUTOHBM_NAME ) }, ;
       { "-hb10"              , I_( "enable Harbour 1.0.x compatibility mode" ) }, ;
@@ -15063,7 +15069,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
       { "-hbc"               , I_( "enable pure C mode" ) }, ;
       { "-rtlink"            , "" }, ;
       { "-blinker"           , "" }, ;
-      { "-exospace"          , hb_StrFormat( I_( "emulate Clipper compatible linker behavior\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect" ), _SELF_NAME_ ) }, ;
+      { "-exospace"          , hb_StrFormat( I_( e"emulate Clipper compatible linker behavior\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect" ), _SELF_NAME_ ) }, ;
       NIL, ;
       { "-hbreg[=global]"    , hb_StrFormat( I_( "register Harbour Script (.hb) with %1$s (Windows only)" ), _SELF_NAME_ ) }, ;
       { "-hbunreg[=global]"  , hb_StrFormat( I_( "unregister Harbour Script (.hb) from %1$s (Windows only)" ), _SELF_NAME_ ) }, ;
@@ -15080,13 +15086,13 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
       NIL, ;
       { "-plat=<platform>"   , I_( "override default target platform (default: automatic)" ) }, ;
       { "-cpu=<cpu>"         , I_( "override default target CPU (default: automatic) (EXPERIMENTAL)" ) }, ;
-      { "-comp=<compiler>"   , I_( "override C compiler autodetection\nSpecial value:\n - bld: use original build settings (default on *nix)" ) }, ;
+      { "-comp=<compiler>"   , I_( e"override C compiler autodetection\nSpecial value:\n - bld: use original build settings (default on *nix)" ) }, ;
       { "-build=<name>"      , I_( "specify a build name" ) }, ;
       { "-lang=<lang>"       , I_( "override default language. <lang> is an ISO language code." ) }, ;
       { "-width=<n>"         , I_( "set output width to <n> characters (0=unlimited)." ) }, ;
       { "-shl"               , I_( "show sub-project level in output lines" ) }, ;
       { "-longhelp"          , I_( "long help" ) }, ;
-      { "-longhelpmd"        , I_( "long help in MarkDown format" ) }, ;
+      { "-longhelpmd"        , I_( "long help in Markdown format" ) }, ;
       { "-harbourhelp"       , hb_StrFormat( I_( "Harbour compiler help (all Harbour compiler options are accepted as is by %1$s)" ), _SELF_NAME_ ) }, ;
       { "-credits"           , I_( "display credits (via Harbour compiler)" ) }, ;
       { "-build"             , I_( "display detailed build information (via Harbour compiler)" ) }, ;
@@ -15322,13 +15328,13 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
 
    LOCAL aLst_Notes := { ;
       NIL, ;
-      I_( "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file" ), ;
+      I_( e"<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file" ), ;
       I_( "Source filename without extension will load the .hbp file, if such .hbp file exists in current directory. If not, .prg extension will be used." ), ;
       I_( "Multiple -l, -L, -i and <script> parameters are accepted." ), ;
-      I_( "Regular Harbour compiler options are also accepted as is.\n(see them with -harbourhelp option)" ), ;
+      I_( e"Regular Harbour compiler options are also accepted as is.\n(see them with -harbourhelp option)" ), ;
       hb_StrFormat( I_( "%1$s option file in %2$s directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the %2$s directory." ), _HBMK_AUTOHBC_NAME, _SELF_NAME_ ), ;
       hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ), ;
-      I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}" ), ;
+      I_( e"Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}" ), ;
       I_( "Certain .hbc lines (libs=, hbcs=, prgflags=, cflags=, ldflags=, libpaths=, instfiles=, instpaths=, echo=) and corresponding command line parameters will accept macro variables. libpaths= also accepts %{hb_name} which translates to the name of the .hbc file under search." ), ;
       I_( 'Options accepting macro variables also support command substitution. Enclose command inside ``, and, if the command contains space, also enclose in double quotes. F.e. "-cflag=`wx-config --cflags`", or ldflags={unix&gcc}"`wx-config --libs`".' ), ;
       I_( "Libraries and object files built with/for CA-Cl*pper will not work with any supported platform/compiler." ) , ;
@@ -15390,8 +15396,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lFull, lLong )
 
 STATIC PROCEDURE OutHdr( hbmk, cText )
 
-   IF hbmk[ _HBMK_lMarkDown ]
-      cText := ToMarkDown( cText )
+   IF hbmk[ _HBMK_lMarkdown ]
+      cText := ToMarkdown( cText )
    ENDIF
 
    OutStd( cText )
@@ -15404,21 +15410,21 @@ STATIC PROCEDURE OutOpt( hbmk, aOpt, nWidth )
    LOCAL nLines
 
    IF Empty( aOpt )
-      IF hbmk[ _HBMK_lMarkDown ]
+      IF hbmk[ _HBMK_lMarkdown ]
          OutStd( _OUT_EOL )
       ENDIF
       OutStd( _OUT_EOL )
    ELSE
       IF Len( aOpt ) > 1
          hb_default( @nWidth, 22 )
-         IF hbmk[ _HBMK_lMarkDown ]
+         IF hbmk[ _HBMK_lMarkdown ]
             IF nWidth > 0
-               OutStd( " - " + "**" + ToMarkDown( aOpt[ 1 ] ) + "**" + " " + ToMarkDown( StrTran( aOpt[ 2 ], "\n", "  " + _OUT_EOL ) ) + _OUT_EOL )
+               OutStd( " - " + "**" + ToMarkdown( aOpt[ 1 ] ) + "**" + " " + ToMarkdown( StrTran( aOpt[ 2 ], e"\n", "  " + _OUT_EOL ) ) + _OUT_EOL )
             ELSE
-               OutStd( ToMarkDown( StrTran( aOpt[ 2 ], "\n", "  " + _OUT_EOL ) ) + _OUT_EOL )
+               OutStd( ToMarkdown( StrTran( aOpt[ 2 ], e"\n", "  " + _OUT_EOL ) ) + _OUT_EOL )
             ENDIF
          ELSE
-            aOpt[ 2 ] := StrTran( aOpt[ 2 ], "\n", hb_eol() )
+            aOpt[ 2 ] := StrTran( aOpt[ 2 ], e"\n", hb_eol() )
             nLines := Max( MLCount( aOpt[ 2 ], hbmk[ _HBMK_nMaxCol ] - nWidth ), ;
                            MLCount( aOpt[ 1 ], nWidth ) )
             FOR nLine := 1 TO nLines
@@ -15427,7 +15433,7 @@ STATIC PROCEDURE OutOpt( hbmk, aOpt, nWidth )
             NEXT
          ENDIF
       ELSE
-         IF hbmk[ _HBMK_lMarkDown ]
+         IF hbmk[ _HBMK_lMarkdown ]
             OutStd( " - " + "**" + aOpt[ 1 ] + "**" + _OUT_EOL )
          ELSE
             OutStd( Space( 2 ) + aOpt[ 1 ] + _OUT_EOL )
@@ -15444,15 +15450,15 @@ STATIC PROCEDURE OutNote( hbmk, cText )
    LOCAL tmp
 
    IF Empty( cText )
-      IF hbmk[ _HBMK_lMarkDown ]
+      IF hbmk[ _HBMK_lMarkdown ]
          OutStd( _OUT_EOL )
       ENDIF
       OutStd( _OUT_EOL )
    ELSE
-      IF hbmk[ _HBMK_lMarkDown ]
-         OutStd( " - " + ToMarkDown( StrTran( cText, "\n", "  " + _OUT_EOL ) ) + _OUT_EOL )
+      IF hbmk[ _HBMK_lMarkdown ]
+         OutStd( " - " + ToMarkdown( StrTran( cText, e"\n", "  " + _OUT_EOL ) ) + _OUT_EOL )
       ELSE
-         cText := StrTran( cText, "\n", hb_eol() )
+         cText := StrTran( cText, e"\n", hb_eol() )
          nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - 4 )
          FOR nLine := 1 TO nLines
             IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - 4, nLine ) ) )
@@ -15489,7 +15495,7 @@ STATIC PROCEDURE _hbmk_OutStd( hbmk, cText )
       cPrefix := _SELF_NAME_ + ":"
    ENDIF
 
-   cText := StrTran( cText, "\n", hb_eol() )
+   cText := StrTran( cText, e"\n", hb_eol() )
    nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - nWidth )
    FOR nLine := 1 TO nLines
       IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - nWidth, nLine ) ) )
@@ -15519,7 +15525,7 @@ STATIC PROCEDURE _hbmk_OutErr( hbmk, cText )
       cPrefix := _SELF_NAME_ + ":"
    ENDIF
 
-   cText := StrTran( cText, "\n", hb_eol() )
+   cText := StrTran( cText, e"\n", hb_eol() )
    nLines := MLCount( cText, hbmk[ _HBMK_nMaxCol ] - nWidth )
    FOR nLine := 1 TO nLines
       IF ! Empty( tmp := RTrim( MemoLine( cText, hbmk[ _HBMK_nMaxCol ] - nWidth, nLine ) ) )
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 9f0646dc2e..e0715347b3 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -48,7 +48,7 @@ msgstr "forçar compilação em modo C++/C"
 
 #: hbmk2.prg:1104 hbmk2.prg:1450 hbmk2.prg:1561
 #, c-format
-msgid "Error: %1$s not set, failed to autodetect.\\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory."
+msgid "Error: %1$s not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set %1$s environment variable to Harbour's root directory."
 msgstr "Erro: %1$s não definido, falha na detecção automática."
 
 #: hbmk2.prg:953 hbmk2.prg:1268 hbmk2.prg:1341
@@ -98,8 +98,8 @@ msgstr "Compilador C detectado automaticamente: %1$s"
 
 #: hbmk2.prg:1301 hbmk2.prg:1673 hbmk2.prg:1756
 #, c-format
-msgid "Could not detect any supported C compiler in your PATH.\\nSetup one or set -comp= option to one of these values: %1$s"
-msgstr "Nenhum compilador C suportado foi encontrado em seu PATH.\\nPor favor, utilize a opção -comp= com um destes valores: %1$s"
+msgid "Could not detect any supported C compiler in your PATH.\nSetup one or set -comp= option to one of these values: %1$s"
+msgstr "Nenhum compilador C suportado foi encontrado em seu PATH.\nPor favor, utilize a opção -comp= com um destes valores: %1$s"
 
 #: hbmk2.prg:1307 hbmk2.prg:1679 hbmk2.prg:1762
 #, c-format
@@ -113,8 +113,8 @@ msgstr "Usando Harbour: %1$s %2$s %3$s %4$s"
 
 #: hbmk2.prg:1299 hbmk2.prg:1671 hbmk2.prg:1754
 #, c-format
-msgid "Choose a C compiler by using -comp= option.\\nYou have the following choices on your platform: %1$s"
-msgstr "Por favor, selecione um compilador C usando a opção -comp=.\\nVocê possui as seguintes opções para sua plataforma> %1$s"
+msgid "Choose a C compiler by using -comp= option.\nYou have the following choices on your platform: %1$s"
+msgstr "Por favor, selecione um compilador C usando a opção -comp=.\nVocê possui as seguintes opções para sua plataforma> %1$s"
 
 #: hbmk2.prg:1380 hbmk2.prg:1855 hbmk2.prg:1954
 #, c-format
@@ -303,8 +303,8 @@ msgstr "Linkando... %1$s"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "set C compiler warning level\\n<lev> can be: max, yes, low, no, def (default: yes)"
-msgstr "define o nível de avisos (warnings) do compilador C\\n<lev> pode ser: max, yes, low, no, def (padrão: yes)"
+msgid "set C compiler warning level\n<lev> can be: max, yes, low, no, def (default: yes)"
+msgstr "define o nível de avisos (warnings) do compilador C\n<lev> pode ser: max, yes, low, no, def (padrão: yes)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -453,13 +453,13 @@ msgstr "ativa (ou desativa) um beep simples em caso de sucesso ou um beep duplo
 
 #: hbmk2.prg:7942
 #, c-format
-msgid "working directory for incremental build mode\\n(default: %1$s/plat/comp)"
-msgstr "diretório de trabalho para o modo de compilação incremental\\n(default: %1$s/plat/comp)"
+msgid "working directory for incremental build mode\n(default: %1$s/plat/comp)"
+msgstr "diretório de trabalho para o modo de compilação incremental\n(default: %1$s/plat/comp)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "compress executable/dynamic lib (needs UPX)\\n<lev> can be: yes, no, min, max"
-msgstr "comprime o executável/biblioteca dinânica (necessita de UPX)\\n<lev> pode ser: yes, no, min, max"
+msgid "compress executable/dynamic lib (needs UPX)\n<lev> can be: yes, no, min, max"
+msgstr "comprime o executável/biblioteca dinânica (necessita de UPX)\n<lev> pode ser: yes, no, min, max"
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
@@ -468,18 +468,18 @@ msgstr "Multiplos parâmetros -l, -L, -i e <script> são aceitos."
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "Regular Harbour compiler options are also accepted as is.\\n(see them with -harbourhelp option)"
+msgid "Regular Harbour compiler options are also accepted as is.\n(see them with -harbourhelp option)"
 msgstr "Opções usadas com o compilador Harbour também são aceitas."
 
 #: hbmk2.prg:7960 hbmk2.prg:13120
 #, c-format
-msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\\nLines starting with '#' character are ignored"
-msgstr "As opções em um arquivo .hbc devem estar em linhas separadas e são: libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], headers=[Harbour header files], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=[yes|no], echo=<text>\\nLinhas iniciadas com '#' são interpretadas como comentários e serão ignoradas"
+msgid ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], headers=[Harbour header files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\nLines starting with '#' character are ignored"
+msgstr "As opções em um arquivo .hbc devem estar em linhas separadas e são: libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[flags do Harbour], cflags=[flags do compilador C], resflags=[flags do compilador de recursos], ldflags=[flags do linkeditor], libpaths=[paths], sources=[módulos fontes], headers=[Harbour header files], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=[yes|no], echo=<text>\nLinhas iniciadas com '#' são interpretadas como comentários e serão ignoradas"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "stop after creating the object files\\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
-msgstr "interromper após criar os arquivos objetos\\ncriar um link ou copiar o %1$s para hbcmp/clipper resultará no mesmo efeito"
+msgid "stop after creating the object files\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
+msgstr "interromper após criar os arquivos objetos\ncriar um link ou copiar o %1$s para hbcmp/clipper resultará no mesmo efeito"
 
 #: hbmk2.prg:7960
 #, c-format
@@ -488,8 +488,8 @@ msgstr "<script> pode ser <@script> (no formato .hbm), <script.hbm>, <script.hbp
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "select C compiler.\\nSpecial value:\\n - bld: use original build settings (default on *nix)"
-msgstr "use o compilador C específico.\\nValor especial:\\n - bld: use a configuração original (padrão em *nix)"
+msgid "select C compiler.\nSpecial value:\n - bld: use original build settings (default on *nix)"
+msgstr "use o compilador C específico.\nValor especial:\n - bld: use a configuração original (padrão em *nix)"
 
 #: hbmk2.prg:7825 hbmk2.prg:11479 hbmk2.prg:12934
 #, c-format
@@ -523,13 +523,13 @@ msgstr "seta o ícone para o aplicativo. <file> deve possuir um formato compatí
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "control source header parsing (in incremental build mode)\\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off"
-msgstr "controla a análise de cabeçalhos (no modo de compilação incremental)\\n<m> pode ser: native, full (padrão), off"
+msgid "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), off"
+msgstr "controla a análise de cabeçalhos (no modo de compilação incremental)\n<m> pode ser: native, full (padrão), off"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, 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,hu-HU,de"
-msgstr "lista de idiomas à serem substituidos nas macros %1$s nos arquivos .pot/.po e nos nomes de arquivos de saída .hbl/.po. Lista separada por vírgula:\\n-lng=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 "lista de idiomas à serem substituidos nas macros %1$s nos arquivos .pot/.po e nos nomes de arquivos de saída .hbl/.po. Lista separada por vírgula:\n-lng=en,hu-HU,de"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
@@ -808,8 +808,8 @@ msgstr "Tempo de execução: %1$ds"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "emulate Clipper compatible linker behavior\\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
-msgstr "emula o comportamento de um linkeditor compatível com clipper\\ncriar um link ou copiar o %1$s para rtlink/blinker/exospace resultará no mesmo efeito"
+msgid "emulate Clipper compatible linker behavior\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
+msgstr "emula o comportamento de um linkeditor compatível com clipper\ncriar um link ou copiar o %1$s para rtlink/blinker/exospace resultará no mesmo efeito"
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
@@ -943,8 +943,8 @@ msgstr "não adicione bibliotecas extras do sistema à lista padrão de bibliote
 
 #: hbmk2.prg:7960 hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "Platform filters are accepted in each .hbc line and with several options.\\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
-msgstr "Os filtros para plataformas são aceitos para cada uma das linhas de um arquivo .hbc e possuem diversas opções.\\nFormato de um filtro: {[!][<arquitetura>|<compilador>|<cpu>|<palavra-chave>]}. Os filtros podem ser combinados usando os operadores '&', '|' e agrupados por parênteses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
+msgid "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<platform>|<compiler>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parentheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
+msgstr "Os filtros para plataformas são aceitos para cada uma das linhas de um arquivo .hbc e possuem diversas opções.\nFormato de um filtro: {[!][<arquitetura>|<compilador>|<cpu>|<palavra-chave>]}. Os filtros podem ser combinados usando os operadores '&', '|' e agrupados por parênteses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}"
 
 #: hbmk2.prg:7555 hbmk2.prg:7672 hbmk2.prg:7755 hbmk2.prg:11163 hbmk2.prg:11284 hbmk2.prg:11408 hbmk2.prg:12183 hbmk2.prg:12311 hbmk2.prg:12459
 #, c-format
@@ -968,8 +968,8 @@ msgstr "compilação limpa (em modo de compilação incremental)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
-msgstr "interromper após criar os arquivos objetos e processa-los com o compilador C\\ncriar um link ou copiar o %1$s para hbcc resultará no mesmo efeito"
+msgid "stop after creating the object files and accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect"
+msgstr "interromper após criar os arquivos objetos e processa-los com o compilador C\ncriar um link ou copiar o %1$s para hbcc resultará no mesmo efeito"
 
 #: hbmk2.prg:7808 hbmk2.prg:11462 hbmk2.prg:12913
 #, c-format
@@ -1043,7 +1043,7 @@ msgstr ""
 
 #: hbmk2.prg:11633 hbmk2.prg:13102
 #, c-format
-msgid "working directory\\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)"
+msgid "working directory\n(default: %1$s/plat/comp in incremental mode, OS temp directory otherwise)"
 msgstr ""
 
 #: hbmk2.prg:6519 hbmk2.prg:7245
@@ -1103,7 +1103,7 @@ msgstr ""
 
 #: hbmk2.prg:7934 hbmk2.prg:8776
 #, c-format
-msgid "Error: Executing plugin: %1$s at %3$s(%4$d)\\n'%2$s'"
+msgid "Error: Executing plugin: %1$s at %3$s(%4$d)\n'%2$s'"
 msgstr ""
 
 #: hbmk2.prg:11512 hbmk2.prg:12970
@@ -1308,7 +1308,7 @@ msgstr ""
 
 #: hbmk2.prg:11650 hbmk2.prg:13120
 #, c-format
-msgid "<script> can be:\\n  <@script> or <script.hbm>: command line options in file\\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\\n  <script.hbc>: package configuration file"
+msgid "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file"
 msgstr ""
 
 #: hbmk2.prg:11633 hbmk2.prg:13102
@@ -1523,7 +1523,7 @@ msgstr ""
 
 #: hbmk2.prg:13102
 #, c-format
-msgid "accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
+msgid "accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect"
 msgstr ""
 
 #: hbmk2.prg:13102
@@ -1538,7 +1538,7 @@ msgstr ""
 
 #: hbmk2.prg:13102
 #, c-format
-msgid "control source header parsing (in incremental build mode)\\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off"
+msgid "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off"
 msgstr ""
 
 #: hbmk2.prg:10233