Christophe (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-labelmultilines-chs into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-labelmultilines-chs/+merge/91855
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-labelmultilines-chs/+merge/91855
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-labelmultilines-chs.
=== modified file 'openerp/addons/base/module/wizard/base_import_language_view.xml'
--- openerp/addons/base/module/wizard/base_import_language_view.xml 2011-08-18 06:23:26 +0000
+++ openerp/addons/base/module/wizard/base_import_language_view.xml 2012-02-07 15:37:13 +0000
@@ -22,7 +22,7 @@
<separator orientation="vertical" rowspan="15"/>
<group colspan="4" col="4">
<separator string="Import Translation" colspan="4"/>
- <label colspan="4" nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad."/>
+ <label colspan="4" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad."/>
<newline/>
<field name="name" width="200"/>
<field name="code"/>
=== modified file 'openerp/addons/base/rng/view.rng'
--- openerp/addons/base/rng/view.rng 2012-01-31 15:40:23 +0000
+++ openerp/addons/base/rng/view.rng 2012-02-07 15:37:13 +0000
@@ -292,7 +292,6 @@
<rng:element name="label">
<rng:ref name="overload"/>
<rng:optional><rng:attribute name="align"/></rng:optional>
- <rng:optional><rng:attribute name="nolabel"/></rng:optional>
<rng:optional><rng:attribute name="colspan"/></rng:optional>
<rng:optional><rng:attribute name="string"/></rng:optional>
<rng:optional><rng:attribute name="angle"/></rng:optional>
@@ -303,19 +302,7 @@
<rng:optional><rng:attribute name="name"/></rng:optional>
<rng:zeroOrMore>
<rng:choice>
- <rng:ref name="notebook"/>
- <rng:ref name="field"/>
- <rng:ref name="group"/>
- <rng:ref name="button"/>
- <rng:ref name="label" />
- <rng:ref name="separator"/>
- <rng:ref name="image"/>
- <rng:ref name="form"/>
- <rng:ref name="dashboard"/>
- <rng:ref name="filter"/>
- <rng:ref name="html"/>
- <rng:element name="newline"><rng:empty/></rng:element>
- <rng:element name="properties"><rng:empty/></rng:element>
+ <rng:text/>
</rng:choice>
</rng:zeroOrMore>
</rng:element>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
