summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-20 15:56:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-20 15:56:14 (GMT)
commit6260cf2707d22af15254d99fab9831f7bf00c67e (patch)
treee23ff77e5464625d082632bf9ad34c490040a7fa
parente926662190cc08e5f057d0d90cdf9da4a1aab15f (diff)
parentf421ca71362dacb22cf77a8206b9bc414e4b612a (diff)
downloadtk-6260cf2707d22af15254d99fab9831f7bf00c67e.zip
tk-6260cf2707d22af15254d99fab9831f7bf00c67e.tar.gz
tk-6260cf2707d22af15254d99fab9831f7bf00c67e.tar.bz2
merge core-8-6-branch
-rw-r--r--library/demos/en.msg2
-rw-r--r--library/demos/nl.msg4
-rw-r--r--library/demos/widget8
3 files changed, 7 insertions, 7 deletions
diff --git a/library/demos/en.msg b/library/demos/en.msg
index e364c81..05d4a64 100644
--- a/library/demos/en.msg
+++ b/library/demos/en.msg
@@ -18,7 +18,7 @@
::msgcat::mcset en "Demo code: %s"
::msgcat::mcset en "About Widget Demo"
::msgcat::mcset en "Tk widget demonstration application"
-::msgcat::mcset en "Copyright \u00a9 %s"
+::msgcat::mcset en "Copyright © %s"
::msgcat::mcset en "
@@title
Tk Widget Demonstrations
diff --git a/library/demos/nl.msg b/library/demos/nl.msg
index 61832d8..cd52630 100644
--- a/library/demos/nl.msg
+++ b/library/demos/nl.msg
@@ -18,9 +18,9 @@
::msgcat::mcset nl "Demo code: %s" "Code van Demo %s"
::msgcat::mcset nl "About Widget Demo" "Over deze demonstratie"
::msgcat::mcset nl "Tk widget demonstration" "Demonstratie van Tk widgets"
-::msgcat::mcset nl "Copyright \u00a9 %s"
+::msgcat::mcset nl "Copyright © %s"
-::msgcat::mcset nl "Tk Widget Demonstrations" "Demostratie van Tk widgets"
+::msgcat::mcset nl "Tk Widget Demonstrations" "Demonstratie van Tk widgets"
::msgcat::mcset nl "This application provides a front end for several short scripts" \
"Dit programma is een schil rond enkele korte scripts waarmee"
::msgcat::mcset nl "that demonstrate what you can do with Tk widgets. Each of the" \
diff --git a/library/demos/widget b/library/demos/widget
index 1d838ad..65a5074 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -710,10 +710,10 @@ proc PrintTextWin32 {filename} {
proc tkAboutDialog {} {
tk_messageBox -icon info -type ok -title [mc "About Widget Demo"] \
-message [mc "Tk widget demonstration application"] -detail \
-"[mc "Copyright \u00a9 %s" {1996-1997 Sun Microsystems, Inc.}]
-[mc "Copyright \u00a9 %s" {1997-2000 Ajuba Solutions, Inc.}]
-[mc "Copyright \u00a9 %s" {2001-2009 Donal K. Fellows}]
-[mc "Copyright \u00a9 %s" {2002-2007 Daniel A. Steffen}]"
+"[mc \"Copyright\ \u00a9\ %s\" {1996-1997 Sun Microsystems, Inc.}]
+[mc \"Copyright\ \u00a9\ %s\" {1997-2000 Ajuba Solutions, Inc.}]
+[mc \"Copyright\ \u00a9\ %s\" {2001-2009 Donal K. Fellows}]
+[mc \"Copyright\ \u00a9\ %s\" {2002-2007 Daniel A. Steffen}]"
}
# Local Variables: