[Merge] lp:openobject-addons

bzr revid: dbr@tinyerp.com-20130708072045-yxomck37e4f25uib

addons/account/account_invoice.py

@@ -221,8 +221,8 @@ class account_invoice(osv.osv):
         'type': {
         },
         'state': {
-            'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'paid' and obj['type'] in ('out_invoice', 'out_refund'),
-            'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open' and obj['type'] in ('out_invoice', 'out_refund'),
+            'account.mt_invoice_paid': lambda self, cr, uid, obj, ctx=None: obj.state == 'paid' and obj.type in ('out_invoice', 'out_refund'),
+            'account.mt_invoice_validated': lambda self, cr, uid, obj, ctx=None: obj.state == 'open' and obj.type in ('out_invoice', 'out_refund'),
         },
     }
     _columns = {

addons/account/i18n/ru.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-06-19 11:49+0000\n"
+"PO-Revision-Date: 2013-07-02 06:32+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.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: 2013-06-20 05:17+0000\n"
-"X-Generator: Launchpad (build 16673)\n"
+"X-Launchpad-Export-Date: 2013-07-03 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1959,7 +1959,7 @@ msgstr "Длительность"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,last_closing_balance:0
 msgid "Last Closing Balance"
-msgstr ""
+msgstr "Последнее конечное сальдо"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -3989,6 +3989,8 @@ msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Нельзя изменить проводку по этому журналу.\n"
+"Прежде, нужно разрешить отмену проводок в журнале."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -4705,7 +4707,7 @@ msgstr "Месяц"
 #: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "Нальзя изменить код счета который содержит проводки!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
@@ -4824,7 +4826,7 @@ msgstr "Отметьте, если хотите выводить счета с 0
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Сверка проводок открытия"
 
 #. module: account
 #. openerp-web
@@ -6524,7 +6526,7 @@ msgstr "Позиция аналитики"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Модели"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1124
@@ -10311,7 +10313,7 @@ msgstr "Внутренний тип"
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Генерировать проводки до"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running

addons/account/report/account_aged_partner_balance.py

@@ -366,12 +366,13 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header):
         return period or 0.0
 
     def _get_partners(self,data):
+        # TODO: deprecated, to remove in trunk
         if data['form']['result_selection'] == 'customer':
-            return 'Receivable Accounts'
+            return self._translate('Receivable Accounts')
         elif data['form']['result_selection'] == 'supplier':
-            return 'Payable Accounts'
+            return self._translate('Payable Accounts')
         elif data['form']['result_selection'] == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return self._translate('Receivable and Payable Accounts')
         return ''
 
 report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner',

addons/account/report/account_aged_partner_balance.rml

@@ -147,7 +147,9 @@
           <para style="terp_default_Centre_8">[[ data['form']['period_length'] ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_partners(data) ]]</para>
+          <para style="terp_default_Centre_8">Receivable Accounts[[ data['form']['result_selection'] == 'customer' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Payable Accounts[[ data['form']['result_selection'] == 'supplier' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form']['result_selection'] == 'customer_supplier' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ data['form']['direction_selection'] ]]</para>
@@ -166,7 +168,8 @@
           <para style="terp_tblheader_Details">Partners</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]]</para>
+          <para style="terp_tblheader_Details_Right">Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_Details_Right">Not due[[ data['form']['direction_selection'] != 'future' and ' ' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ data['form']['4']['name'] ]]</para>

addons/account/report/account_balance.rml

@@ -211,8 +211,10 @@
     </para>
     <blockTable colWidths="130.0,80.0,100.0,140.0,90.0" style="Table8">
       <tr>
-        <td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]]</para>
-        <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para>
+        </td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -233,7 +235,11 @@
         <td>
           <para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para>
         </td>
-          <td><para style="terp_default_Centre_8">[[ (data['form']['display_account']=='all' and 'All') or  (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para></td>
+          <td>
+          <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
+          </td>
         <td>  <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] </para>
           <blockTable colWidths="60.0,60.0" style="Table5">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>

addons/account/report/account_general_journal.rml

@@ -220,8 +220,8 @@
     </blockTable>
       <blockTable colWidths="80.0,100,80.0,150.0,100.0" style="Table2">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
-      	<para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+      	<td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period' and ' ' or removeParentNode('para') ]]</para>
+      	<para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
     	<td><para style="terp_tblheader_General_Centre">Journals</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and  get_filter(data) ]]</para></td>

addons/account/report/account_general_ledger_landscape.rml

@@ -360,9 +360,8 @@
     <blockTable colWidths="110.0,110.0,110.0,110.0,128.0,93.0,110.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]]</para>
-          <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para>
-        </td>
+          <para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
         <td>
           <para style="terp_tblheader_General_Centre">Fiscal Year</para>
         </td>
@@ -395,7 +394,9 @@
           <para style="terp_default_Centre_7">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_7">[[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']]</para>
+          <para style="terp_default_Centre_7">All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_7">With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_7">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>

addons/account/report/account_journal.py

@@ -189,11 +189,12 @@ class journal_print(report_sxw.rml_parse, common_report_header):
         return data['form']['amount_currency']
 
     def _get_sortby(self, data):
+        # TODO: deprecated, to remove in trunk
         if self.sort_selection == 'date':
-            return 'Date'
+            return self._translate('Date')
         elif self.sort_selection == 'ref':
-            return 'Reference Number'
-        return 'Date'
+            return self._translate('Reference Number')
+        return self._translate('Date')
 
 report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
 report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')

addons/account/report/account_journal.rml

@@ -186,8 +186,8 @@
     </para>
     <blockTable colWidths="85.0,80.0,80.0,120.0,70.0,100.0" style="Table2">
       <tr>
-          <td><para style="terp_tblheader_General_Centre">  [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]]</para>
-              <para style="terp_tblheader_General_Centre">[[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]]</para></td>
+          <td><para style="terp_tblheader_General_Centre">Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]]</para>
+              <para style="terp_tblheader_General_Centre">Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]]</para></td>
           <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
           <td><para style="terp_tblheader_General_Centre">Journal</para></td>
           <td><para style="terp_tblheader_General_Centre">Period</para></td>
@@ -199,8 +199,10 @@
           <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data) or '' ]]</para></td>
           <td><para style="terp_default_Centre_8">[[ o.journal_id.name  ]]</para></td>
           <td><para style="terp_default_Centre_8">[[ o.period_id.name ]] </para></td>
