=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2011-04-19 14:37:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml	2011-04-21 17:09:10 +0000
@@ -514,8 +514,7 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<!--entry key="regex" value="/^[\w]?[\w\d]*$/" /-->
-						<entry key="regex" value="''" />
+						<entry key="regex"><value><![CDATA[/^[^\d][^\^\-(&lt;&gt;&apos;&quot;){=+}\[!@#$%*\]\\/`:~|;,\.\?]*$/]]></value></entry>
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>
@@ -611,7 +610,7 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<entry key="regex" value="''" />
+						<entry key="regex"><value><![CDATA[/^[^\d][^\^\-(&lt;&gt;&apos;&quot;){=+}\[!@#$%*\]\\/`:~|;,\.\?]*$/]]></value></entry>
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>
@@ -795,7 +794,7 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<entry key="regex" value="''" />
+						<entry key="regex"><value><![CDATA[/^[^\d][^\^\-(&lt;&gt;&apos;&quot;){=+}\[!@#$%*\]\\/`:~|;,\.\?]*$/]]></value></entry>
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>
@@ -899,7 +898,7 @@
 						<entry key="required" value="false" />
 						<entry key="minlength" value="0" />
 						<entry key="maxlength" value="25" />
-						<entry key="regex" value="''" />
+						<entry key="regex"><value><![CDATA[/^[^\d][^\^\-(&lt;&gt;&apos;&quot;){=+}\[!@#$%*\]\\/`:~|;,\.\?]*$/]]></value></entry>
 						<entry key="message" value="translation_shortname_wellformed" />
 					</map>
 				</entry>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-04-15 11:12:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-04-21 17:09:10 +0000
@@ -225,7 +225,7 @@
 translation_country_must_be_two_chars   = Country must be two characters
 translation_variant_must_be_specified   = Variant must be specified
 translation_locale_already_exists       = Locale already exists
-translation_shortname_wellformed        = Please verify Letters, Numbers and Underscore for short name only
+translation_shortname_wellformed        = Please verify Letters, Numbers, Underscore and Spaces for short name only
 translation_shortname_length            = Shortname's maximum length of 25 charaters
 translation_duplicated_name_with        = Sorry! You entered a duplicated name with
 translation_duplicated_shortname_with   = Sorry! You entered a duplicated short name with

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2011-03-12 10:25:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2011-04-21 17:09:10 +0000
@@ -198,7 +198,7 @@
 translation_country_must_be_two_chars 			= M\u00e3 qu\u1ed1c gia ph\u1ea3i c\u00f3 2 k\u00fd t\u1ef1
 translation_variant_must_be_specified 			= Bi\u1ebfn kh\u00f4ng \u0111\u01b0\u1ee3c b\u1ecf tr\u1ed1ng
 translation_locale_already_exists 				= V\u00f9ng n\u00e0y \u0111\u00e3 t\u1ed3n t\u1ea1i
-translation_shortname_wellformed                = T\u00ean vi\u1ebft t\u1eaft ch\u1ec9 ch\u1ee9a c\u00e1c k\u00fd t\u1ef1 Alphabet(a-z), s\u1ed1(0-9) v\u00e0 d\u1ea5u g\u1ea1ch d\u01b0\u1edbi(_)
+translation_shortname_wellformed                = T\u00ean vi\u1ebft t\u1eaft ch\u1ec9 ch\u1ee9a c\u00e1c k\u00fd t\u1ef1 Alphabet(a-z), s\u1ed1(0-9), d\u1ea5u g\u1ea1ch d\u01b0\u1edbi(_), kho\u1ea3ng tr\u1eafng
 translation_shortname_length                    = \u0110\u1ed9 d\u00e0i t\u1ed1i \u0111a c\u1ee7a t\u00ean vi\u1ebft t\u1eaft l\u00e0 25 k\u00fd t\u1ef1
 translation_duplicated_name_with                = Vui l\u00f2ng nh\u1eadp t\u00ean kh\u00e1c. L\u00fd do: Tr\u00f9ng l\u1eb7p v\u1edbi
 translation_duplicated_shortname_with           = Xin l\u1ed7i! T\u00ean vi\u1ebft t\u1eaft n\u00e0y \u0111\u00e3 c\u00f3 trong H\u1ec7 th\u1ed1ng v\u1edbi