move language list to where it belongs... but desire.tk still has several language lists... sorry

svn path=/trunk/; revision=11418

2 files changed, 17 insertions, 17 deletions

diff --git a/desiredata/src/desire.tk b/desiredata/src/desire.tk
index f213b588..0d883cdb 100644
--- a/desiredata/src/desire.tk
+++ b/desiredata/src/desire.tk
@@ -749,13 +749,6 @@ for {set i 0} {$i < $argc} {incr i} {
 
 #set cmdline(server) \"$cmdline(server)\"
 set encoding ""
-set langoptions {
-	english francais deutsch catala espanol portugues italiano bokmal
-	euskara polski dansk chinese nihongo brasileiro turkce nederlands
-	russkij
-
-}
-#lappend langoptions {chinese}
 #lappend langoptions {esperanto}
 set langfile locale/[switch -regexp -- $language {
   ^(en|english|C)$    {list english}
@@ -8252,7 +8245,8 @@ section Client others
     toggle View tooltip
     toggle Wire wirearrow
     integer Client console
-    choice View language
+    language View language
+    language View language2
     integer Canvas pointer_sense
 }
 
@@ -8375,9 +8369,9 @@ def ClientPrefsDialog init {} {
 				set which_section .$subself.main.$subsection
 				set which_self $subself
 			}
-			choice {
-				set @$name $look(View:language)
-				$self add $which_section [list $name $type -choices $::langoptions]
+			language {
+				set @$name $look(View:$name)
+				$self add $which_section [list $name choice -choices $::langoptions]
 			}
 			color {
 				set str [string tolower $class$name]
diff --git a/desiredata/src/locale/index.tcl b/desiredata/src/locale/index.tcl
index 77b679c7..9b1fcfcb 100644
--- a/desiredata/src/locale/index.tcl
+++ b/desiredata/src/locale/index.tcl
@@ -1,21 +1,27 @@
 say english    "English"
 say francais   "Franįais"
-say espanol    "Espaņol"
 say deutsch    "Deutsch"
-say bokmal     "Norsk Bokmål"
-say italiano   "Italiano"
+say catala     "Catalā"
+say espanol    "Espaņol"
 say portugues  "Portuguęs"
 say brasileiro "Portuguęs Do Brasil"
-say catala     "Catalā"
+say italiano   "Italiano"
 say euskara    "Euskara"
-say polski     "Polski"
+say bokmal     "Norsk Bokmål"
 say dansk      "Dansk"
 say nederlands "Nederlands"
+say polski     "Polski"
 say turkce     "Türkįe"
 
 # those were made using:
 # iconv -f utf-8 -t ucs-2 | od -tx2 -An | sed 's/ /\\u/g'
 
+say russkij "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"
 say chinese "\u4e2d\u6587"
 say nihongo "\u65e5\u672c\u8a9e"
-say russkij "\u0420\u0443\u0441\u0441\u043a\u0438\u0439"
+
+set ::langoptions {
+	english francais deutsch catala espanol portugues brasileiro
+	italiano euskara bokmal dansk nederlands turkce polski russkij chinese nihongo
+	
+}