[PATCH resend] gitk: Adjust two equal strings which differed in whitespace

[PATCH resend] gitk: Adjust two equal strings which differed in whitespace

[Markus Heidelberg]

There were the two strings "SHA1 ID: " and "SHA1 ID:" as description for
the SHA1 search textbox. Change it to two equal strings, the space is
now outside of the translated string.

Furthermore the German translation wasn't unique, but "SHA1:" resp.
"SHA1-Hashwert:". The former was displayed after initialisation, the
latter after changes to the textbox, for example when clearing the text.
But it was too long to be displayed fully, so use a shorter translation.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
---
 gitk     |    2 +-
 po/de.po |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitk b/gitk
index 86dff0f..d8364c4 100755
--- a/gitk
+++ b/gitk
@@ -2088,7 +2088,7 @@ proc makewindow {} {
     set sha1entry .tf.bar.sha1
     set entries $sha1entry
     set sha1but .tf.bar.sha1label
-    button $sha1but -text [mc "SHA1 ID: "] -state disabled -relief flat \
+    button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \
 	-command gotocommit -width 8
     $sha1but conf -disabledforeground [$sha1but cget -foreground]
     pack .tf.bar.sha1label -side left
diff --git a/po/de.po b/po/de.po
index 53ef0d6..e224595 100644
--- a/po/de.po
+++ b/po/de.po
@@ -708,7 +708,7 @@ msgstr "Gehe zu:"
 
 #: gitk:7821
 msgid "SHA1 ID:"
-msgstr "SHA1-Hashwert:"
+msgstr "SHA1 ID:"
 
 #: gitk:7840
 #, tcl-format
-- 
1.6.6.109.g052a6a

Re: [PATCH resend] gitk: Adjust two equal strings which differed in whitespace

[Paul Mackerras]

On Sat, Jan 09, 2010 at 11:11:12PM +0100, Markus Heidelberg wrote:

> There were the two strings "SHA1 ID: " and "SHA1 ID:" as description for
> the SHA1 search textbox. Change it to two equal strings, the space is
> now outside of the translated string.
> 
> Furthermore the German translation wasn't unique, but "SHA1:" resp.
> "SHA1-Hashwert:". The former was displayed after initialisation, the
> latter after changes to the textbox, for example when clearing the text.
> But it was too long to be displayed fully, so use a shorter translation.
> 
> Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>

Thanks, applied.

Paul.