Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	23 Jul 2018 12:54:26 -0000	1.13
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	20 Dec 2019 21:47:58 -0000	1.13.2.1
@@ -3,8 +3,8 @@
 
     @author Christian Hvid
 } {
-    locale
-    package_key
+    locale:word
+    package_key:token
     {show "all"}
     {page_start 0}
 }
Index: openacs-4/packages/acs-lang/www/admin/edit-description.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-description.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-lang/www/admin/edit-description.tcl	7 Aug 2017 23:47:57 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/edit-description.tcl	20 Dec 2019 21:47:58 -0000	1.5.2.1
@@ -4,8 +4,8 @@
     @author Simon Carstensen
     @creation-date 2003-08-13
 } {
-    locale
-    package_key
+    locale:word
+    package_key:token
     message_key
     show:optional
     {description ""}
Index: openacs-4/packages/acs-lang/www/admin/edit-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-history.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/acs-lang/www/admin/edit-history.tcl	13 Mar 2019 11:07:47 -0000	1.2.2.1
+++ openacs-4/packages/acs-lang/www/admin/edit-history.tcl	20 Dec 2019 21:47:58 -0000	1.2.2.2
@@ -3,7 +3,7 @@
     
     @author Peter Marklund
 } {
-    {locale "de_DE"}
+    {locale:word "de_DE"}
     {number_of_edits 400}
     {email_exclude ""}
 }
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -r1.24.2.6 -r1.24.2.7
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	9 Dec 2019 08:32:39 -0000	1.24.2.6
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	20 Dec 2019 21:47:58 -0000	1.24.2.7
@@ -9,10 +9,10 @@
     @cvs-id $Id$
 
 } {
-    locale
-    package_key
-    message_key
-    show:optional
+    locale:word
+    package_key:token
+    message_key:token
+    show:word,optional
     {usage_p:boolean "f"}
     {return_url:localurl {}}
 }
@@ -72,7 +72,7 @@
         {label "Message Key"}
         {value "$package_key.$message_key"}
     }
-    {description:text(inform)
+    {description:text(inform),optional
         {label "Description"}
         {mode display}
         {after_html {(<a href='[ns_quotehtml $description_edit_url]'>Edit</a>)}}
Index: openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl	20 Dec 2019 21:47:58 -0000	1.3.2.1
@@ -4,7 +4,7 @@
 
     @author Lars Pind (lars@collaboraid.biz)
 } {
-    locale
+    locale:word
 }
 
 set locale_label [lang::util::get_label $locale]
Index: openacs-4/packages/acs-lang/www/admin/export-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-lang/www/admin/export-messages.tcl	7 Aug 2017 23:47:57 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/export-messages.tcl	20 Dec 2019 21:47:58 -0000	1.3.2.1
@@ -4,7 +4,7 @@
     @author Peter Marklund
 } {
     {locale:multiple ""}
-    {package_key ""}
+    {package_key:token ""}
     {return_url:localurl "/acs-lang/admin"}
 }
 
Index: openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl	7 Aug 2017 23:47:57 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl	20 Dec 2019 21:47:58 -0000	1.5.2.1
@@ -2,11 +2,11 @@
     Import all catalog messages for a given locale from
     the file system. Should typically only be done once
     as it may overwrite translations already in the database
-    for the given locale
+    for the given locale.
 
     @author Peter Marklund
 } {
-    locale
+    locale:word
 }
 
 set locale_label [lang::util::get_label $locale]
Index: openacs-4/packages/acs-lang/www/admin/import-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-lang/www/admin/import-messages.tcl	7 Aug 2017 23:47:57 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl	20 Dec 2019 21:47:58 -0000	1.8.2.1
@@ -3,8 +3,8 @@
 
     @author Peter Marklund
 } {
-    {locale ""}
-    {package_key ""}
+    {locale:word ""}
+    {package_key:token ""}
     {return_url:localurl "/acs-lang/admin"}
 }
 
Index: openacs-4/packages/acs-lang/www/admin/locale-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-delete.tcl,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-lang/www/admin/locale-delete.tcl	7 Apr 2018 19:48:03 -0000	1.9
+++ openacs-4/packages/acs-lang/www/admin/locale-delete.tcl	20 Dec 2019 21:47:58 -0000	1.9.2.1
@@ -1,5 +1,3 @@
-# /packages/acs-lang/www/admin/locale-delete.tcl
-
 ad_page_contract {
 
     Deletes a locale
@@ -8,7 +6,7 @@
     @creation-date 19 march 2002
     @cvs-id $Id$
 } {
-    locale
+    locale:word
     confirm_p:boolean,optional
 }
 
Index: openacs-4/packages/acs-lang/www/admin/locale-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-edit.tcl,v
diff -u -r1.12.2.2 -r1.12.2.3
--- openacs-4/packages/acs-lang/www/admin/locale-edit.tcl	1 Jul 2019 17:03:49 -0000	1.12.2.2
+++ openacs-4/packages/acs-lang/www/admin/locale-edit.tcl	20 Dec 2019 21:47:58 -0000	1.12.2.3
@@ -7,9 +7,8 @@
     Modified by Christian Hvid
 
     @creation-date 19 march 2002