-          <td><para style="terp_default_Centre_8">[[ get_sortby(data) ]]</para></td>
-          <td><para style="terp_default_Centre_8">[[ get_target_move(data) ]] </para></td>
+          <td>
+             <para style="terp_default_Centre_8">Date[[ data['form'].get('sort_selection', 'date') == 'date' and ' ' or removeParentNode('para') ]]</para>
+             <para style="terp_default_Centre_8">Reference Number[[ data['form'].get('sort_selection', 'date') == 'ref' and ' ' or removeParentNode('para') ]]</para>
+          </td>
       </tr>
     </blockTable>
     <para style="P9">

addons/account/report/account_partner_ledger.py

@@ -267,12 +267,13 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
         return result_tmp  + result_init
 
     def _get_partners(self):
+        # TODO: deprecated, to remove in trunk
         if self.result_selection == 'customer':
-            return 'Receivable Accounts'
+            return _('Receivable Accounts')
         elif self.result_selection == 'supplier':
-            return 'Payable Accounts'
+            return _('Payable Accounts')
         elif self.result_selection == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return _('Receivable and Payable Accounts')
         return ''
 
     def _sum_currency_amount_account(self, account, form):

addons/account/report/account_partner_ledger.rml

@@ -423,7 +423,9 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_partners() ]]</para>
+          <para style="terp_default_Centre_8">Receivable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'supplier' or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">Receivable and Payable Accounts[[ data['form'].get('result_selection', 'customer') == 'customer_supplier' or removeParentNode('para') ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ get_target_move(data) ]]</para>

addons/account/static/src/js/account_move_line_quickadd.js

@@ -84,7 +84,7 @@ openerp.account.quickadd = function (instance) {
         },
         search_by_journal_period: function() {
             var self = this;
-            var domain = [];
+            var domain = ['|',['debit', '!=', 0], ['credit', '!=', 0]];
             if (self.current_journal !== null) domain.push(["journal_id", "=", self.current_journal]);
             if (self.current_period !== null) domain.push(["period_id", "=", self.current_period]);
             self.last_context["journal_id"] = self.current_journal === null ? false : self.current_journal;

addons/account/wizard/account_report_common.py

@@ -175,7 +175,7 @@ class account_common_report(osv.osv_memory):
                 data['form'][field] = data['form'][field][0]
         used_context = self._build_contexts(cr, uid, ids, data, context=context)
         data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or []
-        data['form']['used_context'] = used_context
+        data['form']['used_context'] = dict(used_context, lang=context.get('lang', 'en_US'))
         return self._print_report(cr, uid, ids, data, context=context)
 
 

addons/account_analytic_plans/account_analytic_plans_view.xml

@@ -248,9 +248,12 @@
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
             <field name="arch" type="xml">
-                <field name="analytic_id" required="1" position="replace">
+                <xpath  expr="//field[@name='analytic_id']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath  expr="//field[@name='analytic_id']" position="after">
                     <field name="analytics_id" required="1"/>
-                </field>
+                </xpath>
             </field>
         </record>
 

addons/account_cancel/i18n/vi.po

@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-21 14:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2013-06-30 16:08+0000\n"
+"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
 "Language-Team: Vietnamese <vi@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: 2013-03-16 05:42+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Hủy bỏ"
 
 #~ msgid "Account Cancel"
 #~ msgstr "Hủy bỏ Tài khoản"

addons/analytic/analytic.py

@@ -33,9 +33,9 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
     _track = {
         'state': {
-            'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None:  obj['state'] == 'pending',
-            'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'close',
-            'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'open',
+            'analytic.mt_account_pending': lambda self, cr, uid, obj, ctx=None: obj.state == 'pending',
+            'analytic.mt_account_closed': lambda self, cr, uid, obj, ctx=None: obj.state == 'close',
+            'analytic.mt_account_opened': lambda self, cr, uid, obj, ctx=None: obj.state == 'open',
         },
     }
 

addons/auth_oauth_signup/i18n/vi.po

@@ -0,0 +1,23 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-27 06:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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: 2013-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Người dùng"

addons/auth_openid/i18n/vi.po

@@ -0,0 +1,97 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-27 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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: 2013-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:24
+#, python-format
+msgid "Username"
+msgstr "Tên đăng nhập"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:12
+#: view:res.users:0
+#, python-format
+msgid "OpenID"
+msgstr "OpenID"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:30
+#: field:res.users,openid_url:0
+#, python-format
+msgid "OpenID URL"
+msgstr "Đường dẫn OpenID"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:9
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
+#, python-format
+msgid "Google"
+msgstr "Google"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:11
+#, python-format
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr ""
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:18
+#, python-format
+msgid "Google Apps Domain"
+msgstr ""
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr "OpenID Email"
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr ""
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:8
+#, python-format
+msgid "Password"
+msgstr "Mật khẩu"
+
+#. module: auth_openid
+#. openerp-web
+#: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
+#, python-format
+msgid "Google Apps"
+msgstr ""
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "Users"
+msgstr "Người dùng"

addons/auth_signup/controllers/main.py

@@ -42,7 +42,7 @@ class Controller(http.Controller):
             }
         return config
 
-    @http.route('/auth_signup/retrieve', type='json', auth="user")
+    @http.route('/auth_signup/retrieve', type='json', auth="none")
     def retrieve(self, dbname, token):
         """ retrieve the user info (name, login or email) corresponding to a signup token """
         registry = RegistryManager.get(dbname)
@@ -51,7 +51,7 @@ class Controller(http.Controller):
             user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
         return user_info
 
-    @http.route('/auth_signup/signup', type='json', auth="user")
+    @http.route('/auth_signup/signup', type='json', auth="none")
     def signup(self, dbname, token, **values):
         """ sign up a user (new or existing)"""
         try:
@@ -66,7 +66,7 @@ class Controller(http.Controller):
             res_users = registry.get('res.users')
             res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
-    @http.route('/auth_signup/reset_password', type='json', auth="user")
+    @http.route('/auth_signup/reset_password', type='json', auth="none")
     def reset_password(self, dbname, login):
         """ retrieve user, and perform reset password """
         registry = RegistryManager.get(dbname)

addons/auth_signup/i18n/vi.po

