Index: openacs-4/packages/acs-lang/acs-lang.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v
diff -u -N -r1.62.2.12 -r1.62.2.13
--- openacs-4/packages/acs-lang/acs-lang.info	27 Feb 2017 07:42:02 -0000	1.62.2.12
+++ openacs-4/packages/acs-lang/acs-lang.info	19 May 2017 16:25:00 -0000	1.62.2.13
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1b3" url="http://openacs.org/repository/download/apm/acs-lang-5.9.1b3.apm">
+    <version name="5.9.1b4" url="http://openacs.org/repository/download/apm/acs-lang-5.9.1b4.apm">
         <owner url="mailto:peter@collaboraid.biz">Peter Marklund</owner>
         <summary>OpenACS Internationalization Support.</summary>
         <release-date>2017-02-27</release-date>
@@ -20,7 +20,7 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-lang" version="5.9.1b3"/>
+        <provides url="acs-lang" version="5.9.1b4"/>
         <requires url="acs-kernel" version="5.9.1b1"/>
 	<requires url="acs-tcl" version="5.9.1b1"/>
         <requires url="acs-translations" version="5.9.1b1"/>
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 -N -r1.48.2.8 -r1.48.2.9
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	22 Apr 2017 18:21:46 -0000	1.48.2.8
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	19 May 2017 16:25:00 -0000	1.48.2.9
@@ -71,10 +71,19 @@
     is the message key, and the third sub match is the message text in en_US locale.
 
     @author Peter marklund (peter@collaboraid.biz)
+    @see lang::util::message_key_regexp
 } {
     return {(<#\s*?([-a-zA-Z0-9_:\.]+)\s+(.+?)\s*?#>)}
 }
 
+ad_proc lang::util::message_key_regexp {} {
+    Regular expression for recongnizing message keys in the form #package_name.key#.
+    @see lang::util::message_tag_regexp
+} {
+    return {\#([-a-zA-Z0-9_]+[.][-a-zA-Z0-9_]+)\#}
+}
+
+
 ad_proc lang::util::get_temporary_tags_indices { adp_file_string } {
     Given the contents of an adp file return the indices of the
     start and end chars of embedded message keys on the syntax:
Index: openacs-4/packages/acs-subsite/acs-subsite.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v
diff -u -N -r1.117.2.32 -r1.117.2.33
--- openacs-4/packages/acs-subsite/acs-subsite.info	10 May 2017 12:52:07 -0000	1.117.2.32
+++ openacs-4/packages/acs-subsite/acs-subsite.info	19 May 2017 16:25:00 -0000	1.117.2.33
@@ -9,7 +9,7 @@
     <implements-subsite-p>t</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.9.1b4" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.1b4.apm">
+    <version name="5.9.1b5" url="http://openacs.org/repository/download/apm/acs-subsite-5.9.1b5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Subsite</summary>
         <release-date>2017-02-27</release-date>
@@ -18,12 +18,12 @@
         <license>GPL</license>
         <maturity>3</maturity>
 
-        <provides url="acs-subsite" version="5.9.1b4"/>
+        <provides url="acs-subsite" version="5.9.1b5"/>
         <requires url="acs-authentication" version="5.9.1b1"/>
         <requires url="acs-content-repository" version="5.9.1b1"/>
         <requires url="acs-kernel" version="5.9.1b5"/>
         <requires url="acs-tcl" version="5.9.1b1"/>
-        <requires url="acs-lang" version="5.9.1b1"/>
+        <requires url="acs-lang" version="5.9.1b4"/>
         <requires url="acs-mail-lite" version="5.9.1b1"/>
 
         <callbacks>
Index: openacs-4/packages/acs-subsite/tcl/group-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/group-procs.tcl,v
diff -u -N -r1.39.2.15 -r1.39.2.16
--- openacs-4/packages/acs-subsite/tcl/group-procs.tcl	12 May 2017 16:17:44 -0000	1.39.2.15
+++ openacs-4/packages/acs-subsite/tcl/group-procs.tcl	19 May 2017 16:25:00 -0000	1.39.2.16
@@ -129,7 +129,7 @@
     # In case, a pretty_name was already provided in form of a message
     # key, there is no need to convert this a second time.
 
-    if {![regexp [lang::util::message_tag_regexp] $pretty_name]} {
+    if {![regexp [lang::util::message_key_regexp] $pretty_name]} {
 	set pretty_name [lang::util::convert_to_i18n -message_key "group_title_${group_id}" -text "$pretty_name"]
     }