-    @cvs-id $Id$
 } {
-    locale
+    locale:word
 }
 
 # Get the locale for the user so that we 'spit' the content back in the
Index: openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl	7 Aug 2017 23:47:57 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl	20 Dec 2019 21:47:58 -0000	1.7.2.1
@@ -1,14 +1,11 @@
-# /packages/acs-lang/www/admin/locale-make-default.tcl
-
 ad_page_contract {
 
     Makes a locale the default for its language
 
     @author Bruno Mattarollo <bruno.mattarollo@ams.greenpeace.org>
     @creation-date 19 march 2002
-    @cvs-id $Id$
 } {
-    locale
+    locale:word
 } -properties {
 }
 
Index: openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl	7 Aug 2017 23:47:57 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/locale-set-enabled-p.tcl	20 Dec 2019 21:47:58 -0000	1.7.2.1
@@ -6,7 +6,7 @@
 
     @creation-date 2003-08-08
 } {
-    locale
+    locale:word
     enabled_p:boolean
 }
 
Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	7 Aug 2017 23:47:57 -0000	1.13
+++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl	20 Dec 2019 21:47:58 -0000	1.13.2.1
@@ -9,8 +9,8 @@
     @cvs-id $Id$
 
 } {
-    locale
-    package_key
+    locale:word
+    package_key:token
     {message_key ""}
     {return_url:localurl {[export_vars -base message-list { locale package_key }]}}
 }
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	19 Jan 2018 21:23:51 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-resolve.tcl	20 Dec 2019 21:47:58 -0000	1.4.2.1
@@ -4,9 +4,9 @@
 
     @author Peter Marklund
 } {
-    package_key
+    package_key:token
     message_key
-    locale
+    locale:word
     {return_url:localurl {[export_vars -base "message-conflicts" { package_key locale }]}}
 }
 
Index: openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	18 Sep 2018 18:50:25 -0000	1.6
+++ openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl	20 Dec 2019 21:47:58 -0000	1.6.2.1
@@ -5,9 +5,9 @@
 
     @author Peter Marklund
 } {
-    package_key
+    package_key:token
     message_key
-    locale
+    locale:word
     {return_url:localurl {[export_vars -base "message-conflicts" { package_key locale }]}}
 }
 
Index: openacs-4/packages/acs-lang/www/admin/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.tcl,v
diff -u -r1.10 -r1.10.2.1
--- openacs-4/packages/acs-lang/www/admin/message-delete.tcl	7 Apr 2018 19:48:03 -0000	1.10
+++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl	20 Dec 2019 21:47:58 -0000	1.10.2.1
@@ -8,8 +8,8 @@
     @cvs-id $Id$
 
 } {
-    locale
-    package_key
+    locale:word
+    package_key:token
     message_key
     show:optional
     confirm_p:boolean,optional
Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -r1.19.2.6 -r1.19.2.7
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	15 Apr 2019 12:17:52 -0000	1.19.2.6
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	20 Dec 2019 21:47:58 -0000	1.19.2.7
@@ -7,8 +7,8 @@
     @creation-date 26 October 2001
     @cvs-id $Id$
 } {
-    locale
-    package_key
+    locale:word
+    package_key:token
     {show "all"}
 } -validate {
     show_valid -requires { show } {
Index: openacs-4/packages/acs-lang/www/admin/message-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-lang/www/admin/message-search.tcl	7 Apr 2018 19:48:03 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/message-search.tcl	20 Dec 2019 21:47:58 -0000	1.8.2.1
@@ -4,7 +4,7 @@
     in order to help translators ensure consistent terminology.
 
 } {
-    locale
+    locale:word
     search_locale:optional
     q:optional
 }
Index: openacs-4/packages/acs-lang/www/admin/message-undelete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-undelete.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/message-undelete.tcl	8 Apr 2019 13:24:37 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/message-undelete.tcl	20 Dec 2019 21:47:58 -0000	1.1.2.2
@@ -8,8 +8,8 @@
     @cvs-id $Id $
 
 } {
-    locale
-    package_key
+    locale:word
+    package_key:token
     message_key
     show:optional
     confirm_p:boolean,optional
Index: openacs-4/packages/acs-lang/www/admin/message-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-unregister.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/message-unregister.tcl	24 Apr 2019 10:24:23 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/message-unregister.tcl	20 Dec 2019 21:47:58 -0000	1.1.2.2
@@ -8,8 +8,8 @@
     @cvs-id $Id $
 
 } {
-    locale
-    package_key
+    locale:word
+    package_key:token
     message_key
     show:optional
     confirm_p:boolean,optional
Index: openacs-4/packages/acs-lang/www/admin/package-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.tcl,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/acs-lang/www/admin/package-list.tcl	11 Apr 2019 18:36:41 -0000	1.14.2.1
+++ openacs-4/packages/acs-lang/www/admin/package-list.tcl	20 Dec 2019 21:47:58 -0000	1.14.2.2
@@ -7,7 +7,7 @@
     @creation-date 26 October 2001
     @cvs-id $Id$
 } {
-    locale
+    locale:word
 } -properties {
     current_locale_label
     page_title