From cdc25aa12886478a0844dba646cb132d3a75157f Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 1 Apr 2013 01:37:20 +0200
Subject: [PATCH] 2013-04-01 01:35 UTC+0200 Viktor Szakats (harbour syenar.net)
   * src/rtl/hbi18n2.prg     * consider the complete original string when
 sorting (was first 30 chars)

  * utils/hbmk2/_po_pull.hb
    ! more automatic translation fixups:
      "( " -> "("
      " )" -> ")"
---
 ChangeLog.txt           | 9 +++++++++
 src/rtl/hbi18n2.prg     | 2 +-
 utils/hbmk2/_po_pull.hb | 2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 90c26ec3d5..21a5d4d9ac 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,15 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-04-01 01:35 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * src/rtl/hbi18n2.prg
+    * consider the complete original string when sorting (was first 30 chars)
+
+  * utils/hbmk2/_po_pull.hb
+    ! more automatic translation fixups:
+      "( " -> "("
+      " )" -> ")"
+
 2013-04-01 01:28 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/_po_pull.hb
     ! fixed wrong EOL forming after prev
diff --git a/src/rtl/hbi18n2.prg b/src/rtl/hbi18n2.prg
index 79a5f4cb09..b6ee7d6bfe 100644
--- a/src/rtl/hbi18n2.prg
+++ b/src/rtl/hbi18n2.prg
@@ -330,7 +330,7 @@ STATIC FUNCTION __i18n_ItemToStr( item )
       cSource := Left( cSource, tmp - 1 ) + Str( Val( SubStr( cSource, tmp + 1 ) ), 10, 0 )
    ENDIF
 
-   RETURN cSource + Left( item[ _I18N_MSGID, 1 ], 30 )
+   RETURN cSource + item[ _I18N_MSGID, 1 ]
 
 FUNCTION __i18n_potArrayClean( aTrans, lSource, lEmptyTranslations, bTransformTranslation )
 
diff --git a/utils/hbmk2/_po_pull.hb b/utils/hbmk2/_po_pull.hb
index fe00bb1ce8..d99448d8d9 100644
--- a/utils/hbmk2/_po_pull.hb
+++ b/utils/hbmk2/_po_pull.hb
@@ -62,6 +62,8 @@ STATIC FUNCTION DoctorTranslation( cString )
    cString := Unspace( AllTrim( cString ) )
    cString := StrTran( cString, hb_UChar( 0x23CE ), e"\n" )
    cString := StrTran( cString, e"\n ", e"\n" )
+   cString := StrTran( cString, "( ", "(" )
+   cString := StrTran( cString, " )", ")" )
 
    RETURN cString