@@ -0,0 +1,288 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-27 06:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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: 2013-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr "Loại mã đăng ký"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr "Cho phép người dùng bên ngoài đăng ký."
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Confirm Password"
+msgstr "Xác nhận mật khẩu"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr "Nếu không chọn, chỉ những người được mời mới được đăng ký."
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:266
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr "Không thể gửi email: người dùng không có địa chỉ email"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
+#, python-format
+msgid "Reset password"
+msgstr "Đặt lại mật khẩu"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr "Mẫu người dùng sử dụng khi đăng ký"
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "Quên mật khẩu"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr "Vui lòng nhập mật khẩu và xác nhận nó"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
+#, python-format
+msgid "Sign Up"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr "Trạng thái"
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+"\n"
+"\\n\n"
+"<p>Bạn có một yêu cầu reset mật khẩu từ tài khoản OpenERPA gắn với email "
+"này.</p>\\n\n"
+"\\n\n"
+"<p>Bạn có thể thay đổi mật khẩu thông qua <a href=\\\"${object.signup_url}\\"
+"\">đường dẫn này</a>.</p>\\n\n"
+"\\n\n"
+"<p>Lưu ý: Nếu đây không phải chủ ý của bạn. Bạn có thể bỏ qua email này.</p>"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr "Xin nhập tên."
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Người dùng"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:270
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Sign up"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""

addons/auth_signup/i18n/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-04-16 04:33+0000\n"
-"Last-Translator: Key <key.diagram@gmail.com>\n"
+"PO-Revision-Date: 2013-07-02 08:11+0000\n"
+"Last-Translator: DWXXX <Unknown>\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: 2013-04-17 05:15+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2013-07-03 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
@@ -29,7 +29,7 @@ msgstr "允许外部用户登录"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
 #, python-format
 msgid "Confirm Password"
 msgstr "确认密码"
@@ -37,7 +37,7 @@ msgstr "确认密码"
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
 msgid "If unchecked, only invited users may sign up."
-msgstr ""
+msgstr "如果不勾选，只有被邀请用户才能注册。"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
@@ -45,15 +45,15 @@ msgid "base.config.settings"
 msgstr "base.config.settings"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:265
+#: code:addons/auth_signup/res_users.py:266
 #, python-format
 msgid "Cannot send email: user has no email address."
-msgstr ""
+msgstr "无法发送邮件：用户邮件地址为空。"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:28
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
 #, python-format
 msgid "Reset password"
 msgstr "重设密码"
@@ -70,7 +70,7 @@ msgstr "重置密码"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
 #, python-format
 msgid "Please enter a password and confirm it."
 msgstr "请输入密码并确认。"
@@ -78,12 +78,12 @@ msgstr "请输入密码并确认。"
 #. module: auth_signup
 #: view:res.users:0
 msgid "Send an email to the user to (re)set their password."
-msgstr ""
+msgstr "向用户发送重置密码邮件。"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
 #, python-format
 msgid "Sign Up"
 msgstr "注册"
@@ -119,10 +119,10 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "请输入名字"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
@@ -136,10 +136,10 @@ msgstr "注册 URL"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
 #, python-format
 msgid "Please enter a username."
-msgstr ""
+msgstr "请输入您的用户名"
 
 #. module: auth_signup
 #: selection:res.users,state:0
@@ -147,7 +147,7 @@ msgid "Active"
 msgstr "启用"
 
 #. module: auth_signup
-#: code:addons/auth_signup/res_users.py:269
+#: code:addons/auth_signup/res_users.py:270
 #, python-format
 msgid ""
 "Cannot send email: no outgoing email server configured.\n"
@@ -170,10 +170,10 @@ msgstr "姓名"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "请输入用户名和邮件地址"
 
 #. module: auth_signup
 #: selection:res.users,state:0
@@ -199,7 +199,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
 #, python-format
 msgid "Log in"
 msgstr "登录"
@@ -211,35 +211,35 @@ msgstr "注册令牌（ Token  ）是有效的"
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:108
 #: code:addons/auth_signup/static/src/js/auth_signup.js:111
 #: code:addons/auth_signup/static/src/js/auth_signup.js:114
 #: code:addons/auth_signup/static/src/js/auth_signup.js:117
 #: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Login"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
 #, python-format
 msgid "Invalid signup token"
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
 #, python-format
 msgid "Passwords do not match; please retype them."
 msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:108
-#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "No database selected !"
 msgstr ""
@@ -256,7 +256,7 @@ msgstr ""
 
 #. module: auth_signup
 #. openerp-web
-#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
 #, python-format
 msgid "Back to Login"
 msgstr "返回登录页面"
@@ -266,12 +266,12 @@ msgstr "返回登录页面"
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Sign up"
-msgstr ""
+msgstr "注册"
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
 msgid "Partner"
-msgstr "业务伙伴"
+msgstr "合作伙伴"
 
 #. module: auth_signup
 #: field:res.partner,signup_token:0

addons/base_calendar/base_calendar.py

@@ -1510,7 +1510,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                     continue
             if r['class']=='private':
                 for f in r.keys():
-                    if f not in ('id','date','date_deadline','duration','user_id','state'):
+                    if f not in ('id','date','date_deadline','duration','user_id','state','interval','count'):
                         if isinstance(r[f], list):
                             r[f] = []
                         else:

addons/base_calendar/i18n/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-11-28 16:50+0000\n"
-"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
+"PO-Revision-Date: 2013-06-29 05:34+0000\n"
+"Last-Translator: David.Xu <xzxyxu@gmail.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: 2013-03-16 05:45+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -42,7 +42,7 @@ msgstr "这属性定义循环日程的日期/时间异常列表。"
 #: selection:calendar.todo,rrule_type:0
 #: selection:crm.meeting,rrule_type:0
 msgid "Week(s)"
-msgstr ""
+msgstr "周"
 
 #. module: base_calendar
 #: field:calendar.event,we:0
@@ -248,7 +248,7 @@ msgid "To"
 msgstr "到"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1260
+#: code:addons/base_calendar/base_calendar.py:1262
 #, python-format
 msgid "Error!"
 msgstr "错误！"
@@ -300,7 +300,7 @@ msgstr "与会者的参与状况"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "收信人"
 
 #. module: base_calendar
 #: field:crm.meeting,name:0
@@ -361,9 +361,9 @@ msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:399
 #: code:addons/base_calendar/base_calendar.py:441
-#: code:addons/base_calendar/base_calendar.py:1013
 #: code:addons/base_calendar/base_calendar.py:1015
-#: code:addons/base_calendar/base_calendar.py:1460
+#: code:addons/base_calendar/base_calendar.py:1017
+#: code:addons/base_calendar/base_calendar.py:1462
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
@@ -478,7 +478,7 @@ msgstr "日期"
 #. module: base_calendar
 #: field:crm.meeting,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: base_calendar
 #: field:calendar.event,location:0
@@ -522,7 +522,7 @@ msgid "Event alarm information"
 msgstr "事件提醒信息"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1015
+#: code:addons/base_calendar/base_calendar.py:1017
 #, python-format
 msgid "Count cannot be negative or 0."
 msgstr ""
