No functional changes, Formatted the file as per best practice that we follow in FTL files. Thanks Deepak!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1442197 13f79535-47bb-0310-9956-ffa450edef68
Fixes 2 issues I found by chance while browsing trunk demo

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1444356 13f79535-47bb-0310-9956-ffa450edef68
A patch from Chatree Srichart for "Ignore "tenant" data files if the multitenant property is "N"" https://issues.apache.org/jira/browse/OFBIZ-4934

The system does not need to load tenant data files if the multitenant property in general.properties is "N". I created a patch to ignore the tenant data files when run ./ant load-demo command.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1444370 13f79535-47bb-0310-9956-ffa450edef68
A patch from Shi Jinghai for "Chinese localizations (zh) for trunk" https://issues.apache.org/jira/browse/OFBIZ-5134



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446482 13f79535-47bb-0310-9956-ffa450edef68
A patch from Chatree Srichart for "services_quote.xml#quoteSequence-enforced method is not facet-valid with respect to pattern" https://issues.apache.org/jira/browse/OFBIZ-5135

I got an error message:
Error message: cvc-attribute.3: The value 'quoteSequence-enforced' of attribute 'method-name' on element 'simple-method' is not valid with respect to its type, 'javaClassName'.




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446575 13f79535-47bb-0310-9956-ffa450edef68
A patch from Nicolas Malin for "fieldGroup will ignored if all contains fields are ignored" https://issues.apache.org/jira/browse/OFBIZ-5136

When you have a fieldGroup that contains fields with use-when attribute, if all fields aren't use, the fieldGroup is empty.
Improvment: to not display the field group



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446847 13f79535-47bb-0310-9956-ffa450edef68
A patch from Shi Jinghai for "Chinese localizations (zh) for trunk" https://issues.apache.org/jira/browse/OFBIZ-5134



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446849 13f79535-47bb-0310-9956-ffa450edef68
A patch from Shi Jinghai for "Chinese localizations (zh) for trunk (Part II)" https://issues.apache.org/jira/browse/OFBIZ-5137

Translated missing zh labels for several components.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446852 13f79535-47bb-0310-9956-ffa450edef68
Merges trunk HEAD
Maybe the last time I do that. The Neogia came up with a addon for this... to be tested....


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/webhelp-2012-12-07@1446859 13f79535-47bb-0310-9956-ffa450edef68