[PATCH 3/3] gitk: fix display of copyright symbol

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

From: Pat Thoyts <patthoyts@users.sourceforge.net>
To: git@vger.kernel.org
Cc: Paul Mackerras <paulus@samba.org>,
	Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: [PATCH 3/3] gitk: fix display of copyright symbol
Date: Fri, 12 Mar 2010 18:31:49 +0000	[thread overview]
Message-ID: <1268418709-4998-3-git-send-email-patthoyts@users.sourceforge.net> (raw)
In-Reply-To: <1268418709-4998-2-git-send-email-patthoyts@users.sourceforge.net>

The script file uses utf-8 encoding but when sourced it will be read
using the default system encoding which is never utf8 on windows. This
causes the copyright symbol to display incorrectly in the about dialog.
Using the unicode escape sequence avoids incorrect decoding but does
require a double escape in the .po files.

Also adjusted the year range.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 gitk     |    2 +-
 po/de.po |    4 ++--
 po/es.po |    4 ++--
 po/fr.po |    4 ++--
 po/hu.po |    4 ++--
 po/it.po |    4 ++--
 po/ja.po |    4 ++--
 po/ru.po |    4 ++--
 po/sv.po |    4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gitk b/gitk
index 1f36a3e..e1f3740 100755
--- a/gitk
+++ b/gitk
@@ -2782,7 +2782,7 @@ proc about {} {
     message $w.m -text [mc "
 Gitk - a commit viewer for git
 
-Copyright Â© 2005-2009 Paul Mackerras
+Copyright \u00a9 2005-2010 Paul Mackerras
 
 Use and redistribute under the terms of the GNU General Public License"] \
 	    -justify center -aspect 400 -border 2 -bg white -relief groove
diff --git a/po/de.po b/po/de.po
index c79aa9c..bd194a3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -334,14 +334,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â©9 2005-2009 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - eine Visualisierung der Git-Historie\n"
 "\n"
-"Copyright Â© 2005-2009 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Benutzung und Weiterverbreitung gemÃ¤ÃŸ den Bedingungen der GNU General Public License"
 
diff --git a/po/es.po b/po/es.po
index 0e19b5e..0471dd0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -281,14 +281,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â© 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - un visualizador de revisiones para git\n"
 "\n"
-"Copyright Â© 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Uso y redistribuciÃ³n permitidos segÃºn los tÃ©rminos de la Licencia PÃºblica "
 "General de GNU (GNU GPL)"
diff --git a/po/fr.po b/po/fr.po
index cb0e1ed..5370ddc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -334,14 +334,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â© 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - visualisateur de commit pour git\n"
 "\n"
-"Copyright Â© 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Utilisation et redistribution soumises aux termes de la GNU General Public "
 "License"
diff --git a/po/hu.po b/po/hu.po
index 1df212e..7262b61 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -333,14 +333,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â©9 2005-2009 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - commit nÃ©zegetÅ‘ a githez\n"
 "\n"
-"SzerzÅ‘i jog Â©9 2005-2009 Paul Mackerras\n"
+"SzerzÅ‘i jog \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "HasznÃ¡ld Ã©s terjeszd a GNU General Public License feltÃ©telei mellett"
 
diff --git a/po/it.po b/po/it.po
index 4818652..a730d63 100644
--- a/po/it.po
+++ b/po/it.po
@@ -334,14 +334,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â© 2005-2009 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - un visualizzatore di revisioni per git\n"
 "\n"
-"Copyright Â© 2005-2009 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public "
 "License"
diff --git a/po/ja.po b/po/ja.po
index c0c92ad..4f47051 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -335,14 +335,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â© 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - gitã‚³ãƒŸãƒƒãƒˆãƒ“ãƒ¥ãƒ¼ã‚¢\n"
 "\n"
-"Copyright Â© 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "ä½¿ç”¨ãŠã‚ˆã³å†é…å¸ƒã¯ GNU General Public License ã«å¾“ã£ã¦ãã ã•ã„"
 
diff --git a/po/ru.po b/po/ru.po
index 704eba8..c3d0285 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -313,14 +313,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â© 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð° Ð¸ÑÑ‚Ð¾Ñ€Ð¸Ð¸ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸ÐµÐ² Git\n"
 "\n"
-"Copyright (c) 2005-2008 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¸ Ñ€Ð°ÑÐ¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ ÑÐ¾Ð³Ð»Ð°ÑÐ½Ð¾ ÑƒÑÐ»Ð¾Ð²Ð¸ÑÐ¼ GNU General Public License"
 
diff --git a/po/sv.po b/po/sv.po
index 0f5e2fd..386763a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -334,14 +334,14 @@ msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
 "\n"
-"Copyright Â©9 2005-2009 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "Use and redistribute under the terms of the GNU General Public License"
 msgstr ""
 "\n"
 "Gitk - en incheckningsvisare fÃ¶r git\n"
 "\n"
-"Copyright Â© 2005-2009 Paul Mackerras\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
 "\n"
 "AnvÃ¤nd och vidarefÃ¶rmedla enligt villkoren i GNU General Public License"
 
-- 
1.6.6

next prev parent reply	other threads:[~2010-03-12 18:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-12 18:31 [PATCH 1/3] gitk: Avoid calling tk_setPalette on Windows Pat Thoyts
2010-03-12 18:31 ` [PATCH 2/3] gitk: Add emacs editor variable block Pat Thoyts
2010-03-12 18:31   ` Pat Thoyts [this message]
2010-03-20  6:14     ` [PATCH] gitk: Fix display of copyright symbol in non-utf-8 locales Jonathan Nieder
2010-03-20  6:24       ` [PATCH squash] gitk: Update makefile to keep -encoding option for gitk-wish Jonathan Nieder
2010-03-22 22:58       ` [PATCH] gitk: Fix display of copyright symbol in non-utf-8 locales Pat Thoyts
2010-03-22 23:45         ` Jonathan Nieder
2010-03-20  6:32 ` [PATCH 1/3] gitk: Avoid calling tk_setPalette on Windows Jonathan Nieder
2010-03-22 22:52   ` Pat Thoyts
2010-03-23  2:29     ` Jonathan Nieder

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:1f36a3e dfblob:e1f3740 dfblob:c79aa9c dfblob:bd194a3
dfblob:0e19b5e dfblob:0471dd0 dfblob:cb0e1ed dfblob:5370ddc
dfblob:1df212e dfblob:7262b61 dfblob:4818652 dfblob:a730d63
dfblob:c0c92ad dfblob:4f47051 dfblob:704eba8 dfblob:c3d0285
dfblob:0f5e2fd dfblob:386763a )
 OR (
bs:"[PATCH 3/3] gitk: fix display of copyright symbol" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1268418709-4998-3-git-send-email-patthoyts@users.sourceforge.net \
    --to=patthoyts@users.sourceforge.net \
    --cc=git@vger.kernel.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).