summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ds9/library/ds9.tcl16
-rw-r--r--ds9/library/graph.tcl34
-rw-r--r--ds9/library/mfile.tcl74
-rw-r--r--ds9/library/plotdata.tcl4
-rw-r--r--ds9/library/plotdialog.tcl25
-rw-r--r--ds9/library/plotstate.tcl4
-rw-r--r--ds9/library/scale.tcl14
-rw-r--r--ds9/msgs/cs.msg4
-rw-r--r--ds9/msgs/da.msg4
-rw-r--r--ds9/msgs/de.msg4
-rw-r--r--ds9/msgs/es.msg4
-rw-r--r--ds9/msgs/fr.msg4
-rw-r--r--ds9/msgs/ja.msg4
-rw-r--r--ds9/msgs/pt.msg4
-rw-r--r--ds9/msgs/zh.msg4
15 files changed, 58 insertions, 145 deletions
diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index da92c2f..57bba29 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -80,8 +80,6 @@ proc DS9Def {} {
# ds9(background) color of bg, canvas
# ds9(gui,fg) color of gui fg
# ds9(gui,bg) color of gui bg
- # ds9(plot,fg) color of plot fg
- # ds9(plot,bg) color of plot bg
# ds9(bg) color of frame bg
set ds9(bg) white
@@ -187,8 +185,6 @@ switch $ds9(wm) {
set ds9(background) white
set ds9(gui,fg) black
set ds9(gui,bg) #d9d9d9
- set ds9(plot,fg) black
- set ds9(plot,bg) white
# standard widgets
option add {*background} $ds9(gui,bg)
@@ -216,16 +212,12 @@ switch $ds9(wm) {
set ds9(background) white
set ds9(gui,fg) black
set ds9(gui,bg) white
- set ds9(plot,fg) black
- set ds9(plot,bg) white
}
win32 {
set ds9(foreground) black
set ds9(background) white
set ds9(gui,fg) black
set ds9(gui,bg) white
- set ds9(plot,fg) black
- set ds9(plot,bg) white
ttk::style theme use xpnative
}
@@ -442,22 +434,18 @@ switch $ds9(wm) {
set ds9(background) #222
set ds9(gui,fg) $ds9(foreground)
set ds9(gui,bg) $ds9(background)
- set ds9(plot,fg) $ds9(foreground)
- set ds9(plot,bg) $ds9(background)
} else {
set ds9(foreground) black
set ds9(background) white
set ds9(gui,fg) black
set ds9(gui,bg) white
- set ds9(plot,fg) black
- set ds9(plot,bg) white
}
global pds9
set ds9(bg) $ds9(background)
set pds9(bg) $ds9(background)
global pap
- set pap(foreground) $ds9(plot,fg)
- set pap(background) $ds9(plot,bg)
+ set pap(foreground) $ds9(foreground)
+ set pap(background) $ds9(background)
}
}
diff --git a/ds9/library/graph.tcl b/ds9/library/graph.tcl
index 20f6926..067c151 100644
--- a/ds9/library/graph.tcl
+++ b/ds9/library/graph.tcl
@@ -54,9 +54,9 @@ proc CreateGraphs {} {
set ds9(graph,horz) [blt::graph $ds9(main).horz \
-width $canvas(width) -height $igraph(size) \
-takefocus 0 \
- -background $ds9(plot,bg) \
- -plotbackground $ds9(plot,bg) \
- -foreground $ds9(plot,fg) \
+ -background $ds9(background) \
+ -plotbackground $ds9(background) \
+ -foreground $ds9(foreground) \
-highlightthickness 0 \
-font [font actual TkDefaultFont] \
-plotpadx 0 -plotpady 0 \
@@ -67,18 +67,18 @@ proc CreateGraphs {} {
$ds9(graph,horz) crosshairs configure -color green
$ds9(graph,horz) xaxis configure -hide no -showticks no -linewidth 0 \
- -bg $ds9(plot,bg) -color $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground)
$ds9(graph,horz) x2axis configure -hide yes \
- -bg $ds9(plot,bg) -color $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground)
$ds9(graph,horz) yaxis configure -hide yes \
- -bg $ds9(plot,bg) -color $ds9(plot,fg)
- $ds9(graph,horz) y2axis configure -hide no -bg $ds9(plot,bg) \
+ -bg $ds9(background) -color $ds9(foreground)
+ $ds9(graph,horz) y2axis configure -hide no -bg $ds9(background) \
-tickfont [font actual TkDefaultFont] \
- -bg $ds9(plot,bg) -color $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground)
$ds9(graph,horz) element create line1 \
-xdata graphHorzX -ydata graphHorzY -symbol none \
- -color $ds9(plot,fg)
+ -color $ds9(foreground)
bind $ds9(graph,horz) <Enter> [list EnterGraph $ds9(graph,horz) 1]
bind $ds9(graph,horz) <Leave> [list LeaveGraph $ds9(graph,horz)]
@@ -96,9 +96,9 @@ proc CreateGraphs {} {
-invertxy yes \
-width $igraph(size) -height $canvas(height) \
-takefocus 0 \
- -background $ds9(plot,bg) \
- -plotbackground $ds9(plot,bg) \
- -foreground $ds9(plot,fg) \
+ -background $ds9(background) \
+ -plotbackground $ds9(background) \
+ -foreground $ds9(foreground) \
-highlightthickness 0 \
-borderwidth 0 \
-font [font actual TkDefaultFont] \
@@ -108,20 +108,20 @@ proc CreateGraphs {} {
$ds9(graph,vert) crosshairs configure -color green
$ds9(graph,vert) xaxis configure -hide yes -descending yes \
- -bg $ds9(plot,bg) -color $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground)
$ds9(graph,vert) x2axis configure -hide no -descending yes \
-showticks no -linewidth 0 \
- -bg $ds9(plot,bg) -color $ds9(plot,fg) \
+ -bg $ds9(background) -color $ds9(foreground) \
$ds9(graph,vert) yaxis configure -hide no -descending yes \
-tickfont [font actual TkDefaultFont] \
- -bg $ds9(plot,bg) -color $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground)
$ds9(graph,vert) y2axis configure -hide yes -descending yes \
- -bg $ds9(plot,bg) -color $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground)
$ds9(graph,vert) element create line1 \
-xdata graphVertX -ydata graphVertY -symbol none \
- -color $ds9(plot,fg)
+ -color $ds9(foreground)
bind $ds9(graph,vert) <Enter> [list EnterGraph $ds9(graph,vert) 0]
bind $ds9(graph,vert) <Leave> [list LeaveGraph $ds9(graph,vert)]
diff --git a/ds9/library/mfile.tcl b/ds9/library/mfile.tcl
index b0a8eaa..7b3390c 100644
--- a/ds9/library/mfile.tcl
+++ b/ds9/library/mfile.tcl
@@ -50,32 +50,11 @@ proc FileMainMenu {} {
$ds9(mb).file add command -label "[msgcat::mc {Source TCL}]..." \
-command OpenSource
$ds9(mb).file add separator
- switch $ds9(wm) {
- x11 -
- aqua -
- win32 {
- $ds9(mb).file add command -label "[msgcat::mc {Page Setup}]..." \
- -command PSPageSetup -accelerator "${ds9(shiftctrl)}P"
- $ds9(mb).file add command -label "[msgcat::mc {Print}]..." \
- -command PSPrint -accelerator "${ds9(ctrl)}P"
- }
- foo {
- # accelerators don't work with dialog box
- $ds9(mb).file add command \
- -label "[msgcat::mc {Postscript Page Setup}]..." \
- -command PSPageSetup
- $ds9(mb).file add command \
- -label "[msgcat::mc {Postscript Print}]..." \
- -command PSPrint
- $ds9(mb).file add separator
- $ds9(mb).file add command \
- -label "[msgcat::mc {Page Setup}]..." \
- -command MacOSXPageSetup
- $ds9(mb).file add command \
- -label "[msgcat::mc {Print}]..." \
- -command MacOSXPrint
- }
- }
+ $ds9(mb).file add command -label "[msgcat::mc {Page Setup}]..." \
+ -command PSPageSetup -accelerator "${ds9(shiftctrl)}P"
+ $ds9(mb).file add command -label "[msgcat::mc {Print}]..." \
+ -command PSPrint -accelerator "${ds9(ctrl)}P"
+
switch $ds9(wm) {
x11 -
win32 {
@@ -435,41 +414,14 @@ proc PrefsDialogButtonbarFile {f} {
$m add checkbutton -label "[msgcat::mc {Source TCL}]..." \
-variable pbuttons(file,tcl) -command {UpdateButtons buttons(file)}
$m add separator
-
- switch $ds9(wm) {
- x11 -
- aqua -
- win32 {
- $m add checkbutton \
- -label "[msgcat::mc {Page Setup}]..." \
- -variable pbuttons(file,page) \
- -command {UpdateButtons buttons(file)}
- $m add checkbutton \
- -label "[msgcat::mc {Print}]..." \
- -variable pbuttons(file,print) \
- -command {UpdateButtons buttons(file)}
- }
- foo {
- $m add checkbutton \
- -label "[msgcat::mc {Postscript Page Setup}]..." \
- -variable pbuttons(file,pspage) \
- -command {UpdateButtons buttons(file)}
- $m add checkbutton \
- -label "[msgcat::mc {Postscript Print}]..." \
- -variable pbuttons(file,psprint) \
- -command {UpdateButtons buttons(file)}
- $m add separator
- $m add checkbutton \
- -label "[msgcat::mc {Page Setup}]..." \
- -variable pbuttons(file,page) \
- -command {UpdateButtons buttons(file)}
- $m add checkbutton \
- -label "[msgcat::mc {Print}]..." \
- -variable pbuttons(file,print) \
- -command {UpdateButtons buttons(file)}
- }
- }
-
+ $m add checkbutton \
+ -label "[msgcat::mc {Page Setup}]..." \
+ -variable pbuttons(file,page) \
+ -command {UpdateButtons buttons(file)}
+ $m add checkbutton \
+ -label "[msgcat::mc {Print}]..." \
+ -variable pbuttons(file,print) \
+ -command {UpdateButtons buttons(file)}
$m add separator
$m add checkbutton -label [msgcat::mc {Exit}] \
-variable pbuttons(file,exit) -command {UpdateButtons buttons(filew)}
diff --git a/ds9/library/plotdata.tcl b/ds9/library/plotdata.tcl
index 94685c9..c719a35 100644
--- a/ds9/library/plotdata.tcl
+++ b/ds9/library/plotdata.tcl
@@ -247,8 +247,8 @@ proc PlotExternal {varname dim} {
set var(graph,ds,dim) $dim
- set var(graph,ds,color) $ds9(plot,fg)
- set var(graph,ds,fill,color) $ds9(plot,fg)
+ set var(graph,ds,color) $ds9(foreground)
+ set var(graph,ds,fill,color) $ds9(foreground)
PlotAddElement $varname
}
diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl
index e253c1d..0bb214e 100644
--- a/ds9/library/plotdialog.tcl
+++ b/ds9/library/plotdialog.tcl
@@ -57,24 +57,11 @@ proc PlotDialog {varname wtt} {
$var(mb).file add command -label "[msgcat::mc {Save Configuration}]..." \
-command [list PlotSaveConfig $varname]
$var(mb).file add separator
- switch $ds9(wm) {
- x11 -
- win32 {
- $var(mb).file add command \
- -label "[msgcat::mc {Page Setup}]..." \
- -command PSPageSetup
- $var(mb).file add command -label "[msgcat::mc {Print}]..." \
- -command [list PlotPSPrint $varname]
- }
- aqua {
- $var(mb).file add command \
- -label "[msgcat::mc {Postscript Page Setup}]..." \
- -command PSPageSetup
- $var(mb).file add command \
- -label "[msgcat::mc {Postscript Print}]..." \
- -command [list PlotPSPrint $varname]
- }
- }
+ $var(mb).file add command \
+ -label "[msgcat::mc {Page Setup}]..." \
+ -command PSPageSetup
+ $var(mb).file add command -label "[msgcat::mc {Print}]..." \
+ -command [list PlotPSPrint $varname]
$var(mb).file add separator
$var(mb).file add command -label [msgcat::mc {Close}] \
-command [list PlotDestroy $varname]
@@ -359,7 +346,7 @@ proc PlotStripDialog {varname} {
set f [ttk::frame $w.param]
ttk::label $f.t -text [msgcat::mc {Scale}]
ttk::entry $f.ww -textvariable ed(layout,strip,scale) -width 6
- ttk::label $f.tt -text [msgcat::mc {%}]
+ ttk::label $f.tt -text {%}
grid $f.t $f.ww $f.tt -padx 2 -pady 2 -sticky w
diff --git a/ds9/library/plotstate.tcl b/ds9/library/plotstate.tcl
index bf56afb..ee80a8a 100644
--- a/ds9/library/plotstate.tcl
+++ b/ds9/library/plotstate.tcl
@@ -19,8 +19,8 @@ proc PlotDefState {} {
set pap(layout,axis,x,log) 0
set pap(layout,axis,x,flip) 0
- set pap(foreground) $ds9(plot,fg)
- set pap(background) $ds9(plot,bg)
+ set pap(foreground) $ds9(foreground)
+ set pap(background) $ds9(background)
set pap(grid,color) gray64
set pap(bar,mode) normal
diff --git a/ds9/library/scale.tcl b/ds9/library/scale.tcl
index adc0e18..8827f73 100644
--- a/ds9/library/scale.tcl
+++ b/ds9/library/scale.tcl
@@ -305,9 +305,9 @@ proc ScaleDialog {} {
# Graph
set dscale(hist) [blt::graph $f.chart \
- -foreground $ds9(plot,fg) \
- -background $ds9(plot,bg) \
- -plotbackground $ds9(plot,bg) \
+ -foreground $ds9(foreground) \
+ -background $ds9(background) \
+ -plotbackground $ds9(background) \
-width 500 \
-height 200 \
-title [msgcat::mc {Pixel Distribution}] \
@@ -320,18 +320,20 @@ proc ScaleDialog {} {
$dscale(hist) xaxis configure -hide yes -grid no -ticklength 3 \
-tickfont [font actual TkDefaultFont] \
- -bg $ds9(plot,bg) -color $ds9(plot,fg) -titlecolor $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground) \
+ -titlecolor $ds9(foreground)
$dscale(hist) yaxis configure -hide yes -grid yes -ticklength 3 \
-tickfont [font actual TkDefaultFont] \
- -bg $ds9(plot,bg) -color $ds9(plot,fg) -titlecolor $ds9(plot,fg)
+ -bg $ds9(background) -color $ds9(foreground) \
+ -titlecolor $ds9(foreground)
set dscale(xdata) histX
set dscale(ydata) histY
blt::vector create $dscale(xdata) $dscale(ydata)
$dscale(hist) element create bar1 -smooth step \
-xdata $dscale(xdata) -ydata $dscale(ydata) \
- -areabackground $ds9(plot,fg) -color $ds9(plot,fg)
+ -areabackground $ds9(foreground) -color $ds9(foreground)
# Cut Lines
$dscale(hist) marker bind min <B1-Motion> \
diff --git a/ds9/msgs/cs.msg b/ds9/msgs/cs.msg
index 99e3f53..5b598a6 100644
--- a/ds9/msgs/cs.msg
+++ b/ds9/msgs/cs.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset cs {%}
::msgcat::mcset cs {2D}
::msgcat::mcset cs {3D View}
::msgcat::mcset cs {3D}
@@ -302,6 +301,7 @@
::msgcat::mcset cs {Flat}
::msgcat::mcset cs {Font} [encoding convertfrom iso8859-2 {Znak}]
::msgcat::mcset cs {For more information, use --help} [encoding convertfrom iso8859-2 {Pro více informací, pou¾ijte --help}]
+::msgcat::mcset cs {Forground}
::msgcat::mcset cs {Format} [encoding convertfrom iso8859-2 {Formát}]
::msgcat::mcset cs {Forward} [encoding convertfrom iso8859-2 {Vpøed}]
::msgcat::mcset cs {Found} [encoding convertfrom iso8859-2 {Nalezeno}]
@@ -621,8 +621,6 @@
::msgcat::mcset cs {Polygon}
::msgcat::mcset cs {Portrait}
::msgcat::mcset cs {Poster}
-::msgcat::mcset cs {Postscript Page Setup}
-::msgcat::mcset cs {Postscript Print}
::msgcat::mcset cs {Postscript}
::msgcat::mcset cs {Power} [encoding convertfrom iso8859-2 {Mocninové}]
::msgcat::mcset cs {Precision}
diff --git a/ds9/msgs/da.msg b/ds9/msgs/da.msg
index c55294f..36231f9 100644
--- a/ds9/msgs/da.msg
+++ b/ds9/msgs/da.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset da {%}
::msgcat::mcset da {2D}
::msgcat::mcset da {3D View}
::msgcat::mcset da {3D}
@@ -302,6 +301,7 @@
::msgcat::mcset da {Flat}
::msgcat::mcset da {Font} {Skrifttype}
::msgcat::mcset da {For more information, use --help}
+::msgcat::mcset da {Forground}
::msgcat::mcset da {Format} {Format}
::msgcat::mcset da {Forward} {Videre}
::msgcat::mcset da {Found} {Fundet}
@@ -621,8 +621,6 @@
::msgcat::mcset da {Polygon} {Polygon}
::msgcat::mcset da {Portrait} [encoding convertfrom iso8859-1 {Portræt}]
::msgcat::mcset da {Poster} {Plakat}
-::msgcat::mcset da {Postscript Page Setup} [encoding convertfrom iso8859-1 {Postscript side opsætning}]
-::msgcat::mcset da {Postscript Print} {Postscript udskriv}
::msgcat::mcset da {Postscript}
::msgcat::mcset da {Power} {Potenslov}
::msgcat::mcset da {Precision}
diff --git a/ds9/msgs/de.msg b/ds9/msgs/de.msg
index 257f9a0..264ae4c 100644
--- a/ds9/msgs/de.msg
+++ b/ds9/msgs/de.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset de {%}
::msgcat::mcset de {2D}
::msgcat::mcset de {3D View}
::msgcat::mcset de {3D}
@@ -302,6 +301,7 @@
::msgcat::mcset de {Flat}
::msgcat::mcset de {Font}
::msgcat::mcset de {For more information, use --help}
+::msgcat::mcset de {Forground}
::msgcat::mcset de {Format}
::msgcat::mcset de {Forward} [encoding convertfrom iso8859-1 {Vorwärts}]
::msgcat::mcset de {Found} {Gefunden}
@@ -621,8 +621,6 @@
::msgcat::mcset de {Polygon}
::msgcat::mcset de {Portrait} {Vertikal}
::msgcat::mcset de {Poster}
-::msgcat::mcset de {Postscript Page Setup}
-::msgcat::mcset de {Postscript Print}
::msgcat::mcset de {Postscript}
::msgcat::mcset de {Power} {Exp}
::msgcat::mcset de {Precision}
diff --git a/ds9/msgs/es.msg b/ds9/msgs/es.msg
index 9f09f9c..6c5623d 100644
--- a/ds9/msgs/es.msg
+++ b/ds9/msgs/es.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset es {%}
::msgcat::mcset es {2D}
::msgcat::mcset es {3D View}
::msgcat::mcset es {3D}
@@ -302,6 +301,7 @@
::msgcat::mcset es {Flat}
::msgcat::mcset es {Font} {Fuente}
::msgcat::mcset es {For more information, use --help}
+::msgcat::mcset es {Forground}
::msgcat::mcset es {Format} {Formato}
::msgcat::mcset es {Forward} {Hacia adelante}
::msgcat::mcset es {Found} {Hallado}
@@ -621,8 +621,6 @@
::msgcat::mcset es {Polygon} [encoding convertfrom iso8859-1 {Polígono}]
::msgcat::mcset es {Portrait}
::msgcat::mcset es {Poster} [encoding convertfrom iso8859-1 {Póster}]
-::msgcat::mcset es {Postscript Page Setup} [encoding convertfrom iso8859-1 {Setup para Página Postscript}]
-::msgcat::mcset es {Postscript Print} {Imprimir Postscript}
::msgcat::mcset es {Postscript}
::msgcat::mcset es {Power} {Potencia}
::msgcat::mcset es {Precision}
diff --git a/ds9/msgs/fr.msg b/ds9/msgs/fr.msg
index 4bd10cf..995ab30 100644
--- a/ds9/msgs/fr.msg
+++ b/ds9/msgs/fr.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset fr {%}
::msgcat::mcset fr {2D}
::msgcat::mcset fr {3D View}
::msgcat::mcset fr {3D}
@@ -302,6 +301,7 @@
::msgcat::mcset fr {Flat}
::msgcat::mcset fr {Font} {Police}
::msgcat::mcset fr {For more information, use --help}
+::msgcat::mcset fr {Forground}
::msgcat::mcset fr {Format}
::msgcat::mcset fr {Forward} {En avant}
::msgcat::mcset fr {Found} {Trouvé}
@@ -621,8 +621,6 @@
::msgcat::mcset fr {Polygon} {Polygone}
::msgcat::mcset fr {Portrait}
::msgcat::mcset fr {Poster}
-::msgcat::mcset fr {Postscript Page Setup}
-::msgcat::mcset fr {Postscript Print}
::msgcat::mcset fr {Postscript}
::msgcat::mcset fr {Power} {Puissance}
::msgcat::mcset fr {Precision}
diff --git a/ds9/msgs/ja.msg b/ds9/msgs/ja.msg
index 597f99b..d32fb71 100644
--- a/ds9/msgs/ja.msg
+++ b/ds9/msgs/ja.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset ja {%}
::msgcat::mcset ja {2D}
::msgcat::mcset ja {3D View}
::msgcat::mcset ja {3D} [encoding convertfrom euc-jp "\x33\xbc\xa1\xb8\xb5"]
@@ -302,6 +301,7 @@
::msgcat::mcset ja {Flat}
::msgcat::mcset ja {Font} [encoding convertfrom euc-jp "\xa5\xd5\xa5\xa9\xa5\xf3\xa5\xc8"]
::msgcat::mcset ja {For more information, use --help} [encoding convertfrom euc-jp "\xbe\xdc\xa4\xb7\xa4\xaf\xa4\xcf\x20\x2d\x2d\x68\x65\x6c\x70\x20\xa5\xaa\xa5\xd7\xa5\xb7\xa5\xe7\xa5\xf3\xa4\xc7\xa1\xa3"]
+::msgcat::mcset ja {Forground}
::msgcat::mcset ja {Format} [encoding convertfrom euc-jp "\xb7\xc1\xbc\xb0"]
::msgcat::mcset ja {Forward} [encoding convertfrom euc-jp "\xbc\xa1"]
::msgcat::mcset ja {Found}
@@ -621,8 +621,6 @@
::msgcat::mcset ja {Polygon} [encoding convertfrom euc-jp "\xc2\xbf\xb3\xd1\xb7\xc1"]
::msgcat::mcset ja {Portrait} [encoding convertfrom euc-jp "\xbd\xc4\xc4\xb9"]
::msgcat::mcset ja {Poster} [encoding convertfrom euc-jp "\xa5\xdd\xa5\xb9\xa5\xbf\xa1\xbc"]
-::msgcat::mcset ja {Postscript Page Setup} [encoding convertfrom euc-jp "\xa5\xdd\xa5\xb9\xa5\xc8\xa5\xb9\xa5\xaf\xa5\xea\xa5\xd7\xa5\xc8\xa5\xda\xa1\xbc\xa5\xb8\xc0\xdf\xc4\xea"]
-::msgcat::mcset ja {Postscript Print} [encoding convertfrom euc-jp "\xa5\xdd\xa5\xb9\xa5\xc8\xa5\xb9\xa5\xaf\xa5\xea\xa5\xd7\xa5\xc8\xb0\xf5\xba\xfe"]
::msgcat::mcset ja {Postscript} [encoding convertfrom euc-jp "\xa5\xdd\xa5\xb9\xa5\xc8\xa5\xb9\xa5\xaf\xa5\xea\xa5\xd7\xa5\xc8"]
::msgcat::mcset ja {Power} [encoding convertfrom euc-jp "\xd1\xd1\xbe\xe8"]
::msgcat::mcset ja {Precision}
diff --git a/ds9/msgs/pt.msg b/ds9/msgs/pt.msg
index 252814f..048167a 100644
--- a/ds9/msgs/pt.msg
+++ b/ds9/msgs/pt.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset pt {%}
::msgcat::mcset pt {2D}
::msgcat::mcset pt {3D View}
::msgcat::mcset pt {3D}
@@ -302,6 +301,7 @@
::msgcat::mcset pt {Flat}
::msgcat::mcset pt {Font} {Fonte}
::msgcat::mcset pt {For more information, use --help}
+::msgcat::mcset pt {Forground}
::msgcat::mcset pt {Format} {Formato}
::msgcat::mcset pt {Forward} {Frente}
::msgcat::mcset pt {Found} {Encontrado}
@@ -621,8 +621,6 @@
::msgcat::mcset pt {Polygon} [encoding convertfrom iso8859-1 {Polígono}]
::msgcat::mcset pt {Portrait} {Retrato}
::msgcat::mcset pt {Poster}
-::msgcat::mcset pt {Postscript Page Setup}
-::msgcat::mcset pt {Postscript Print}
::msgcat::mcset pt {Postscript}
::msgcat::mcset pt {Power} [encoding convertfrom iso8859-1 {Potência}]
::msgcat::mcset pt {Precision}
diff --git a/ds9/msgs/zh.msg b/ds9/msgs/zh.msg
index 12c64e8..9dae2aa 100644
--- a/ds9/msgs/zh.msg
+++ b/ds9/msgs/zh.msg
@@ -1,4 +1,3 @@
-::msgcat::mcset zh {%}
::msgcat::mcset zh {2D}
::msgcat::mcset zh {3D View}
::msgcat::mcset zh {3D}
@@ -302,6 +301,7 @@
::msgcat::mcset zh {Flat}
::msgcat::mcset zh {Font}
::msgcat::mcset zh {For more information, use --help}
+::msgcat::mcset zh {Forground}
::msgcat::mcset zh {Format}
::msgcat::mcset zh {Forward}
::msgcat::mcset zh {Found}
@@ -621,8 +621,6 @@
::msgcat::mcset zh {Polygon} [encoding convertfrom big5 "\xA6\x68 \xA8\xA4 \xA7\xCE"]
::msgcat::mcset zh {Portrait}
::msgcat::mcset zh {Poster}
-::msgcat::mcset zh {Postscript Page Setup}
-::msgcat::mcset zh {Postscript Print}
::msgcat::mcset zh {Postscript}
::msgcat::mcset zh {Power} [encoding convertfrom big5 "\xAB\xFC \xBC\xC6"]
::msgcat::mcset zh {Precision}