@@ -530,21 +530,21 @@ msgstr ""
 #. module: base_calendar
 #: field:crm.meeting,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: base_calendar
 #: view:crm.meeting:0
 #: model:ir.model,name:base_calendar.model_crm_meeting
 #: model:res.request.link,name:base_calendar.request_link_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "会议"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 #: selection:crm.meeting,rrule_type:0
 msgid "Month(s)"
-msgstr ""
+msgstr "月"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -566,7 +566,7 @@ msgstr "Caldav 服务的URL"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "邀请向导"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -590,7 +590,7 @@ msgstr "周四"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Meeting Details"
-msgstr ""
+msgstr "会议详情"
 
 #. module: base_calendar
 #: field:calendar.attendee,child_ids:0
@@ -601,21 +601,21 @@ msgstr "代表人"
 #: code:addons/base_calendar/crm_meeting.py:102
 #, python-format
 msgid "The following contacts have no email address :"
-msgstr ""
+msgstr "下列联系人没有电子邮件地址："
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 #: selection:crm.meeting,rrule_type:0
 msgid "Year(s)"
-msgstr ""
+msgstr "年"
 
 #. module: base_calendar
 #: view:crm.meeting.type:0
 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting_type
 #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_type
 msgid "Meeting Types"
-msgstr ""
+msgstr "会议类型"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
@@ -633,7 +633,7 @@ msgstr "全员可见"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "hours"
-msgstr ""
+msgstr "小时"
 
 #. module: base_calendar
 #: field:calendar.attendee,partner_id:0
@@ -655,7 +655,7 @@ msgstr "重复直到"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -694,7 +694,7 @@ msgstr "周二"
 #. module: base_calendar
 #: field:crm.meeting,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "标签"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -741,7 +741,7 @@ msgid "Declined"
 msgstr "已拒绝"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1460
+#: code:addons/base_calendar/base_calendar.py:1462
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
 msgstr ""
@@ -1200,7 +1200,7 @@ msgid "Select Weekdays"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1519
+#: code:addons/base_calendar/base_calendar.py:1521
 #: selection:calendar.attendee,availability:0
 #: selection:calendar.event,show_as:0
 #: selection:calendar.todo,show_as:0
@@ -1453,7 +1453,7 @@ msgid "Weekday"
 msgstr "工作日"
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1013
+#: code:addons/base_calendar/base_calendar.py:1015
 #, python-format
 msgid "Interval cannot be negative."
 msgstr ""

addons/base_crypt/i18n/vi.po

@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-07-20 09:55+0000\n"
-"Last-Translator: OpenBMS JSC <Unknown>\n"
+"PO-Revision-Date: 2013-06-30 16:09+0000\n"
+"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
 "Language-Team: Vietnamese <vi@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: 2013-03-16 05:49+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-07-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Người dùng"
 
 #, python-format
 #~ msgid "Error"

addons/base_setup/res_config.py

@@ -36,6 +36,8 @@ class base_config_settings(osv.osv_memory):
             help="""Enable the public part of openerp, openerp becomes a public website."""),
         'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
+        'module_google_drive': fields.boolean('Attach Google documents to any record',
+                                              help="""This installs the module google_docs."""),
     }
 
     def open_company(self, cr, uid, ids, context=None):

addons/base_setup/res_config_view.xml

@@ -81,6 +81,15 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Google Drive"/>
+                        <div name="google_drive">
+                            <div name="module_google_drive">
+                                <field name="module_google_drive" class="oe_inline"/>
+                                <label for="module_google_drive"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>

addons/claim_from_delivery/i18n/vi.po

@@ -0,0 +1,33 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-30 16:10+0000\n"
+"Last-Translator: Hung Tran <vanda6688@yahoo.com>\n"
+"Language-Team: Vietnamese <vi@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: 2013-07-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: claim_from_delivery
+#: view:stock.picking.out:0
+msgid "Claims"
+msgstr "Các khiếu nại"
+
+#. module: claim_from_delivery
+#: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
+msgid "Delivery Order"
+msgstr ""
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim From Delivery"
+msgstr ""

addons/contacts/i18n/ko.po

@@ -0,0 +1,37 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-28 09:32+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@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: 2013-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "연락처"

addons/contacts/i18n/vi.po

@@ -0,0 +1,45 @@
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-27 16:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@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: 2013-06-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16681)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Nhấn để thêm liên lạc vào sổ địa chỉ.\n"
+"          </p><p>\n"
+"            OpenERP giúp bạn theo dõi các hoạt động liên quan tới\n"
+"            một khách hàng; thảo luận, lịch sử cơ hội kinh doanh,\n"
+"            tài liệu v.v....\n"
+"          </p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Liên hệ"

addons/crm/crm_lead.py

@@ -77,12 +77,12 @@ class crm_lead(base_stage, format_address, osv.osv):
 
     _track = {
         'state': {
-            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj['state'] in ['new', 'draft'],
-            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'done',
-            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj['state'] == 'cancel',
+            'crm.mt_lead_create': lambda self, cr, uid, obj, ctx=None: obj.state in ['new', 'draft'],
+            'crm.mt_lead_won': lambda self, cr, uid, obj, ctx=None: obj.state == 'done',
+            'crm.mt_lead_lost': lambda self, cr, uid, obj, ctx=None: obj.state == 'cancel',
         },
         'stage_id': {
-            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj['state'] not in ['new', 'draft', 'cancel', 'done'],
+            'crm.mt_lead_stage': lambda self, cr, uid, obj, ctx=None: obj.state not in ['new', 'draft', 'cancel', 'done'],
         },
     }
 
