Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	28 Oct 2002 12:32:45 -0000	1.6
+++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl	29 Oct 2002 13:15:30 -0000	1.7
@@ -48,6 +48,7 @@
         # Insert the message key into the database if it doesn't
         # already exist
         set key_exists_p [db_string message_key_exists_p {}]
+
         if { ! $key_exists_p } {
             db_dml insert_message_key {}
         }
@@ -239,7 +240,7 @@
                         append return_url "?[export_entire_form_as_url_vars]"
                     }
 
-                    set return_value "<a href=\"/acs-lang/admin/edit-localized-message?[export_vars { { message_key $message_key_part } { locales $locale } { package_key $package_key_part } return_url }]\"><span style=\"background-color: yellow\">TRANSLATE NOW</span></a>"
+                    set return_value "&nbsp;<a href=\"/acs-lang/admin/edit-localized-message?[export_vars { { message_key $message_key_part } { locales $locale } { package_key $package_key_part } return_url }]\"><span style=\"background-color: yellow\"><font size=\"-2\">$message_key_part - TRANSLATE</font></span></a>&nbsp;"
                 } else {
                     append return_value " - " $key
                 }
@@ -303,8 +304,6 @@
 
 }
 
-
-
 #####
 #
 # Shorthand notation procs _ and _mr
Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	29 Oct 2002 08:06:31 -0000	1.9
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	29 Oct 2002 13:15:31 -0000	1.10
@@ -475,12 +475,13 @@
                 regsub -all {@[a-zA-Z0-9_\.]+@} $text "" text_wo_variables
     
                 # make sure the string is not empty, doesn't contain all spaces, is at least one character long,
-                # contains alphabetical characters, doesn't contain all &nbsp; 
+                # contains alphabetical characters, doesn't contain all &nbsp;, and isn't an adp message lookup 
                 if {![empty_string_p $text] 
                     && ![string is space $text_wo_variables] 
                     && [string length $text] > 1
                     && [string match -nocase {*[A-Z]*} $text]
                     && ![regexp {(?:\s*&nbsp;\s*)+} $text_wo_variables match]
+                    && ![regexp {^\s*#[a-zA-Z\._-]+#\s*$} $text_wo_variables match]
                 } {
                     # Peter: texts with a hash or curly brace used to be excluded, my thinking
                     # is it's better to include those texts and let the user say if they should