[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121130091824-e3xhak3k9z2anihv

2 files changed, 19 insertions, 17 deletions

diff --git a/addons/plugin_thunderbird/i18n/zh_CN.po b/addons/plugin_thunderbird/i18n/zh_CN.po
index d7d758a373d..4581f592c4d 100644
--- a/addons/plugin_thunderbird/i18n/zh_CN.po
+++ b/addons/plugin_thunderbird/i18n/zh_CN.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 10:00+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 13:58+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "重启Thunderbird。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Thunderbird 插件安装："
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "下载并安装插件"
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
@@ -43,7 +43,7 @@ msgstr "安装 Thunderbird 插件"
 #: help:plugin_thunderbird.installer,plugin_file:0
 msgid ""
 "Thunderbird plug-in file. Save this file and install it in Thunderbird."
-msgstr ""
+msgstr "Thunderbird 插件的文件file。保存此文件，然后在Thunderbird 中安装。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -63,7 +63,7 @@ msgstr "文件名"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "单击“现在安装”"
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -79,7 +79,7 @@ msgstr "Thunderbird 插件"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "配置你的 openerp 服务器"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -91,17 +91,17 @@ msgstr "允许你选择一个你想链接到你电子邮件和它的附件的对
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "保存 Thunderbird 插件。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "选择插件（文件名是 openerp_plugin.xpi ）。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -109,11 +109,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"从 Thunderbird 的菜单条：Tools ­> Add-ons -> Screwdriver/Wrench Icon ->  Install "
+"add-on from file..."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "从 Thunderbird  的菜单条 : OpenERP -> Configuration."
 
 #~ msgid "Description"
 #~ msgstr "描述"
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 3774a369437..31fa27a644f 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -11,9 +11,9 @@
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
                     <xpath expr="//footer" position="replace">
-                    <footer>
-                        <button string="Close" special="Cancel" class="oe_highlight"/>
-                    </footer>
+                       <footer>
+                            <button string="Close" class="oe_link" special="cancel" />
+                       </footer>
                     </xpath>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>