Tweak localization

1 files changed, 15 insertions, 15 deletions

diff --git a/library/print.tcl b/library/print.tcl
index b10a366..367a140 100644
--- a/library/print.tcl
+++ b/library/print.tcl
@@ -770,8 +770,8 @@ namespace eval ::tk::print {
 
 	    bind $p.frame.printframe.mb <<ComboboxSelected>>  { set chooseprinter}
 
-	    set paperlist [list [mc Letter] [mc Legal] [mc A4]]
-	    set colorlist [list [mc Grayscale] [mc RGB]]
+	    set paperlist [list [::tk::msgcat::mc Letter] [::tk::msgcat::mc Legal] [::tk::msgcat::mc A4]]
+	    set colorlist [list [::tk::msgcat::mc Grayscale] [::tk::msgcat::mc RGB]]
 
 	    #Initialize with sane defaults. Because some of these variables
 	    #are tied to tk_optionMenu, they are global and cannot be tied
@@ -780,20 +780,20 @@ namespace eval ::tk::print {
 	    #possible, we are using namespaced variables.
 
 	    set printcopies 1
-	    set ::tkprint_choosepaper A4
-	    set ::tkprint_color RGB
+	    set ::tkprint_choosepaper [::tk::msgcat::mc A4]
+	    set ::tkprint_color [::tk::msgcat::mc RGB]
 	    set ::tkprint_orientation portrait
 
 	    set percentlist {100 90 80 70 60 50 40 30 20 10}
 
 	    #Base widgets to load.
-	    labelframe $p.frame.copyframe -text [mc "Options"] -padx 5 -pady 5
+	    labelframe $p.frame.copyframe -text [::tk::msgcat::mc "Options"] -padx 5 -pady 5
 	    pack $p.frame.copyframe -fill x -expand no
 
 	    frame $p.frame.copyframe.l -padx 5 -pady 5
 	    pack $p.frame.copyframe.l -side top -fill x -expand no
 
-	    label $p.frame.copyframe.l.copylabel -text [mc "Copies:"]
+	    label $p.frame.copyframe.l.copylabel -text [::tk::msgcat::mc "Copies:"]
 	    spinbox $p.frame.copyframe.l.field -from 1 -to 1000 -textvariable printcopies -width 5
 
 	    pack  $p.frame.copyframe.l.copylabel $p.frame.copyframe.l.field  -side left -fill x -expand  no
@@ -803,7 +803,7 @@ namespace eval ::tk::print {
 	    frame $p.frame.copyframe.r -padx 5 -pady 5
 	    pack $p.frame.copyframe.r -fill x -expand no
 
-	    label $p.frame.copyframe.r.paper -text [mc "Paper:"]
+	    label $p.frame.copyframe.r.paper -text [::tk::msgcat::mc "Paper:"]
 	    tk_optionMenu $p.frame.copyframe.r.menu ::tkprint_choosepaper {*}$paperlist
 
 	    pack $p.frame.copyframe.r.paper $p.frame.copyframe.r.menu -side left -fill x -expand no
@@ -814,7 +814,7 @@ namespace eval ::tk::print {
 		frame $p.frame.copyframe.z -padx 5 -pady 5
 		pack $p.frame.copyframe.z  -fill x -expand no
 
-		label $p.frame.copyframe.z.zlabel -text [mc"Scale %:"]
+		label $p.frame.copyframe.z.zlabel -text [::tk::msgcat::mc "Scale %:"]
 		tk_optionMenu $p.frame.copyframe.z.zentry ::tkprint_zoomnumber {*}$percentlist
 
 		pack $p.frame.copyframe.z.zlabel $p.frame.copyframe.z.zentry -side left -fill x -expand no
@@ -822,16 +822,16 @@ namespace eval ::tk::print {
 		frame $p.frame.copyframe.orient -padx 5 -pady 5
 		pack $p.frame.copyframe.orient  -fill x -expand no
 
-		label $p.frame.copyframe.orient.text -text [mc "Orientation:"]
-		radiobutton $p.frame.copyframe.orient.v -text [mc "Portrait"] -value portrait -variable ::tkprint_printorientation -compound left
-		radiobutton $p.frame.copyframe.orient.h -text [mc "Landscape"]  -value landscape -variable ::tkprint_printorientation -compound left
+		label $p.frame.copyframe.orient.text -text [::tk::msgcat::mc "Orientation:"]
+		radiobutton $p.frame.copyframe.orient.v -text [::tk::msgcat::mc "Portrait"] -value portrait -variable ::tkprint_printorientation -compound left
+		radiobutton $p.frame.copyframe.orient.h -text [::tk::msgcat::mc "Landscape"]  -value landscape -variable ::tkprint_printorientation -compound left
 
 		pack $p.frame.copyframe.orient.text $p.frame.copyframe.orient.v $p.frame.copyframe.orient.h  -side left -fill x -expand no
 
 		frame $p.frame.copyframe.c -padx 5 -pady 5
 		pack $p.frame.copyframe.c  -fill x -expand no
 
-		label $p.frame.copyframe.c.l -text [mc "Output:"]
+		label $p.frame.copyframe.c.l -text [::tk::msgcat::mc "Output:"]
 		tk_optionMenu $p.frame.copyframe.c.c ::tkprint_color {*}$colorlist
 		pack $p.frame.copyframe.c.l $p.frame.copyframe.c.c -side left -fill x -expand no
 	    }
@@ -840,8 +840,8 @@ namespace eval ::tk::print {
 	    frame $p.frame.buttonframe
 	    pack $p.frame.buttonframe -fill x -expand no -side bottom
 
-	    button $p.frame.buttonframe.printbutton -text [mc "Print"] -command "::tk::print::_runprint $w"
-	    button $p.frame.buttonframe.cancel -text [mc "Cancel"] -command {destroy ._print}
+	    button $p.frame.buttonframe.printbutton -text [::tk::msgcat::mc "Print"] -command "::tk::print::_runprint $w"
+	    button $p.frame.buttonframe.cancel -text [::tk::msgcat::mc "Cancel"] -command {destroy ._print}
 
 	    pack $p.frame.buttonframe.printbutton $p.frame.buttonframe.cancel -side right -fill x -expand no
 
@@ -875,7 +875,7 @@ namespace eval ::tk::print {
 	    if {[winfo class $w] eq "Canvas"} {
 
 		set file /tmp/tk_canvas.ps
-		if {$::tkprint_color eq "RGB"} {
+		if {$::tkprint_color eq [::tk::msgcat::mc "RGB"]} {
 		    set colormode color
 		} else {
 		    set colormode gray