@@ -96,13 +96,11 @@ class crm_lead(base_stage, format_address, osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        if not vals.get('stage_id'):
-            ctx = context.copy()
-            if vals.get('section_id'):
-                ctx['default_section_id'] = vals['section_id']
-            if vals.get('type'):
-                ctx['default_type'] = vals['type']
-            vals['stage_id'] = self._get_default_stage_id(cr, uid, context=ctx)
+        if vals.get('type') and not context.get('default_type'):
+            context['default_type'] = vals.get('type')
+        if vals.get('section_id') and not context.get('default_section_id'):
+            context['default_section_id'] = vals.get('section_id')
+
         # context: no_log, because subtype already handle this
         create_context = dict(context, mail_create_nolog=True)
         return super(crm_lead, self).create(cr, uid, vals, context=create_context)

addons/crm/crm_lead_demo.xml

@@ -709,5 +709,6 @@ Andrew</field>
             eval="[ ref('msg_case18_1'), ref('msg_case18_2')], True, {}"
         />
 
+
     </data>
 </openerp>

addons/crm/crm_phonecall_menu.xml

@@ -58,7 +58,7 @@
         <field name="view_mode">tree,calendar</field>
         <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
         <field name="domain">[]</field>
-        <field name="context">{}</field>
+        <field name="context">{'default_state': 'done'}</field>
         <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">

addons/crm/res_partner.py

@@ -56,7 +56,7 @@ class res_partner(osv.osv):
 
         default.update({'opportunity_ids': [], 'meeting_ids' : [], 'phonecall_ids' : []})
 
-        super(res_partner, self).copy(cr, uid, record_id, default, context)
+        return super(res_partner, self).copy(cr, uid, record_id, default, context)
 
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
         search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')

addons/decimal_precision/i18n/ko.po

@@ -0,0 +1,49 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-28 09:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@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: 2013-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "자리수"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy"
+msgstr "소숫점 정확성"
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "사용량"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr ""
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr "소수점 정확성"
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr "decimal.precision"

addons/document_page/document_page.py

@@ -66,7 +66,7 @@ class document_page(osv.osv):
         'create_date': fields.datetime("Created on", select=True, readonly=True),
         'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
         'write_date': fields.datetime("Modification Date", select=True, readonly=True),
-        'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
+        'write_uid': fields.many2one('res.users', "Last Contributor", select=True, readonly=True),
     }
     _defaults = {
         'type':'content',

addons/fetchmail/i18n/ko.po

@@ -0,0 +1,322 @@
+# Korean translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-06-28 09:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Korean <ko@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: 2013-06-30 05:56+0000\n"
+"X-Generator: Launchpad (build 16692)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "확정됨"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr "서버 이름"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr "첨부파일 보관"
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#. module: fetchmail
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
+msgstr "수신 이메일 게이트웨이 구성"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr "지금 가져오기"
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr "수신 메일 서버"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr "서버유형 IMAP."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP 서버"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr "로컬 서버"
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "Status"
+msgstr "상태"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP 서버"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_config_settings
+msgid "fetchmail.config.settings"
+msgstr "fetchmail.config.settings"
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr "마지막으로 가져온 날짜"
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "이메일 개수"
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr "원본 유지"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced Options"
+msgstr "고급 옵션"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr "구성"
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "스크립트"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr "수신 메일 서버"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:163
+#, python-format
+msgid "Connection test failed!"
+msgstr "연결 시험에 실패함!"
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr "사용자명"
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr "메일서버의 호스트이름 또는 IP"
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr "이름"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:163
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s."
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr "시험 & 확정"
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr "서버 동작"
+
+#. module: fetchmail
+#: field:mail.mail,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr "수신메일서버"
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "메시지"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr "수신메일서버 검색"
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr "활성"
+
+#. module: fetchmail
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr "발신 이메일"
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "서버 우선 순위"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr "IMAP 서버"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "암호"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr "수신 메일에 실행할 동작"
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr "서버 유형"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr "로그인 정보"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr "서버 정보"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr "SSL이 필요할 경우."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr "고급"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "서버 & 로그인"
+
+#. module: fetchmail
+#: help:fetchmail.server,object_id:0
+msgid ""
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "확정되지 않음"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP 서버"
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "포트"

addons/google_base_account/__init__.py

@@ -20,7 +20,6 @@
 ##############################################################################
 
 import google_base_account
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/google_base_account/__openerp__.py

@@ -30,10 +30,9 @@ The module adds google user in res user.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
+    'depends': ['base_setup'],
     'data': [
-        'google_base_account_view.xml',
-        'wizard/google_login_view.xml',
+        'google_base_account_data.xml',
     ],
     'demo': [],
     'installable': True,

addons/google_base_account/google_base_account.py

@@ -19,14 +19,48 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
-    
-class res_users(osv.osv):
-    _inherit = "res.users"
-    _columns = {
-        'gmail_user': fields.char('Username', size=64,),
-        'gmail_password': fields.char('Password', size=64),
-    }
+from openerp.osv import osv
+from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
+
+import urllib
+import urllib2
+import simplejson
+
+
+class google_service(osv.osv):
+    _name = 'google.service'
+
+    def generate_refresh_token(self, cr, uid, service, authorization_code, context=None):
+        if authorization_code:
+            ir_config = self.pool['ir.config_parameter']
+            client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service)
+            client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_secret' % service)
+            redirect_uri = ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri')
+
+            #Get the Refresh Token From Google And store it in ir.config_parameter
+            headers = {"Content-type": "application/x-www-form-urlencoded"}
+            data = dict(code=authorization_code, client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri, grant_type="authorization_code")
+            data = urllib.urlencode(data)
+            try:
+                req = urllib2.Request("https://accounts.google.com/o/oauth2/token", data, headers)
+                content = urllib2.urlopen(req).read()
+            except urllib2.HTTPError:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
+
+            content = simplejson.loads(content)
+        return content.get('refresh_token')
+
+    def _get_google_token_uri(self, cr, uid, service, context=None):
+        ir_config = self.pool['ir.config_parameter']
+        params = {
+            'scope': 'https://www.googleapis.com/auth/drive',
+            'redirect_uri': ir_config.get_param(cr, SUPERUSER_ID, 'google_redirect_uri'),
+            'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service),
+            'response_type': 'code',
+            'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service),
+        }
+        uri = 'https://accounts.google.com/o/oauth2/auth?%s' % urllib.urlencode(params)
+        return uri
 
 # vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
-

addons/google_base_account/google_base_account_data.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+    	<record id="config_google_redirect_uri" model="ir.config_parameter">
+            <field name="key">google_redirect_uri</field>
+            <field name="value">urn:ietf:wg:oauth:2.0:oob</field>
+        </record>
+    </data>
+</openerp>

addons/google_base_account/google_base_account_view.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record id="view_users_gogole_form" model="ir.ui.view">
-            <field name="name">res.users.google.form1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook" position="inside">
-                    <page string="Synchronization">
-                        <group string="Google Account" colspan="4">
-                            <field name="gmail_user"/>
-                            <field name="gmail_password" password="True"/>
-                        </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>

addons/google_base_account/wizard/__init__.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import google_login
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/google_base_account/wizard/google_login.py

