Subject: clean up menu language

From: William Joye <[email-masked]>
Date: Thu, 12 Dec 2019 17:13:04 -0500

---
 ds9/library/catcdssrchdialog.tcl | 11 ++++++-----
 ds9/library/catdialog.tcl        | 14 +++++++-------
 ds9/library/catsym.tcl           |  8 ++++----
 ds9/library/colorbar.tcl         | 14 +++++++-------
 ds9/library/mask.tcl             |  4 ++--
 ds9/library/mregion.tcl          |  6 +++---
 ds9/library/wcs.tcl              |  8 ++++----
 ds9/msgs/cs.msg                  |  1 -
 ds9/msgs/da.msg                  |  1 -
 ds9/msgs/de.msg                  |  1 -
 ds9/msgs/es.msg                  |  1 -
 ds9/msgs/fr.msg                  |  1 -
 ds9/msgs/ja.msg                  |  1 -
 ds9/msgs/pt.msg                  |  1 -
 ds9/msgs/zh.msg                  |  1 -
 15 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/ds9/library/catcdssrchdialog.tcl b/ds9/library/catcdssrchdialog.tcl
index 853cc7d..75c5dda 100644
--- a/ds9/library/catcdssrchdialog.tcl
+++ b/ds9/library/catcdssrchdialog.tcl
@@ -59,20 +59,21 @@ proc CATCDSSrchDialog {varname} {
     # file
     $mb add cascade -label [msgcat::mc {File}] -menu $mb.file
     menu $mb.file
+    $mb.file add command -label "[msgcat::mc {Open}]..." \
+	-command "CATCDSSrchLoadFile $varname"
+    $mb.file add command -label "[msgcat::mc {Save}]..." \
+	-command "CATCDSSrchSaveFile $varname" -accelerator "${ds9(ctrl)}S"
+    $mb.file add separator
     $mb.file add command -label [msgcat::mc {Retrieve}] \
 	-command "CATCDSSrchApply $varname"
     $mb.file add command -label [msgcat::mc {Cancel}] \
 	-command "ARCancel $varname"
+    $mb.file add separator
     $mb.file add command -label [msgcat::mc {Load}] \
 	-command "CATCDSSrchCatalog $varname"
     $mb.file add command -label [msgcat::mc {Clear}] \
 	-command "CATCDSSrchClear $varname"
     $mb.file add separator
-    $mb.file add command -label "[msgcat::mc {Load}]..." \
-	-command "CATCDSSrchLoadFile $varname"
-    $mb.file add command -label "[msgcat::mc {Save}]..." \
-	-command "CATCDSSrchSaveFile $varname" -accelerator "${ds9(ctrl)}S"
-    $mb.file add separator
     $mb.file add command -label [msgcat::mc {Close}] \
 	-command "CATCDSSrchDestroy $varname" -accelerator "${ds9(ctrl)}W"
 
diff --git a/ds9/library/catdialog.tcl b/ds9/library/catdialog.tcl
index ded585c..057ba40 100644
--- a/ds9/library/catdialog.tcl
+++ b/ds9/library/catdialog.tcl
@@ -109,7 +109,7 @@ proc CATDialog {varname format catalog title action} {
 
     # file
     menu $mb.file
-    $mb.file add command -label "[msgcat::mc {Load}]..." \
+    $mb.file add command -label "[msgcat::mc {Open}]..." \
 	-command [list CATLoadVOTFile $varname]
     $mb.file add command -label "[msgcat::mc {Save}]..." \
 	-command [list CATSaveVOTFile $varname] -accelerator "${ds9(ctrl)}S"
@@ -440,7 +440,7 @@ proc CATDialog {varname format catalog title action} {
     # Buttons
     set f [ttk::frame $w.buttons]
 
-    ButtonButton $f.load [msgcat::mc {Load}] [list CATLoadVOTFile $varname]
+    ButtonButton $f.load [msgcat::mc {Open}] [list CATLoadVOTFile $varname]
     ButtonButton $f.save [msgcat::mc {Save}] [list CATSaveVOTFile $varname]
 
     set var(apply) [ttk::button $f.apply \
@@ -1090,16 +1090,16 @@ proc CATEditDialog {varname which db} {
     # file
     $mb add cascade -label [msgcat::mc {File}] -menu $mb.file
     menu $mb.file
+    $mb.file add command -label "[msgcat::mc {Open}]..." \
+	-command CATEditLoad
+    $mb.file add command -label "[msgcat::mc {Save}]..." \
+	-command CATEditSave
+    $mb.file add separator
     $mb.file add command -label [msgcat::mc {Apply}] \
 	-command {set ed(ok) 1}
     $mb.file add command -label [msgcat::mc {Clear}] \
 	-command CATEditClear
     $mb.file add separator
-    $mb.file add command -label "[msgcat::mc {Load}]..." \
-	-command CATEditLoad
-    $mb.file add command -label "[msgcat::mc {Save}]..." \
-	-command CATEditSave
-    $mb.file add separator
     $mb.file add command -label [msgcat::mc {Cancel}] \
 	-command {set ed(ok) 0}
 
diff --git a/ds9/library/catsym.tcl b/ds9/library/catsym.tcl
index 2f334fd..5a08bea 100644
--- a/ds9/library/catsym.tcl
+++ b/ds9/library/catsym.tcl
@@ -81,14 +81,14 @@ proc CATSymDialog {parent} {
 
     # menu
     menu $mb.file
-    $mb.file add command -label [msgcat::mc {Apply}] \
-	-command "CATSymApply $varname"
-    $mb.file add separator
-    $mb.file add command -label "[msgcat::mc {Load}]..." \
+    $mb.file add command -label "[msgcat::mc {Open}]..." \
 	-command "CATSymLoad $varname"
     $mb.file add command -label "[msgcat::mc {Save}]..." \
 	-command "CATSymSave $varname" -accelerator "${ds9(ctrl)}S"
     $mb.file add separator
+    $mb.file add command -label [msgcat::mc {Apply}] \
+	-command "CATSymApply $varname"
+    $mb.file add separator
     $mb.file add command -label [msgcat::mc {Add}] \
 	-command "CATSymAdd $varname"
     $mb.file add command -label [msgcat::mc {Delete}] \
diff --git a/ds9/library/colorbar.tcl b/ds9/library/colorbar.tcl
index 8057c19..088a9af 100644
--- a/ds9/library/colorbar.tcl
+++ b/ds9/library/colorbar.tcl
@@ -817,14 +817,14 @@ proc ColormapDialog {} {
     $mb add cascade -label [msgcat::mc {Color}] -menu $mb.color
 
     menu $mb.file
-    $mb.file add command -label [msgcat::mc {Apply}] \
-	-command ApplyColormap
-    $mb.file add separator
-    $mb.file add command -label "[msgcat::mc {Load}]..." \
+    $mb.file add command -label "[msgcat::mc {Open}]..." \
 	-command LoadColormap
     $mb.file add command -label "[msgcat::mc {Save}]..." \
 	-command SaveColormap -accelerator "${ds9(ctrl)}S"
     $mb.file add separator
+    $mb.file add command -label [msgcat::mc {Apply}] \
+	-command ApplyColormap
+    $mb.file add separator
     $mb.file add command -label "[msgcat::mc {Download Colormap}]..." \
 	-command {HV cpt CPT-CITY http://soliton.vm.bytemark.co.uk/pub/cpt-city}
     $mb.file add separator
@@ -1028,7 +1028,7 @@ proc UpdateColorDialog {} {
 		base -
 		3d {
 		    $icolorbar(mb).file entryconfig \
-			"[msgcat::mc {Load}]..." -state normal
+			"[msgcat::mc {Open}]..." -state normal
 		    $icolorbar(mb).file entryconfig \
 			"[msgcat::mc {Save}]..." -state normal
 		    for {set ii $icolorbar(start)} {$ii<$end} {incr ii} {
@@ -1049,7 +1049,7 @@ proc UpdateColorDialog {} {
 		}
 		rgb {
 		    $icolorbar(mb).file entryconfig \
-			"[msgcat::mc {Load}]..." -state disabled
+			"[msgcat::mc {Open}]..." -state disabled
 		    $icolorbar(mb).file entryconfig \
 			"[msgcat::mc {Save}]..." -state disabled
 		    for {set ii $icolorbar(start)} {$ii<$end} {incr ii} {
@@ -1071,7 +1071,7 @@ proc UpdateColorDialog {} {
 	    }
 	} else {
 	    $icolorbar(mb).file entryconfig \
-		"[msgcat::mc {Load}]..." -state normal
+		"[msgcat::mc {Open}]..." -state normal
 	    $icolorbar(mb).file entryconfig \
 		"[msgcat::mc {Save}]..." -state normal
 	    for {set ii $icolorbar(start)} {$ii<$end} {incr ii} {
diff --git a/ds9/library/mask.tcl b/ds9/library/mask.tcl
index 97faa98..bdbe969 100644
--- a/ds9/library/mask.tcl
+++ b/ds9/library/mask.tcl
@@ -102,9 +102,9 @@ proc MaskDialog {} {
     $mb add cascade -label [msgcat::mc {Align}] -menu $mb.align
 
     menu $mb.file
-    $mb.file add command -label "[msgcat::mc {Load}]..." \
+    $mb.file add command -label "[msgcat::mc {Open}]..." \
 	-command [list OpenDialog fits mask]
-    $mb.file add cascade -label [msgcat::mc {Load as}] \
+    $mb.file add cascade -label [msgcat::mc {Open as}] \
 	-menu $mb.file.open
     $mb.file add separator
     $mb.file add cascade -label [msgcat::mc {Import}] \
diff --git a/ds9/library/mregion.tcl b/ds9/library/mregion.tcl
index fa4d4d9..434d859 100644
--- a/ds9/library/mregion.tcl
+++ b/ds9/library/mregion.tcl
@@ -140,7 +140,7 @@ proc RegionMainMenu {} {
     CreateFOVMenu
 
     menu $ds9(mb).region.template
-    $ds9(mb).region.template add command -label "[msgcat::mc {Load}]..." \
+    $ds9(mb).region.template add command -label "[msgcat::mc {Open}]..." \
 	-command OpenTemplateMarker
     $ds9(mb).region.template add command -label "[msgcat::mc {Save}]..." \
 	-command SaveAsTemplateMarker
@@ -826,7 +826,7 @@ proc CreateButtonsRegion {} {
     ButtonButton $ds9(buttons).region.list \
 	[string tolower [msgcat::mc {List}]] MarkerList
     ButtonButton $ds9(buttons).region.load \
-	[string tolower [msgcat::mc {Load}]] MarkerLoad
+	[string tolower [msgcat::mc {Open}]] MarkerLoad
     ButtonButton $ds9(buttons).region.deleteload \
 	[string tolower [msgcat::mc {Delete Load}]] MarkerDeleteLoad
 
@@ -1026,7 +1026,7 @@ proc PrefsDialogButtonbarRegion {f} {
 	-command {UpdateButtons buttons(region)}
 
     menu $m.template
-    $m.template add checkbutton -label "[msgcat::mc {Load}]..." \
+    $m.template add checkbutton -label "[msgcat::mc {Open}]..." \
 	-variable pbuttons(region,loadtemplate) \
 	-command {UpdateButtons buttons(region)}
     $m.template add checkbutton -label "[msgcat::mc {Save}]..." \
diff --git a/ds9/library/wcs.tcl b/ds9/library/wcs.tcl
index c446b93..d2e1bbc 100644
--- a/ds9/library/wcs.tcl
+++ b/ds9/library/wcs.tcl
@@ -168,14 +168,14 @@ proc WCSDialog {} {
     $mb add cascade -label [msgcat::mc {Extention}] -menu $mb.ext
 
     menu $mb.file
-    $mb.file add command -label [msgcat::mc {Apply}] -command WCSApplyDialog
-    $mb.file add command -label [msgcat::mc {Reset}] -command WCSResetDialog
-    $mb.file add separator
-    $mb.file add command -label "[msgcat::mc {Load}]..." \
+    $mb.file add command -label "[msgcat::mc {Open}]..." \
 	-command WCSLoadDialog
     $mb.file add command -label "[msgcat::mc {Save}]..." \
 	-command WCSSaveDialog -accelerator "${ds9(ctrl)}S"
     $mb.file add separator
+    $mb.file add command -label [msgcat::mc {Apply}] -command WCSApplyDialog
+    $mb.file add command -label [msgcat::mc {Reset}] -command WCSResetDialog
+    $mb.file add separator
     $mb.file add command -label [msgcat::mc {Close}] \
 	-command WCSDestroyDialog -accelerator "${ds9(ctrl)}W"
 
diff --git a/ds9/msgs/cs.msg b/ds9/msgs/cs.msg
index 17e0cfb..629a8d5 100644
--- a/ds9/msgs/cs.msg
+++ b/ds9/msgs/cs.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset cs {Load Mosaic} 
 ::msgcat::mcset cs {Load Regions} [encoding convertfrom iso8859-2 {Nahrát oblasti}]
 ::msgcat::mcset cs {Load Template} 
-::msgcat::mcset cs {Load as} 
 ::msgcat::mcset cs {Load into All Frames} 
 ::msgcat::mcset cs {Load into Current Frame} 
 ::msgcat::mcset cs {Loading Catalog} 
diff --git a/ds9/msgs/da.msg b/ds9/msgs/da.msg
index da42434..4447b38 100644
--- a/ds9/msgs/da.msg
+++ b/ds9/msgs/da.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset da {Load Mosaic} [encoding convertfrom iso8859-1 {Indlæs mosaik}]
 ::msgcat::mcset da {Load Regions} [encoding convertfrom iso8859-1 {Indlæs områder}]
 ::msgcat::mcset da {Load Template} [encoding convertfrom iso8859-1 {Indlæs skabelon}]
-::msgcat::mcset da {Load as} 
 ::msgcat::mcset da {Load into All Frames} 
 ::msgcat::mcset da {Load into Current Frame} 
 ::msgcat::mcset da {Loading Catalog} 
diff --git a/ds9/msgs/de.msg b/ds9/msgs/de.msg
index ee8fbcc..baed58f 100644
--- a/ds9/msgs/de.msg
+++ b/ds9/msgs/de.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset de {Load Mosaic} {Mosaic laden}
 ::msgcat::mcset de {Load Regions} {Regionen laden}
 ::msgcat::mcset de {Load Template} {Vorlage laden}
-::msgcat::mcset de {Load as} 
 ::msgcat::mcset de {Load into All Frames} 
 ::msgcat::mcset de {Load into Current Frame} 
 ::msgcat::mcset de {Loading Catalog} 
diff --git a/ds9/msgs/es.msg b/ds9/msgs/es.msg
index bb5f476..fbbb5b4 100644
--- a/ds9/msgs/es.msg
+++ b/ds9/msgs/es.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset es {Load Mosaic} {Cargar mosaico}
 ::msgcat::mcset es {Load Regions} {Cargar regiones}
 ::msgcat::mcset es {Load Template} {Cargar modelo}
-::msgcat::mcset es {Load as} 
 ::msgcat::mcset es {Load into All Frames} 
 ::msgcat::mcset es {Load into Current Frame} 
 ::msgcat::mcset es {Loading Catalog} 
diff --git a/ds9/msgs/fr.msg b/ds9/msgs/fr.msg
index a2046ee..7061daf 100644
--- a/ds9/msgs/fr.msg
+++ b/ds9/msgs/fr.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset fr {Load Mosaic} [encoding convertfrom iso8859-1 {Charger le mosaïque}]
 ::msgcat::mcset fr {Load Regions} [encoding convertfrom iso8859-1 {Charger les régions}]
 ::msgcat::mcset fr {Load Template} {Charger le patron}
-::msgcat::mcset fr {Load as} 
 ::msgcat::mcset fr {Load into All Frames} 
 ::msgcat::mcset fr {Load into Current Frame} 
 ::msgcat::mcset fr {Loading Catalog} 
diff --git a/ds9/msgs/ja.msg b/ds9/msgs/ja.msg
index 07e6b75..b6ab110 100644
--- a/ds9/msgs/ja.msg
+++ b/ds9/msgs/ja.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset ja {Load Mosaic} [encoding convertfrom euc-jp "\xa5\xe2\xa5\xb6\xa5\xa4\xa5\xaf\xa4\xce\xc6\xc9\xa4\xdf\xb9\xfe\xa4\xdf"]
 ::msgcat::mcset ja {Load Regions} [encoding convertfrom euc-jp "\xce\xce\xb0\xe8\xa4\xce\xc6\xc9\xa4\xdf\xb9\xfe\xa4\xdf"]
 ::msgcat::mcset ja {Load Template} [encoding convertfrom euc-jp "\xbf\xf7\xb7\xc1\xa4\xce\xc6\xc9\xa4\xdf\xb9\xfe\xa4\xdf"]
-::msgcat::mcset ja {Load as} 
 ::msgcat::mcset ja {Load into All Frames} [encoding convertfrom euc-jp "\xc1\xb4\xa4\xc6\xa4\xce\xa5\xd5\xa5\xec\xa1\xbc\xa5\xe0\xa4\xcb\xc6\xc9\xa4\xdf\xb9\xfe\xa4\xdf"]
 ::msgcat::mcset ja {Load into Current Frame} [encoding convertfrom euc-jp "\xc1\xaa\xc2\xf2\xc3\xe6\xa4\xce\xa5\xd5\xa5\xec\xa1\xbc\xa5\xe0\xa4\xcb\xc6\xc9\xa4\xdf\xb9\xfe\xa4\xdf"]
 ::msgcat::mcset ja {Loading Catalog} [encoding convertfrom euc-jp "\xa5\xab\xa5\xbf\xa5\xed\xa5\xb0\xa4\xf2\xc6\xc9\xa4\xdf\xb9\xfe\xa4\xdf\xc3\xe6"]
diff --git a/ds9/msgs/pt.msg b/ds9/msgs/pt.msg
index 2e37eaa..bf916f2 100644
--- a/ds9/msgs/pt.msg
+++ b/ds9/msgs/pt.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset pt {Load Mosaic} {Carregar Mosaico}
 ::msgcat::mcset pt {Load Regions} [encoding convertfrom iso8859-1 {Carregar Regiões}]
 ::msgcat::mcset pt {Load Template} {Carregar Template}
-::msgcat::mcset pt {Load as} 
 ::msgcat::mcset pt {Load into All Frames} 
 ::msgcat::mcset pt {Load into Current Frame} 
 ::msgcat::mcset pt {Loading Catalog} 
diff --git a/ds9/msgs/zh.msg b/ds9/msgs/zh.msg
index 0de6041..a1756f4 100644
--- a/ds9/msgs/zh.msg
+++ b/ds9/msgs/zh.msg
@@ -416,7 +416,6 @@
 ::msgcat::mcset zh {Load Mosaic} 
 ::msgcat::mcset zh {Load Regions} [encoding convertfrom big5 "\xB8\xFC \xA4\x4A \xB0\xCF \xB0\xEC"]
 ::msgcat::mcset zh {Load Template} 
-::msgcat::mcset zh {Load as} 
 ::msgcat::mcset zh {Load into All Frames} 
 ::msgcat::mcset zh {Load into Current Frame} 
 ::msgcat::mcset zh {Loading Catalog} 
-- 
cgit v0.12