[MERGE] Merged with the main trunk branch

bzr revid: ach@tinyerp.com-20100513053205-90uzfk01fc0hlhyp

bin/addons/base/base_update.xml

@@ -284,14 +284,14 @@
                 </form>
 				<xpath expr="//label[@string='description']"
 	                 position="attributes">
-	            <attribute name="string">Choose between the simplified interface and the extended one. If you are testing OpenERP or using it for the first time, We suggest you use the simplified interface. It has less options and fields but is easier to understand. You will be able to switch to the extended interface later.</attribute>
+	            <attribute name="string">Choose between the simplified interface and the extended one. We suggest you use the simplified interface. It has less options and fields but is easier to understand. You will be able to switch to the extended interface later.</attribute>
 	          </xpath>
 	          <xpath expr='//separator[@string="title"]' position='attributes'>
 	          	  <attribute name='string'>Choose Your Interface</attribute>
 	          </xpath>
 	          <xpath expr='//separator[@string="vsep"]' position='attributes'>
 	          	  <attribute name='string'></attribute>
-	          	  <attribute name='rowspan'>14</attribute>
+	          	  <attribute name='rowspan'>12</attribute>
 		      </xpath>
                <group string="res_config_contents" position="replace">
 	              	<group colspan="4">

bin/addons/base/i18n/hr.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-11 05:41+0000\n"
+"PO-Revision-Date: 2010-05-12 04:54+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-12 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 

bin/addons/base/i18n/ja.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-11 05:36+0000\n"
+"PO-Revision-Date: 2010-05-12 04:56+0000\n"
 "Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-12 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

bin/addons/base/i18n/sv.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-11 05:58+0000\n"
+"PO-Revision-Date: 2010-05-12 04:58+0000\n"
 "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-12 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

bin/addons/base/i18n/uk.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-11 05:47+0000\n"
+"PO-Revision-Date: 2010-05-12 04:54+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-12 04:19+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base

bin/addons/base/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-05-11 06:16+0000\n"
+"PO-Revision-Date: 2010-05-12 04:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-12 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base