@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields,osv
-from openerp.tools.translate import _
-try:
-    import gdata.contacts.service
-    import gdata.contacts.client
-    import gdata.calendar.service
-except ImportError:
-    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
-
-class google_login(osv.osv_memory):
-    _description ='Google Contact'
-    _name = 'google.login'
-    _columns = {
-        'user': fields.char('Google Username', size=64, required=True),
-        'password': fields.char('Google Password', size=64),
-    }
-
-    def google_login(self, user, password, type='', context=None):
-        if type == 'group':
-            gd_client = gdata.contacts.service.ContactsService()
-        elif type == 'contact':
-            gd_client = gdata.contacts.service.ContactsService()
-        elif type == 'calendar':
-            gd_client = gdata.calendar.service.CalendarService()
-        elif type =='docs_client':
-            gd_client = gdata.docs.client.DocsClient()
-        else:
-            gd_client = gdata.contacts.service.ContactsService()
-        try:
-            gd_client.ClientLogin(user, password, gd_client.source)
-        except Exception:
-            return False
-        return gd_client
-
-
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(google_login, self).default_get(cr, uid, fields, context=context)
-        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
-        if 'user' in fields:
-            res.update({'user': user_obj.gmail_user})
-        if 'password' in fields:
-            res.update({'password': user_obj.gmail_password})
-        return res
-
-    def login(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids)[0]
-        user = data['user']
-        password = data['password']
-        if self.google_login(user, password):
-            res = {
-                   'gmail_user': user,
-                   'gmail_password': password
-            }
-            self.pool.get('res.users').write(cr, uid, uid, res, context=context)
-        else:
-            raise osv.except_osv(_('Error!'), _("Authentication failed. Check the user and password."))
-
-        return self._get_next_action(cr, uid, context=context)
-
-    def _get_next_action(self, cr, uid, context=None):
-        return {'type': 'ir.actions.act_window_close'}
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/google_base_account/wizard/google_login_view.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_google_login_form">
-            <field name="name">google.login.form</field>
-            <field name="model">google.login</field>
-            <field name="arch" type="xml">
-                <form string="Google login"  version="7.0">
-                    <group>
-                        <field name="user" placeholder="e.g. user@gmail.com"/>
-                        <field name="password" password="True"/>
-                    </group>
-                    <footer>
-                        <button name="login" string="_Login" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-        
-        <!-- 
-            Login Action 
-        -->
-        <record model="ir.actions.act_window" id="act_google_login_form">
-          <field name="name">Google Login</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.login</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-          <field name="view_id" ref="view_google_login_form" />
-        </record>
-    </data>
-</openerp>

addons/google_docs/__init__.py

@@ -1 +0,0 @@
-import google_docs

addons/google_docs/google_docs.py

@@ -1,193 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2012 OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import logging
-from datetime import datetime
-
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-_logger = logging.getLogger(__name__)
-
-try:
-    import gdata.docs.data
-    import gdata.docs.client
-
-    # API breakage madness in the gdata API - those guys are insane. 
-    try:
-        # gdata 2.0.15+
-        gdata.docs.client.DocsClient.copy_resource
-    except AttributeError:
-        # gdata 2.0.14- : copy_resource() was copy()
-        gdata.docs.client.DocsClient.copy_resource = gdata.docs.client.DocsClient.copy
-
-    try:
-        # gdata 2.0.16+
-        gdata.docs.client.DocsClient.get_resource_by_id
-    except AttributeError:
-        try:
-            # gdata 2.0.15+
-            gdata.docs.client.DocsClient.get_resource_by_self_link
-            def get_resource_by_id_2_0_16(self, resource_id, **kwargs):
-                return self.GetResourceBySelfLink(
-                    gdata.docs.client.RESOURCE_FEED_URI + ('/%s' % resource_id), **kwargs)
-            gdata.docs.client.DocsClient.get_resource_by_id = get_resource_by_id_2_0_16
-        except AttributeError:
-            # gdata 2.0.14- : alias get_resource_by_id()
-            gdata.docs.client.DocsClient.get_resource_by_id = gdata.docs.client.DocsClient.get_doc
-
-    try:
-        import atom.http_interface
-        _logger.info('GData lib version `%s` detected' % atom.http_interface.USER_AGENT)
-    except (ImportError, AttributeError):
-        _logger.debug('GData lib version could not be detected', exc_info=True)
-
-except ImportError:
-    _logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list")
-
-
-class google_docs_ir_attachment(osv.osv):
-    _inherit = 'ir.attachment'
-
-    def _auth(self, cr, uid, context=None):
-        '''
-        Connexion with google base account
-        @return client object for connexion
-        '''
-        #pool the google.login in google_base_account
-        google_pool = self.pool.get('google.login')
-        #get gmail password and login. We use default_get() instead of a create() followed by a read() on the 
-        # google.login object, because it is easier. The keys 'user' and 'password' ahve to be passed in the dict
-        # but the values will be replaced by the user gmail password and login.
-        user_config = google_pool.default_get(cr, uid, {'user' : '' , 'password' : ''}, context=context)
-        #login gmail account
-        client = google_pool.google_login(user_config['user'], user_config['password'], type='docs_client', context=context)
-        if not client:
-            raise osv.except_osv(_('Google Docs Error!'), _("Check your google configuration in Users/Users/Synchronization tab."))
-        _logger.info('Logged into google docs as %s', user_config['user'])
-        return client
-
-    def create_empty_google_doc(self, cr, uid, res_model, res_id, context=None):
-        '''Create a new google document, empty and with a default type (txt)
-           :param res_model: the object for which the google doc is created
-           :param res_id: the Id of the object for which the google doc is created
-           :return: the ID of the google document object created
-        '''
-        #login with the base account google module
-        client = self._auth(cr, uid, context=context)
-        # create the document in google docs
-        title = "%s %s" % (context.get("name","Untitled Document."), datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT))
-        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL,title=title)
-        #create a new doc in Google Docs 
-        gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
-        # create an ir.attachment into the db
-        self.create(cr, uid, {
-            'res_model': res_model,
-            'res_id': res_id,
-            'type': 'url',
-            'name': title,
-            'url': gdocs_resource.get_alternate_link().href,
-        }, context=context)
-        return {'resource_id': gdocs_resource.resource_id.text,
-                'title': title,
-                'url': gdocs_resource.get_alternate_link().href}
-
-    def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
-        '''
-        copy an existing document in google docs
-           :param res_model: the object for which the google doc is created
-           :param res_id: the Id of the object for which the google doc is created
-           :param name_gdocs: the name of the future ir.attachment that will be created. Based on the google doc template foun.
-           :param gdoc_template_id: the id of the google doc document to copy
-           :return: the ID of the google document object created
-        '''
-        #login with the base account google module
-        client = self._auth(cr, uid)
-        # fetch and copy the original document
-        try:
-            doc = client.get_resource_by_id(gdoc_template_id)
-            #copy the document you choose in the configuration
-            copy_resource = client.copy_resource(doc, name_gdocs)
-        except:
-            raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL."))
-        # create an ir.attachment
-        self.create(cr, uid, {
-            'res_model': res_model,
-            'res_id': res_id,
-            'type': 'url',
-            'name': name_gdocs,
-            'url': copy_resource.get_alternate_link().href
-        }, context=context)
-        return copy_resource.resource_id.text
-
-    def google_doc_get(self, cr, uid, res_model, ids, context=None):
-        '''
-        Function called by the js, when no google doc are yet associated with a record, with the aim to create one. It
-        will first seek for a google.docs.config associated with the model `res_model` to find out what's the template
-        of google doc to copy (this is usefull if you want to start with a non-empty document, a type or a name 
-        different than the default values). If no config is associated with the `res_model`, then a blank text document
-        with a default name is created.
-          :param res_model: the object for which the google doc is created
-          :param ids: the list of ids of the objects for which the google doc is created. This list is supposed to have
-            a length of 1 element only (batch processing is not supported in the code, though nothing really prevent it)
-          :return: the google document object created
-        '''
-        if len(ids) != 1:
-            raise osv.except_osv(_('Google Docs Error!'), _("Creating google docs may only be done by one at a time."))
-        res_id = ids[0]
-        pool_ir_attachment = self.pool.get('ir.attachment')
-        pool_gdoc_config = self.pool.get('google.docs.config')
-        name_gdocs = ''
-        model_fields_dic = self.pool[res_model].read(cr, uid, res_id, [], context=context)
-
-        # check if a model is configured with a template
-        google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
-        if google_docs_config:
-            name_gdocs = pool_gdoc_config.browse(cr, uid, google_docs_config, context=context)[0].name_template
-            try:
-                name_gdocs = name_gdocs % model_fields_dic
-            except:
-                raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
-            google_template_id = pool_gdoc_config.browse(cr, uid, google_docs_config[0], context=context).gdocs_resource_id
-            google_document = pool_ir_attachment.copy_gdoc(cr, uid, res_model, res_id, name_gdocs, google_template_id, context=context)
-        else:
-            google_document = pool_ir_attachment.create_empty_google_doc(cr, uid, res_model, res_id, context=context)
-        return google_document
-
-class config(osv.osv):
-    _name = 'google.docs.config'
-    _description = "Google Docs templates config"
-
-    _columns = {
-        'model_id': fields.many2one('ir.model', 'Model', required=True),
-        'gdocs_resource_id': fields.char('Google Resource ID to Use as Template', size=64, help='''
-This is the id of the template document, on google side. You can find it thanks to its URL: 
-*for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`
-*for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`
-*for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`
-*for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
-...
-''', required=True),
-        'name_template': fields.char('Google Doc Name Pattern', size=64, help='Choose how the new google docs will be named, on google side. Eg. gdoc_%(field_name)s', required=True),
-    }
-
-    _defaults = {
-        'name_template': 'gdoc_%(name)s',
-    }

addons/google_docs/i18n/ar.po

@@ -1,188 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-25 21:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@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: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a presentation (slide show) document with url like "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, the ID is `presentation:123456789`"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a text document with url like "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
-"`document:123456789`"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a drawing document with url like "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
-"`drawings:123456789`"
-msgstr ""
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"This is the id of the template document, on google side. You can find it "
-"thanks to its URL:"
-msgstr ""
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr ""
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/js/gdocs.js:25
-#, python-format
-msgid ""
-"The user google credentials are not set yet. Contact your administrator for "
-"help."
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a spreadsheet document with url like "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"the ID is `spreadsheet:123456789`"
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:129
-#, python-format
-msgid ""
-"Your resource id is not correct. You can find the id in the google docs URL."
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:153
-#, python-format
-msgid "Creating google docs may only be done by one at a time."
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#: code:addons/google_docs/google_docs.py:129
-#: code:addons/google_docs/google_docs.py:153
-#, python-format
-msgid "Google Docs Error!"
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr ""
-
-#. module: google_docs
-#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config
-msgid "Models configuration"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr ""
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/js/gdocs.js:28
-#, python-format
-msgid "User Google credentials are not yet set."
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Your Google Doc Name Pattern's key does not found in object."
-msgstr ""
-
-#. module: google_docs
-#: help:google.docs.config,name_template:0
-msgid ""
-"Choose how the new google docs will be named, on google side. Eg. "
-"gdoc_%(field_name)s"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr ""
-
-#. module: google_docs
-#: help:google.docs.config,gdocs_resource_id:0
-msgid ""
-"\n"
-"This is the id of the template document, on google side. You can find it "
-"thanks to its URL: \n"
-"*for a text document with url like "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
-"`document:123456789`\n"
-"*for a spreadsheet document with url like "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"the ID is `spreadsheet:123456789`\n"
-"*for a presentation (slide show) document with url like "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, the ID is `presentation:123456789`\n"
-"*for a drawing document with url like "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
-"`drawings:123456789`\n"
-"...\n"
-msgstr ""
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr ""

addons/google_docs/i18n/cs.po

@@ -1,188 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-31 16:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech <cs@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: 2013-04-01 05:06+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a presentation (slide show) document with url like "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, the ID is `presentation:123456789`"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a text document with url like "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
-"`document:123456789`"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a drawing document with url like "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
-"`drawings:123456789`"
-msgstr ""
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"This is the id of the template document, on google side. You can find it "
-"thanks to its URL:"
-msgstr ""
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr ""
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/js/gdocs.js:25
-#, python-format
-msgid ""
-"The user google credentials are not set yet. Contact your administrator for "
-"help."
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a spreadsheet document with url like "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"the ID is `spreadsheet:123456789`"
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:129
-#, python-format
-msgid ""
-"Your resource id is not correct. You can find the id in the google docs URL."
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:153
-#, python-format
-msgid "Creating google docs may only be done by one at a time."
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#: code:addons/google_docs/google_docs.py:129
-#: code:addons/google_docs/google_docs.py:153
-#, python-format
-msgid "Google Docs Error!"
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr ""
-
-#. module: google_docs
-#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config
-msgid "Models configuration"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr ""
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/js/gdocs.js:28
-#, python-format
-msgid "User Google credentials are not yet set."
-msgstr ""
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Your Google Doc Name Pattern's key does not found in object."
-msgstr ""
-
-#. module: google_docs
-#: help:google.docs.config,name_template:0
-msgid ""
-"Choose how the new google docs will be named, on google side. Eg. "
-"gdoc_%(field_name)s"
-msgstr ""
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr ""
-
-#. module: google_docs
-#: help:google.docs.config,gdocs_resource_id:0
-msgid ""
-"\n"
-"This is the id of the template document, on google side. You can find it "
-"thanks to its URL: \n"
-"*for a text document with url like "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
-"`document:123456789`\n"
-"*for a spreadsheet document with url like "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"the ID is `spreadsheet:123456789`\n"
-"*for a presentation (slide show) document with url like "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, the ID is `presentation:123456789`\n"
-"*for a drawing document with url like "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
-"`drawings:123456789`\n"
-"...\n"
-msgstr ""
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr ""

addons/google_docs/i18n/de.po

@@ -1,226 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-10 11:38+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
-"Language-Team: German <de@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: 2013-03-16 05:53+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Key Error!"
-msgstr "Fehler im 'Key' !"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a presentation (slide show) document with url like "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, the ID is `presentation:123456789`"
-msgstr ""
-"Am Beispiel einer Präsentation (slide show) unter einer URL wie "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, ist die ID die folgende `presentation:123456789`"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a text document with url like "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
-"`document:123456789`"
-msgstr ""
-"Am Beispiel eines textdokuments (doc) unter einer URL wie "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, ist die "
-"ID die folgende  `document:123456789`"
-
-#. module: google_docs
-#: field:google.docs.config,gdocs_resource_id:0
-msgid "Google Resource ID to Use as Template"
-msgstr "Google Resource ID als Vorlage"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a drawing document with url like "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
-"`drawings:123456789`"
-msgstr ""
-"Am Beispiel einer Zeichnung (drawings) unter einer URL wie "
-"'https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, ist die "
-"ID die folgende `drawings:123456789`"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/xml/gdocs.xml:6
-#, python-format
-msgid "Add Google Doc..."
-msgstr "Google Doc hinzufügen ..."
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"This is the id of the template document, on google side. You can find it "
-"thanks to its URL:"
-msgstr ""
-"Dieses ist die ID Ihrer Textvorlage auf der Google Seite. Sie können diese "
-"dank Ihrer URL finden unter:"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_google_docs_config
-msgid "Google Docs templates config"
-msgstr "Konfiguration Google Docs Vorlage"
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/js/gdocs.js:25
-#, python-format
-msgid ""
-"The user google credentials are not set yet. Contact your administrator for "
-"help."
-msgstr ""
-"Die google Anmeldedaten für den Benutzer wurden nicht hinterlegt. Bitte "
-"kontaktieren Sie Ihren Administrator."
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid ""
-"for a spreadsheet document with url like "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"the ID is `spreadsheet:123456789`"
-msgstr ""
-"Am Beispiel einer Tabelle (spreadsheet) unter einer URL wie "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"ist die ID die folgende `spreadsheet:123456789`"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:129
-#, python-format
-msgid ""
-"Your resource id is not correct. You can find the id in the google docs URL."
-msgstr ""
-"Die ID der Resource ist nicht korrekt. Sie können die ID über Ihre google "
-"docs URL finden."
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:153
-#, python-format
-msgid "Creating google docs may only be done by one at a time."
-msgstr "Es kann nur ein google doc zur gleichen Zeit bearbeitet werden"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#: code:addons/google_docs/google_docs.py:129
-#: code:addons/google_docs/google_docs.py:153
-#, python-format
-msgid "Google Docs Error!"
-msgstr "Google Docs Fehler !"
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:83
-#, python-format
-msgid "Check your google configuration in Users/Users/Synchronization tab."
-msgstr ""
-"Prüfen Sie Ihre google Einstellungen unter dem Aktenreiter Benutzer / "
-"Benutzer / Synchronisation."
-
-#. module: google_docs
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
-msgid "Google Docs configuration"
-msgstr "Google Docs Konfiguration"
-
-#. module: google_docs
-#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config
-#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config
-msgid "Models configuration"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,model_id:0
-msgid "Model"
-msgstr ""
-
-#. module: google_docs
-#. openerp-web
-#: code:addons/google_docs/static/src/js/gdocs.js:28
-#, python-format
-msgid "User Google credentials are not yet set."
-msgstr "Die google Anmeldedaten wurden noch nicht hinterlegt."
-
-#. module: google_docs
-#: code:addons/google_docs/google_docs.py:167
-#, python-format
-msgid "Your Google Doc Name Pattern's key does not found in object."
-msgstr "Ihr google doc Bezeichnungsmuster konnte hier nicht gefunden werden"
-
-#. module: google_docs
-#: help:google.docs.config,name_template:0
-msgid ""
-"Choose how the new google docs will be named, on google side. Eg. "
-"gdoc_%(field_name)s"
-msgstr ""
-"Wählen Sie aus wie das google doc in google side bezeichnet werden soll, "
-"z.B. gdoc_%(field_name)s"
-
-#. module: google_docs
-#: view:google.docs.config:0
-msgid "Google Docs Configuration"
-msgstr "Google Docs Konfiguration"
-
-#. module: google_docs
-#: help:google.docs.config,gdocs_resource_id:0
-msgid ""
-"\n"
-"This is the id of the template document, on google side. You can find it "
-"thanks to its URL: \n"
-"*for a text document with url like "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
-"`document:123456789`\n"
-"*for a spreadsheet document with url like "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
-"the ID is `spreadsheet:123456789`\n"
-"*for a presentation (slide show) document with url like "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
-".p`, the ID is `presentation:123456789`\n"
-"*for a drawing document with url like "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
-"`drawings:123456789`\n"
-"...\n"
-msgstr ""
-"\n"
-"Dies ist die ID der Dokumenten Vorlage unter google sides. Sie können diese "
-"dank seiner URL einfach finden:\n"
-"* für ein Textdokument mit einer url wie "
-"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, ist die "
-"ID `document: 123456789`\n"
-"* für eine Tabellenkalkulation mit einer url wie "
-"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789 # gid = "
-"0`, ist die ID `spreadsheet: 123456789`\n"
-"* für eine Präsentation (slide show) mit einer url wie "
-"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit # slide "
-"= id.p`, ist die ID `presentation: 123456789 `\n"
-"* für eine Zeichnung mit einer url wie "
-"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, ist die "
-"ID `drawings: 123456789`\n"
-
-#. module: google_docs
-#: model:ir.model,name:google_docs.model_ir_attachment
-msgid "ir.attachment"
-msgstr ""
-
-#. module: google_docs
-#: field:google.docs.config,name_template:0
-msgid "Google Doc Name Pattern"
-msgstr "Google Doc Bezeichnungsmuster"