+
-
+
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 1d77a3f9473..5f6463508b6 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -1,5 +1,6 @@
import openerp
from openerp.osv import osv
+from openerp import SUPERUSER_ID
class res_users(osv.Model):
_inherit = 'res.users'
@@ -15,9 +16,9 @@ class res_users(osv.Model):
#
user_template_id = self.pool.get('ir.config_parameter').get_param(cr, uid, 'auth.signup_template_user_id', 0)
if user_template_id:
- self.pool.get('res.users').copy(cr, 1, user_template_id, new_user, context=context)
+ self.pool.get('res.users').copy(cr, SUPERUSER_ID, user_template_id, new_user, context=context)
else:
- self.pool.get('res.users').create(cr, 1, new_user, context=context)
+ self.pool.get('res.users').create(cr, SUPERUSER_ID, new_user, context=context)
def auth_signup(self, cr, uid, name, login, password, context=None):
r = (cr.dbname, login, password)
diff --git a/addons/base_gengo/__init__.py b/addons/base_gengo/__init__.py
new file mode 100644
index 00000000000..133fa90dc51
--- /dev/null
+++ b/addons/base_gengo/__init__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Openerp sa (
).
+#
+# 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 .
+#
+##############################################################################
+
+import res_company
+import ir_translation
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
new file mode 100644
index 00000000000..ae61ad8f13c
--- /dev/null
+++ b/addons/base_gengo/__openerp__.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+{
+ 'name': 'Automated Translations through Gengo API',
+ 'version': '0.1',
+ 'category': 'Tools',
+ 'description': """
+Automated Translations through Gengo API
+----------------------------------------
+ This module will install passive scheduler job for automated translations
+using the Gengo API. To activate it, you must
+1) Configure your Gengo authentication parameters under `Settings > Companies > Gengo Parameters`
+2) Launch the wizard under `Settings > Application Terms > Gengo: Manual Request of Translation` and follow the wizard.
+
+This wizard will activate the CRON job and the Scheduler and will start the automatic translation via Gengo Services for all the terms where you requested it.
+ """,
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['base'],
+ 'init_xml': ['gengo_sync_schedular_data.xml'],
+ 'update_xml': [
+ 'ir_translation.xml',
+ 'res_company_view.xml',
+ 'wizard/base_gengo_translations_view.xml',
+ ],
+ 'demo_xml': [],
+ 'test': [],
+ 'installable': True,
+ 'auto_install': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
new file mode 100644
index 00000000000..823ca8f14db
--- /dev/null
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+ Gengo Sync Translation (Response)
+
+ 20
+ minutes
+ -1
+
+
+
+
+
+
+
+ Gengo Sync Translation (Request)
+
+ 20
+ minutes
+ -1
+
+
+
+
+
+
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
new file mode 100644
index 00000000000..7b864aba8ce
--- /dev/null
+++ b/addons/base_gengo/ir_translation.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+LANG_CODE_MAPPING = {
+ 'ar_SA': ('ar', 'Arabic'),
+ 'id_ID': ('id', 'Indonesian'),
+ 'nl_NL': ('nl', 'Dutch'),
+ 'fr_CA': ('fr-ca', 'French (Canada)'),
+ 'pl_PL': ('pl', 'Polish'),
+ 'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
+ 'sv_SE': ('sv', 'Swedish'),
+ 'ko_KR': ('ko', 'Korean'),
+ 'pt_PT': ('pt', 'Portuguese (Europe)'),
+ 'en_US': ('en', 'English'),
+ 'ja_JP': ('ja', 'Japanese'),
+ 'es_ES': ('es', 'Spanish (Spain)'),
+ 'zh_CN': ('zh', 'Chinese (Simplified)'),
+ 'de_DE': ('de', 'German'),
+ 'fr_FR': ('fr', 'French'),
+ 'fr_BE': ('fr', 'French'),
+ 'ru_RU': ('ru', 'Russian'),
+ 'it_IT': ('it', 'Italian'),
+ 'pt_BR': ('pt-br', 'Portuguese (Brazil)')
+}
+
+class ir_translation(osv.Model):
+ _name = "ir.translation"
+ _inherit = "ir.translation"
+ _columns = {
+ 'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
+ 'job_id': fields.char('Gengo Job ID', size=32),
+ "gengo_translation": fields.selection([('machine', 'Translation By Machine'),
+ ('standard', 'Standard'),
+ ('pro', 'Pro'),
+ ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.'),
+ }
+
+ def _get_all_supported_languages(self, cr, uid, context=None):
+ flag, gengo = self.pool.get('base.gengo.translations').gengo_authentication(cr, uid, context=context)
+ if not flag:
+ raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+ supported_langs = {}
+ lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+ if lang_pair['opstat'] == 'ok':
+ for g_lang in lang_pair['response']:
+ if g_lang['lc_tgt'] not in supported_langs:
+ supported_langs[g_lang['lc_tgt']] = []
+ supported_langs[g_lang['lc_tgt']] += [g_lang['tier']]
+ return supported_langs
+
+ def _get_gengo_corresponding_language(cr, lang):
+ return lang in LANG_CODE_MAPPING and LANG_CODE_MAPPING[lang][0] or lang
+
+ def _check_lang_support(self, cr, uid, ids, context=None):
+ for term in self.browse(cr, uid, ids, context=context):
+ if term.gengo_translation:
+ supported_langs = self._get_all_supported_languages(cr, uid, context=context)
+ if supported_langs:
+ tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
+ language = self._get_gengo_corresponding_language(term.lang)
+ if tier not in supported_langs.get(language,[]):
+ return False
+ return True
+
+ _constraints = [
+ (_check_lang_support, 'The Gengo translation service selected is not supported for this language.', ['gengo_translation'])
+ ]
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
new file mode 100644
index 00000000000..ba9667d979e
--- /dev/null
+++ b/addons/base_gengo/ir_translation.xml
@@ -0,0 +1,31 @@
+
+
+
+
+ Translations
+ ir.translation
+
+
+
+
+
+
+
+
+
+
+ ir.translation.form.inherit
+
+ ir.translation
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
new file mode 100644
index 00000000000..22d7b343939
--- /dev/null
+++ b/addons/base_gengo/res_company.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import fields, osv
+
+
+class res_company(osv.Model):
+ _name = "res.company"
+ _inherit = "res.company"
+ _columns = {
+ "gengo_private_key": fields.text("Gengo Private Key"),
+ "gengo_public_key": fields.text("Gengo Public Key"),
+ "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
+ "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
+ }
+
+ _defaults = {
+ "gengo_auto_approve": True,
+ }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
new file mode 100644
index 00000000000..0f99efc8ad0
--- /dev/null
+++ b/addons/base_gengo/res_company_view.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+ res.company.form.inherit
+
+ res.company
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_gengo/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
new file mode 100644
index 00000000000..f5dd71be01c
--- /dev/null
+++ b/addons/base_gengo/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+import base_gengo_translations
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
new file mode 100644
index 00000000000..d8a96a2ced9
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -0,0 +1,253 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (C) 2004-2012 OpenERP S.A. ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+import re
+try:
+ from mygengo import MyGengo
+except ImportError:
+ raise osv.except_osv(_('Gengo ImportError'), _('Please install mygengo lib from http://pypi.python.org/pypi/mygengo'))
+
+import logging
+import tools
+import time
+
+_logger = logging.getLogger(__name__)
+
+GENGO_DEFAULT_LIMIT = 20
+
+DEFAULT_CRON_VALS = {
+ 'active': True,
+ 'interval_number': 20,
+ 'interval_type': 'minutes',
+ 'model': "'base.gengo.translations'",
+ 'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
+}
+
+class base_gengo_translations(osv.osv_memory):
+
+ _name = 'base.gengo.translations'
+ _columns = {
+ 'restart_send_job': fields.boolean("Restart Sending Job"),
+ 'lang_id': fields.many2one('res.lang', 'Language', help="Leave empty if you don't want to restrict the request to a single language"),
+ }
+
+ def gengo_authentication(self, cr, uid, context=None):
+ '''
+ This method tries to open a connection with Gengo. For that, it uses the Public and Private
+ keys that are linked to the company (given by Gengo on subscription). It returns a tuple with
+ * as first element: a boolean depicting if the authentication was a success or not
+ * as second element: the connection, if it was a success, or the error message returned by
+ Gengo when the connection failed.
+ This error message can either be displayed in the server logs (if the authentication was called
+ by the cron) or in a dialog box (if requested by the user), thus it's important to return it
+ translated.
+ '''
+
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+ return (False, _("Invalid Gengo configuration. Gengo authentication `Public Key` or `Private Key` is missing. Complete Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
+ try:
+ gengo = MyGengo(
+ public_key=user.company_id.gengo_public_key.encode('ascii'),
+ private_key=user.company_id.gengo_private_key.encode('ascii'),
+ sandbox=True,
+ )
+ gengo.getAccountStats()
+
+ return (True, gengo)
+ except Exception, e:
+ return (False, _("Gengo Connection Error\n%s") %e)
+
+ def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
+ """
+ This function is used to reset a cron to its default values, or to recreate it if it was deleted.
+ """
+ cron_pool = self.pool.get('ir.cron')
+ cron_vals = DEFAULT_CRON_VALS.copy()
+ cron_vals.update({'name': name, "function": fn})
+ try:
+ res = []
+ model, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
+ cron_pool.write(cr, uid, [res], cron_vals, context=context)
+ except:
+ #the cron job was not found, probably deleted previously, so we create it again using default values
+ cron_vals.update({'numbercall': -1})
+ return cron_pool.create(cr, uid, cron_vals, context=context)
+
+ def act_update(self, cr, uid, ids, context=None):
+ '''
+ Function called by the wizard.
+ '''
+ if context == None:
+ context = {}
+
+ flag, gengo = self.gengo_authentication(cr, uid, context=context)
+ if not flag:
+ raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+ for wizard in self.browse(cr, uid, ids, context=context):
+ supported_langs = self.pool.get('ir.translation')._get_all_supported_languages(cr, uid, context=context)
+ language = self.pool.get('ir.translation')._get_gengo_corresponding_language(wizard.lang_id.code)
+ if language not in supported_langs:
+ raise osv.except_osv(_("Warning"), _('This language is not supported by the Gengo translation services.'))
+
+ #send immediately a new request for the selected language (if any)
+ ctx = context.copy()
+ ctx['gengo_language'] = wizard.lang_id.id
+ self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+ self._sync_response( cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+ #check the cron jobs and eventually restart/recreate them
+ if wizard.restart_send_job:
+ self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
+ self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
+ return {'type': 'ir.actions.act_window_close'}
+
+ def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+ """
+ This method will be called by cron services to get translations from
+ Gengo. It will read translated terms and comments from Gengo and will
+ update respective ir.translation in openerp.
+ """
+ translation_pool = self.pool.get('ir.translation')
+ flag, gengo = self.gengo_authentication(cr, uid, context=context)
+ if not flag:
+ _logger.warning("%s", gengo)
+ else:
+ translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', 'in', ('machine','standard','pro','ultra'))], limit=limit, context=context)
+ for term in translation_pool.browse(cr, uid, translation_id, context=context):
+ up_term = up_comment = 0
+ if term.job_id:
+ vals={}
+ job_response = gengo.getTranslationJob(id=term.job_id)
+ if job_response['opstat'] != 'ok':
+ _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
+ continue
+ if job_response['response']['job']['status'] == 'approved':
+ vals.update({'state': 'translated',
+ 'value': job_response['response']['job']['body_tgt']})
+ up_term += 1
+ job_comment = gengo.getTranslationJobComments(id=term.job_id)
+ if job_comment['opstat']=='ok':
+ gengo_comments=""
+ for comment in job_comment['response']['thread']:
+ gengo_comments += _('%s\n\n--\n Commented on %s by %s.') % (comment['body'], time.ctime(comment['ctime']), comment['author'])
+ vals.update({'gengo_comment': gengo_comments})
+ up_comment += 1
+ if vals:
+ translation_pool.write(cr, uid, term.id, vals)
+ _logger.info("Successfully Updated `%d` terms and %d Comments." % (up_term, up_comment ))
+ else:
+ _logger.warning("%s", 'Cannot retrieve the Gengo job ID for translation %s: %s' % (term.id, term.src))
+ return True
+
+ def _update_terms(self, cr, uid, response, context=None):
+ """
+ Update the terms after their translation were requested to Gengo
+ """
+ translation_pool = self.pool.get('ir.translation')
+ for jobs in response['jobs']:
+ for t_id, res in jobs.items():
+ vals = {}
+ t_id = int(t_id)
+ tier = translation_pool.read(cr, uid, [t_id], ['gengo_translation'], context=context)[0]['gengo_translation']
+ if tier == "machine":
+ vals.update({'value': res['body_tgt'], 'state': 'translated'})
+ else:
+ vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
+ translation_pool.write(cr, uid, [t_id], vals, context=context)
+ return
+
+ def pack_jobs_request(self, cr, uid, term_ids, context=None):
+ ''' prepare the terms that will be requested to gengo and returns them in a dictionary with following format
+ {'jobs': {
+ 'term1.id': {...}
+ 'term2.id': {...}
+ }
+ }'''
+
+ translation_pool = self.pool.get('ir.translation')
+ jobs = {}
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ auto_approve = 1 if user.company_id.gengo_auto_approve else 0
+ for term in translation_pool.browse(cr, uid, term_ids, context=context):
+ if re.search(r"\w", term.src or ""):
+ jobs[term.id] = {'type': 'text',
+ 'slug': 'single::English to ' + term.lang,
+ 'tier': tools.ustr(term.gengo_translation),
+ 'body_src': term.src,
+ 'lc_src': 'en',
+ 'lc_tgt': translation_pool._get_gengo_corresponding_language(term.lang),
+ 'auto_approve': auto_approve,
+ 'comment': user.company_id.gengo_comment,
+ }
+ return {'jobs': jobs}
+
+
+ def _send_translation_terms(self, cr, uid, term_ids, context=None):
+ """
+ Send a request to Gengo with all the term_ids in a different job, get the response and update the terms in
+ database accordingly.
+ """
+
+ user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+ flag, gengo = self.gengo_authentication(cr, uid, context=context)
+ if flag:
+ request = self.pack_jobs_request(cr, uid, term_ids, context=context)
+ if request['jobs']:
+ result = gengo.postTranslationJobs(jobs=request)
+ if result['opstat'] == 'ok':
+ self._update_terms(cr, uid, result['response'], context=context)
+ else:
+ _logger.error(gengo)
+ return True
+
+ def _sync_request(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+ """
+ This scheduler will send a job request to the gengo , which terms are
+ waiing to be translated and for which gengo_translation is enabled.
+
+ A special key 'gengo_language' can be passed in the context in order to
+ request only translations of that language only. Its value is the language
+ ID in openerp.
+ """
+ if context is None:
+ context = {}
+ language_pool = self.pool.get('res.lang')
+ translation_pool = self.pool.get('ir.translation')
+ try:
+ #by default, the request will be made for all terms that needs it, whatever the language
+ lang_ids = language_pool.search(cr, uid, [], context=context)
+ if context.get('gengo_language'):
+ #but if this specific key is given, then we restrict the request on terms of this language only
+ lang_ids = [context.get('gengo_language')]
+ langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids, context=context)]
+ #search for the n first terms to translate
+ term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', 'in', ('machine','standard','pro','ultra')), ('lang', 'in', langs)], limit=limit, context=context)
+ if term_ids:
+ self._send_translation_terms(cr, uid, term_ids, context=context)
+ _logger.info("%s Translation terms have been posted to Gengo successfully", len(term_ids))
+ else:
+ _logger.info('No Translation terms to process.')
+ except Exception, e:
+ _logger.error("%s", e)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
new file mode 100644
index 00000000000..09c3a77b1d5
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -0,0 +1,38 @@
+
+
+
+
+ base.gengo.translation.form
+ base.gengo.translations
+
+
+
+
+
+
+ Gengo: Manual Request of Translation
+ ir.actions.act_window
+ base.gengo.translations
+ form
+ form
+ new
+
+
+
+
+
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index ce9fde3914d..96bbd87b971 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/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-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-20 19:34+0000\n"
+"PO-Revision-Date: 2012-08-30 17:01+0000\n"
"Last-Translator: Chertykov Denis \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: 2012-08-28 06:08+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: base_setup
#: field:user.preferences.config,menu_tips:0
@@ -79,12 +79,12 @@ msgstr ""
#. module: base_setup
#: field:product.installer,customers:0
msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
#. module: base_setup
#: selection:user.preferences.config,view:0
msgid "Extended"
-msgstr ""
+msgstr "Расширенный"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -197,7 +197,7 @@ msgstr ""
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Client"
-msgstr ""
+msgstr "Клиент"
#. module: base_setup
#: field:migrade.application.installer.modules,import_saleforce:0
@@ -207,7 +207,7 @@ msgstr ""
#. module: base_setup
#: field:user.preferences.config,context_tz:0
msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
#. module: base_setup
#: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -224,6 +224,8 @@ msgstr ""
msgid ""
"Check out this box if you want to always display tips on each menu action"
msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
#. module: base_setup
#: field:base.setup.terminology,config_logo:0
@@ -261,7 +263,7 @@ msgstr ""
#. module: base_setup
#: selection:user.preferences.config,view:0
msgid "Simplified"
-msgstr ""
+msgstr "Упрощенный"
#. module: base_setup
#: help:migrade.application.installer.modules,import_sugarcrm:0
@@ -271,7 +273,7 @@ msgstr ""
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
#. module: base_setup
#: view:base.setup.terminology:0
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 6b1cc85b6e5..fab81c37340 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/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-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-06 11:58+0000\n"
+"PO-Revision-Date: 2012-08-30 17:52+0000\n"
"Last-Translator: Chertykov Denis \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: 2012-08-28 06:06+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -320,7 +320,7 @@ msgstr "Перспективный партнер"
#: code:addons/crm/crm_lead.py:735
#, python-format
msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
#. module: crm
#: model:crm.case.resource.type,name:crm.type_lead6
@@ -535,7 +535,7 @@ msgstr "Эл. письмо"
#. module: crm
#: view:crm.phonecall:0
msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Звонки за последние 7 дней"
#. module: crm
#: selection:crm.lead.report,creation_month:0
@@ -626,7 +626,7 @@ msgstr "Встреча '%s' была подтверждена."
#. module: crm
#: selection:crm.add.note,state:0 selection:crm.lead,state:0
msgid "In Progress"
-msgstr ""
+msgstr "В процессе"
#. module: crm
#: help:crm.case.section,reply_to:0
@@ -720,7 +720,7 @@ msgstr "Вероятность (%)"
#. module: crm
#: field:crm.lead,company_currency:0
msgid "Company Currency"
-msgstr ""
+msgstr "Валюта организации"
#. module: crm
#: view:crm.lead:0
@@ -763,7 +763,7 @@ msgstr "Остановить процесс"
#. module: crm
#: view:crm.lead.report:0 view:crm.phonecall.report:0
msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
#. module: crm
#: view:crm.phonecall:0
@@ -778,7 +778,7 @@ msgstr "Продолжить"
#. module: crm
#: field:crm.segmentation,som_interval:0
msgid "Days per Period"
-msgstr ""
+msgstr "Дней в периоде"
#. module: crm
#: field:crm.meeting,byday:0
@@ -933,7 +933,7 @@ msgstr "Внимание!"
#. module: crm
#: view:crm.phonecall.report:0
msgid "Phone calls made in current year"
-msgstr ""
+msgstr "Звонки за текущий год"
#. module: crm
#: field:crm.lead,day_open:0
@@ -943,7 +943,7 @@ msgstr "Дней до открытия"
#. module: crm
#: view:crm.meeting:0
msgid "Show Time as"
-msgstr ""
+msgstr "Показать время как"
#. module: crm
#: view:crm.phonecall2partner:0
@@ -973,7 +973,7 @@ msgstr "Мои встречи"
#. module: crm
#: view:crm.phonecall:0
msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Звонки за сегодня"
#. module: crm
#: view:board.board:0
@@ -1030,7 +1030,7 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
msgid "Change Color"
-msgstr ""
+msgstr "Изменить цвет"
#. module: crm
#: view:crm.segmentation:0
@@ -1180,7 +1180,7 @@ msgstr "Письмо партнеру"
#. module: crm
#: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
msgid "Call Details"
-msgstr ""
+msgstr "Детали звонка"
#. module: crm
#: field:crm.meeting,class:0
@@ -1270,7 +1270,7 @@ msgstr "Продолжительность в минутах"
#. module: crm
#: field:crm.case.channel,name:0
msgid "Channel Name"
-msgstr ""
+msgstr "Название канала"
#. module: crm
#: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
@@ -1321,7 +1321,7 @@ msgstr "Дата записи"
#. module: crm
#: view:crm.meeting:0
msgid "End of Recurrency"
-msgstr ""
+msgstr "Конец повторения"
#. module: crm
#: view:crm.meeting:0
@@ -1345,7 +1345,7 @@ msgstr "Установить сигнал на это время, перед с
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
msgid "Schedule a Call"
-msgstr ""
+msgstr "Назначить звонок"
#. module: crm
#: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1433,7 +1433,7 @@ msgstr ""
#. module: crm
#: view:crm.phonecall.report:0
msgid "Date of call"
-msgstr ""
+msgstr "Дата звонка"
#. module: crm
#: help:crm.lead,section_id:0
@@ -1549,7 +1549,7 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
msgid "Mail"
-msgstr ""
+msgstr "Почта"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1905,7 +1905,7 @@ msgstr "Преобразовать в предложение"
#: model:ir.model,name:crm.model_crm_case_channel
#: model:ir.ui.menu,name:crm.menu_crm_case_channel
msgid "Channels"
-msgstr ""
+msgstr "Каналы"
#. module: crm
#: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2181,7 +2181,7 @@ msgstr "Создать нового партнера"
#: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
#: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
msgid "Scheduled Calls"
-msgstr ""
+msgstr "Запланированные звонки"
#. module: crm
#: view:crm.meeting:0 view:res.partner:0
@@ -2191,7 +2191,7 @@ msgstr "Дата начала"
#. module: crm
#: view:crm.phonecall:0
msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Запланированные звонки"
#. module: crm
#: view:crm.meeting:0
@@ -2201,7 +2201,7 @@ msgstr "Отклонить"
#. module: crm
#: field:crm.lead,user_email:0
msgid "User Email"
-msgstr ""
+msgstr "Email пользователя"
#. module: crm
#: help:crm.lead,optin:0
@@ -2387,7 +2387,7 @@ msgstr "Прочее"
#. module: crm
#: model:ir.actions.act_window,name:crm.open_board_crm
msgid "Sales"
-msgstr ""
+msgstr "Продажи"
#. module: crm
#: code:addons/crm/crm.py:430
@@ -2575,7 +2575,7 @@ msgstr "Проверка классификации"
#. module: crm
#: field:crm.lead,user_login:0
msgid "User Login"
-msgstr ""
+msgstr "Логин пользователя"
#. module: crm
#: view:crm.segmentation:0
@@ -2706,7 +2706,7 @@ msgstr ""
#. module: crm
#: field:crm.lead,subjects:0
msgid "Subject of Email"
-msgstr ""
+msgstr "Тема письма"
#. module: crm
#: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2822,7 +2822,7 @@ msgstr ""
#. module: crm
#: field:crm.lead,color:0
msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
#. module: crm
#: view:crm.lead:0
@@ -3010,7 +3010,7 @@ msgstr "Создание предложений из кандидатов"
#: model:ir.actions.act_window,name:crm.open_board_statistical_dash
#: model:ir.ui.menu,name:crm.menu_board_statistics_dash
msgid "CRM Dashboard"
-msgstr ""
+msgstr "Панель аналитики CRM"
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor4
@@ -3095,7 +3095,7 @@ msgstr "Условие на историю общения"
#. module: crm
#: view:crm.phonecall:0
msgid "Date of Call"
-msgstr ""
+msgstr "Дата звонка"
#. module: crm
#: help:crm.segmentation,som_interval:0
@@ -3398,7 +3398,7 @@ msgstr "Закрыть"
#: selection:crm.opportunity2phonecall,action:0
#: selection:crm.phonecall2phonecall,action:0
msgid "Schedule a call"
-msgstr ""
+msgstr "Запланировать звонок"
#. module: crm
#: view:crm.lead:0 view:crm.phonecall:0
@@ -3408,7 +3408,7 @@ msgstr "Категоризация"
#. module: crm
#: view:crm.lead:0
msgid "Log Call"
-msgstr ""
+msgstr "Описать звонок"
#. module: crm
#: model:ir.model,name:crm.model_base_action_rule
@@ -3438,7 +3438,7 @@ msgstr "Кому"
#. module: crm
#: view:crm.lead:0
msgid "Create date"
-msgstr ""
+msgstr "Дата создания"
#. module: crm
#: selection:crm.meeting,class:0
@@ -3470,7 +3470,7 @@ msgstr "Описание"
#. module: crm
#: view:crm.phonecall.report:0
msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Звонки, сделанные в текущем месяце"
#. module: crm
#: selection:crm.lead.report,creation_month:0
@@ -3565,7 +3565,7 @@ msgstr "Проиграно"
#. module: crm
#: view:crm.lead:0
msgid "Edit"
-msgstr ""
+msgstr "Изменить"
#. module: crm
#: field:crm.lead,country_id:0 view:crm.lead.report:0
@@ -3625,6 +3625,9 @@ msgid ""
"channels that will be maintained at the creation of a document in the "
"system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
msgstr ""
+"Отлеживание источников появления кандидатов и предложений путём создания "
+"специализированных каналов, обслуживаемых при создании докумета в системе. "
+"Например, каналы могут быть такими: сайт, телефонный звонок, реселлер и т.д."
#. module: crm
#: selection:crm.lead2opportunity.partner,name:0
@@ -3655,7 +3658,7 @@ msgstr "Последовательность"
#. module: crm
#: model:ir.model,name:crm.model_mail_compose_message
msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Мастер создания электронной почты"
#. module: crm
#: view:crm.meeting:0
@@ -3692,7 +3695,7 @@ msgstr "Год"
#. module: crm
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
#. module: crm
#: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index fe6c76a3ce7..a56875dfe82 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-30 02:54+0000\n"
-"Last-Translator: Bonnie Duan \n"
+"PO-Revision-Date: 2012-08-30 10:41+0000\n"
+"Last-Translator: Walter Cheuk \n"
"Language-Team: Cenoq Corp.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -2307,7 +2307,7 @@ msgstr "動作"
#. module: crm
#: field:crm.segmentation,som_interval_decrease:0
msgid "Decrease (0>1)"
-msgstr "下降因子(0.0>1.0)"
+msgstr "減少 (0>1)"
#. module: crm
#: field:crm.lead.report,deadline_day:0
diff --git a/addons/crm_claim/i18n/zh_TW.po b/addons/crm_claim/i18n/zh_TW.po
index d09ec398c20..1346638c87a 100644
--- a/addons/crm_claim/i18n/zh_TW.po
+++ b/addons/crm_claim/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: crm_claim
#: field:crm.claim.report,nbr:0
@@ -797,14 +797,3 @@ msgstr "建立日期"
#: view:crm.claim:0
msgid "In Progress Claims"
msgstr "正在處理的抱怨"
-
-#~ msgid ""
-#~ "The state is set to 'Draft', when a case is created. \n"
-#~ "If the case is in progress the state is set to 'Open'. \n"
-#~ "When the case is over, the state is set to 'Done'. \n"
-#~ "If the case needs to be reviewed then the state is set to 'Pending'."
-#~ msgstr ""
-#~ "當一個業務建立時狀態設為'草稿'\n"
-#~ "如果業務正在處理狀態設為'開啟'\n"
-#~ "當業務結束狀態設為'完成'\n"
-#~ "如果業務需要審查狀態設為'待定'"
diff --git a/addons/crm_helpdesk/i18n/zh_TW.po b/addons/crm_helpdesk/i18n/zh_TW.po
new file mode 100644
index 00000000000..6cddf9bd735
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/zh_TW.po
@@ -0,0 +1,744 @@
+# Chinese (Traditional) 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 , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:12+0000\n"
+"Last-Translator: Bonnie Duan \n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "本年發生的服務需求"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "視察者的電子郵件"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "加入內部備註"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "客服需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "備註"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "訊息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "我的公司"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "客服分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "下一動作"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "額外資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "估計"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr "上個月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "發送新的電子郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr "之前7天內的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr "新建"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "客服售後服務報表"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr "管道"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr "我的銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "重設為草稿"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "客服分類"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr "新的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "日誌資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr "客服需求月份"
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr "無主題"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr "所有暫停的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr "服務需求的年份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "溝通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr "當月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "關聯2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr "負責使用者"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "計劃成本"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr "通訊管道"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "這些郵件地址將加入到之前發送記錄的發送和接收郵件的郵件副本欄位，分隔多個郵件地址有逗號。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "搜索客服"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "回覆"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "溝通&日誌"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "完整副本"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "搜索"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "這些人將收到電子郵件。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "日誌"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "業務夥伴聯絡人"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "雜項"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "一般"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "傳送提醒"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to. Define "
+"Responsible user and Email account for mail gateway."
+msgstr "屬於此種情況下，銷售團隊。定義負責用戶和電子郵件帳戶的郵件網關。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "客服協助來源"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "負責人"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "說明"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr "為所有的支持請求排序指定具體標準如：處理時間，請求回覆的次數，發送的郵件，成本."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created. "
+" \n"
+"If the case is in progress the state is set to 'Open'. "
+" \n"
+"When the case is over, the state is set to 'Done'. "
+" \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "客服和協助"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "我的業務"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "提問"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "建立和管理客服類型去更好管理和分類你的需求協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr "今天的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr "需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr "打開客服需求"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "最近動作"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+"客服和協助使你可以去追蹤.如果需要選擇一個客戶增加備註和類型這業務夥伴.你可以分配一優先級用系統問題模塊來管理的的支持活動.問題能鏈接郵件閘道.新的郵件可"
+"能建立新的問題,它們能自動寫入於客戶溝通的日誌."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "持續時間"
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
new file mode 100644
index 00000000000..3c77816d71b
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/zh_TW.po
@@ -0,0 +1,885 @@
+# Chinese (Traditional) 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 , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:14+0000\n"
+"Last-Translator: Bonnie Duan \n"
+"Language-Team: Cenoq Corp.MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,send_to:0
+msgid "Send to"
+msgstr "傳送給"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "電子郵件發送後永久刪除"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_to:0
+msgid "Message recipients"
+msgstr "收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "分組..."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "轉寄"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_text:0
+msgid "Plain-text version of the message"
+msgstr "內容的純文字版本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "內文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "潛在客戶"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "#Partner"
+msgstr "#Partner"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "完整的情況"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "無法連接到服務器，請確保你的連線(%s) 正常。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "業務夥伴日期"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_text:0
+msgid "Text contents"
+msgstr "文本內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "訊息唯一編號"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "最近的郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo 緯度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr "在這裡加入你在郵件裡要加入現有的單據附件。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo 指派的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "為潛在客戶指定一個業務夥伴的概率（表示沒指派）"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "內容的富文本/HTML版本"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "密件副本收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均概率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前一個"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "網絡錯誤"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "來自"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "業務夥伴級別"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "發送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "下一個"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "類型"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "內容類型，一般是“html”或“純文本”，用於對應地選擇純文本或富文本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "分配日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "潛在客戶分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "相關單據編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "指定業務夥伴"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "類型用於區分線索和商機"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "階段"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document model"
+msgstr "相關單據模組"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
+#, python-format
+msgid "Fwd"
+msgstr "轉發"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "發送日誌"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "聯絡人"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,use_template:0
+msgid "Use Template"
+msgstr "使用者範本"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天數"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重要性"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr "級別"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "開啟日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "主題"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "#商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr "團隊"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Referred Partner"
+msgstr "推薦的業務夥伴"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr "批量轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "轉為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "指定日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大可能"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "業務開啟的天數"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Geo 經度"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr "商機編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "潛在客戶指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "這業務的業務夥伴已提出/已指定"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text contents"
+msgstr "Rich-text內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "已計劃收入"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.partner.grade"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "Cc"
+msgstr "副本收件人"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,references:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最近30天"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "級別名稱"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "這業務指定/轉發的業務夥伴的最後期限"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "郵件副本收件人"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Geo 定位的日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "當前的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr "郵件發件人，來自使用者的個人設置。如果為空，不發郵件而是發內部消息。"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,nbr:0
+msgid "# of Partner"
+msgstr "# of Partner"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,name:0
+msgid "Partner name"
+msgstr "上級名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "預計收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "指定的業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "地址"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr "發送郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "客戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+msgid "Email Address"
+msgstr "電子郵件地址"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr "國家"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,headers:0
+msgid "Message headers"
+msgstr "郵件頭"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "轉換為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "指定geolocalization"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr "業務夥伴分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr "業務夥伴分配分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "客戶關係管理 線索報表"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "郵件引用，例如前一個郵件的ID"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員用戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "業務資訊"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr "CRM業務夥伴報表"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr "篩選"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "本郵件推薦的回覆地址"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件協同作業"
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index d9f6aa7b8db..93d69eb3093 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -22,6 +22,7 @@
from osv import osv, fields
import tools
import pooler
+from openerp import SUPERUSER_ID
class decimal_precision(osv.osv):
_name = 'decimal.precision'
@@ -56,7 +57,7 @@ decimal_precision()
def get_precision(application):
def change_digit(cr):
- res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, application)
+ res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, application)
return (16, res)
return change_digit
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index b49d418b9c6..84e7f3c7cfa 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-28 03:53+0000\n"
-"Last-Translator: Walter Cheuk \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan \n"
+"Language-Team: Cenoq Corp.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:28+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: document
#: field:document.directory,parent_id:0
@@ -35,7 +35,7 @@ msgstr "名稱欄位"
#. module: document
#: view:board.board:0
msgid "Document board"
-msgstr ""
+msgstr "文件佈告欄"
#. module: document
#: model:ir.model,name:document.model_process_node
@@ -58,7 +58,7 @@ msgstr "用作資源目錄名稱之欄位。如留空，會用該「名稱」。
#: view:document.directory:0
#: view:document.storage:0
msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
#. module: document
#: model:ir.model,name:document.model_document_directory_content_type
@@ -79,7 +79,7 @@ msgstr "檔案"
#. module: document
#: view:report.files.partner:0
msgid "Files per Month"
-msgstr ""
+msgstr "當月文件"
#. module: document
#: selection:report.document.user,month:0
@@ -90,12 +90,12 @@ msgstr "三月"
#. module: document
#: view:document.configuration:0
msgid "title"
-msgstr ""
+msgstr "抬頭"
#. module: document
#: field:document.directory.dctx,expr:0
msgid "Expression"
-msgstr "表達式"
+msgstr "表達方式"
#. module: document
#: view:document.directory:0
@@ -111,7 +111,7 @@ msgstr "目錄內容"
#. module: document
#: view:document.directory:0
msgid "Dynamic context"
-msgstr ""
+msgstr "動態背景"
#. module: document
#: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,11 +125,14 @@ msgid ""
"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
"to the current record, in dynamic folders"
msgstr ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
#. module: document
#: view:report.document.user:0
msgid "This Year"
-msgstr "本年"
+msgstr "今年"
#. module: document
#: field:document.storage,path:0
@@ -146,7 +149,7 @@ msgstr "目錄名不能重覆！"
#. module: document
#: view:ir.attachment:0
msgid "Filter on my documents"
-msgstr ""
+msgstr "過濾我的文件"
#. module: document
#: field:ir.attachment,index_content:0
@@ -158,12 +161,12 @@ msgstr "已索引內容"
msgid ""
"If true, all attachments that match this resource will be located. If "
"false, only ones that have this as parent."
-msgstr ""
+msgstr "如果正確，所有符合資源的附件會被發現。如果錯誤，只有符合資源的附件會被歸屬。"
#. module: document
#: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
msgid "Knowledge Management"
-msgstr ""
+msgstr "知識管理"
#. module: document
#: view:document.directory:0
@@ -175,7 +178,7 @@ msgstr "目錄"
#. module: document
#: model:ir.model,name:document.model_report_document_user
msgid "Files details by Users"
-msgstr "各用戶檔案詳情"
+msgstr "各使用者檔案詳情"
#. module: document
#: code:addons/document/document_storage.py:573
@@ -187,17 +190,17 @@ msgstr "錯誤！"
#. module: document
#: field:document.directory,resource_find_all:0
msgid "Find all resources"
-msgstr ""
+msgstr "尋找所有資源"
#. module: document
#: selection:document.directory,type:0
msgid "Folders per resource"
-msgstr ""
+msgstr "按資源歸類檔案夾"
#. module: document
#: field:document.directory.content,suffix:0
msgid "Suffix"
-msgstr "後綴"
+msgstr "字尾"
#. module: document
#: field:report.document.user,change_date:0
@@ -207,7 +210,7 @@ msgstr "修改日期"
#. module: document
#: view:document.configuration:0
msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "文管設定"
#. module: document
#: view:ir.attachment:0
@@ -219,7 +222,7 @@ msgstr "伙伴"
#. module: document
#: view:board.board:0
msgid "Files by Users"
-msgstr "各用戶檔案"
+msgstr "使用者檔案"
#. module: document
#: field:process.node,directory_id:0
@@ -239,7 +242,7 @@ msgstr "檢驗錯誤"
#. module: document
#: model:ir.model,name:document.model_ir_actions_report_xml
msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
#. module: document
#: model:ir.actions.act_window,name:document.action_document_file_form
@@ -252,13 +255,13 @@ msgstr "文件"
#. module: document
#: constraint:document.directory:0
msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "錯誤! 您不可以建立循環目錄。"
#. module: document
#: view:document.directory:0
#: field:document.directory,storage_id:0
msgid "Storage"
-msgstr ""
+msgstr "存儲器"
#. module: document
#: field:document.directory,ressource_type_id:0
@@ -292,28 +295,28 @@ msgstr "類型"
msgid ""
"Select an object here and there will be one folder per record of that "
"resource."
-msgstr ""
+msgstr "在這裡選擇一個目標，這個資源將會是一筆記錄一個檔案夾"
#. module: document
#: help:document.directory,domain:0
msgid ""
"Use a domain if you want to apply an automatic filter on visible resources."
-msgstr ""
+msgstr "請使用一個領域，如果您要將可見的資源自動過濾。"
#. module: document
#: model:ir.actions.act_window,name:document.action_view_files_by_partner
msgid "Files Per Partner"
-msgstr ""
+msgstr "夥伴文件"
#. module: document
#: field:document.directory,dctx_ids:0
msgid "Context fields"
-msgstr "脈絡欄位"
+msgstr "內文欄位"
#. module: document
#: field:ir.attachment,store_fname:0
msgid "Stored Filename"
-msgstr ""
+msgstr "儲存名稱"
#. module: document
#: view:document.directory:0
@@ -336,7 +339,7 @@ msgstr "七月"
#: model:ir.actions.act_window,name:document.open_board_document_manager
#: model:ir.ui.menu,name:document.menu_reports_document_manager
msgid "Document Dashboard"
-msgstr "文件儀錶板"
+msgstr "文件控制台"
#. module: document
#: field:document.directory.content.type,code:0
@@ -346,7 +349,7 @@ msgstr "延伸檔案"
#. module: document
#: view:ir.attachment:0
msgid "Created"
-msgstr ""
+msgstr "已建立"
#. module: document
#: field:document.directory,content_ids:0
@@ -356,25 +359,25 @@ msgstr "虛擬檔案"
#. module: document
#: view:ir.attachment:0
msgid "Modified"
-msgstr ""
+msgstr "已修改"
#. module: document
#: code:addons/document/document_storage.py:639
#, python-format
msgid "Error at doc write!"
-msgstr ""
+msgstr "文件書寫錯誤!"
#. module: document
#: view:document.directory:0
msgid "Generated Files"
-msgstr ""
+msgstr "已產生檔案"
#. module: document
#: view:document.configuration:0
msgid ""
"When executing this wizard, it will configure your directories automatically "
"according to modules installed."
-msgstr ""
+msgstr "執行這個精靈，它會根據已安裝的模組自動組態您的目錄。"
#. module: document
#: field:document.directory.content,directory_id:0
@@ -397,7 +400,7 @@ msgstr "安全"
#: field:document.storage,write_uid:0
#: field:ir.attachment,write_uid:0
msgid "Last Modification User"
-msgstr "最後修改用戶"
+msgstr "最後修改使用者"
#. module: document
#: model:ir.actions.act_window,name:document.act_res_partner_document
@@ -425,7 +428,7 @@ msgstr "各目錄檔案詳情"
#. module: document
#: view:report.document.user:0
msgid "All users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
#. module: document
#: view:board.board:0
@@ -453,18 +456,18 @@ msgstr "靜態目錄"
#. module: document
#: field:document.directory,child_ids:0
msgid "Children"
-msgstr ""
+msgstr "子目錄"
#. module: document
#: view:document.directory:0
msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "在內文中定義所有的子目錄及檔案"
#. module: document
#: help:document.storage,online:0
msgid ""
"If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "如果未檢查，媒體已離線且其內容也無法使用。"
#. module: document
#: view:document.directory:0
@@ -475,7 +478,7 @@ msgstr ""
#: field:report.document.user,user_id:0
#: field:report.document.wall,user_id:0
msgid "Owner"
-msgstr ""
+msgstr "擁有人"
#. module: document
#: view:document.directory:0
@@ -492,7 +495,7 @@ msgstr "內容"
#: field:document.storage,create_date:0
#: field:report.document.user,create_date:0
msgid "Date Created"
-msgstr ""
+msgstr "產生的日期"
#. module: document
#: help:document.directory.content,include_name:0
@@ -501,12 +504,14 @@ msgid ""
"name.\n"
"If set, the directory will have to be a resource one."
msgstr ""
+"如果您要檔案名稱包含記錄名稱，請檢查這個欄位。\n"
+"如果設定, 這個目錄將會是第一個資源"
#. module: document
#: view:document.configuration:0
#: model:ir.actions.act_window,name:document.action_config_auto_directory
msgid "Configure Directories"
-msgstr ""
+msgstr "目錄組態"
#. module: document
#: field:document.directory.content,include_name:0
@@ -521,26 +526,26 @@ msgstr "附件"
#. module: document
#: field:ir.actions.report.xml,model_id:0
msgid "Model Id"
-msgstr ""
+msgstr "模型 Id"
#. module: document
#: field:document.storage,online:0
msgid "Online"
-msgstr ""
+msgstr "在線上"
#. module: document
#: help:document.directory,ressource_tree:0
msgid ""
"Check this if you want to use the same tree structure as the object selected "
"in the system."
-msgstr ""
+msgstr "檢查這個項目，如果您要在系統中使用相同的樹狀結構當作選擇的目標。"
#. module: document
#: help:document.directory,ressource_id:0
msgid ""
"Along with Parent Model, this ID attaches this folder to a specific record "
"of Parent Model."
-msgstr ""
+msgstr "隨著母模型，這個ID在這個檔案夾附屬在母模型的特定記錄上。"
#. module: document
#: selection:report.document.user,month:0
@@ -551,7 +556,7 @@ msgstr "八月"
#. module: document
#: sql_constraint:document.directory:0
msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目錄不能作自己的母目錄!"
#. module: document
#: selection:report.document.user,month:0
@@ -563,7 +568,7 @@ msgstr "六月"
#: field:report.document.user,user:0
#: field:report.document.wall,user:0
msgid "User"
-msgstr "用戶"
+msgstr "使用者"
#. module: document
#: field:document.directory,group_ids:0
@@ -574,7 +579,7 @@ msgstr "群組"
#. module: document
#: field:document.directory.content.type,active:0
msgid "Active"
-msgstr ""
+msgstr "啟用"
#. module: document
#: selection:report.document.user,month:0
@@ -596,6 +601,8 @@ msgid ""
"record, just like attachments. Don't put a parent directory if you select a "
"parent model."
msgstr ""
+"如果您在這裡放置一個目標，這個目錄範本將會出現下列所有目標。這種目錄是 \"附件\" "
+"於特定的模型或記錄，就像附屬文件。如果您選擇一個母模型，就不要放置母目錄。"
#. module: document
#: view:document.directory:0
@@ -611,7 +618,7 @@ msgstr "十月"
#. module: document
#: view:document.directory:0
msgid "Seq."
-msgstr ""
+msgstr "Seq."
#. module: document
#: selection:document.storage,type:0
@@ -637,12 +644,12 @@ msgstr ""
#. module: document
#: model:ir.ui.menu,name:document.menu_reports_document
msgid "Dashboard"
-msgstr "儀錶板"
+msgstr "控制台"
#. module: document
#: model:ir.actions.act_window,name:document.action_view_user_graph
msgid "Files By Users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
#. module: document
#: field:document.storage,readonly:0
@@ -652,7 +659,7 @@ msgstr "唯讀"
#. module: document
#: model:ir.actions.act_window,name:document.action_document_directory_form
msgid "Document Directory"
-msgstr ""
+msgstr "文件目錄"
#. module: document
#: sql_constraint:document.directory:0
@@ -663,12 +670,12 @@ msgstr "目錄名不能重覆！"
#: field:document.directory,create_uid:0
#: field:document.storage,create_uid:0
msgid "Creator"
-msgstr ""
+msgstr "建置者"
#. module: document
#: field:document.directory.content,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "順序"
#. module: document
#: view:document.configuration:0
@@ -678,6 +685,8 @@ msgid ""
"attached to the document, or to print and download any report. This tool "
"will create directories automatically according to modules installed."
msgstr ""
+"OpenERP's "
+"文件管理系統支援虛擬檔案夾與文件配對。文件的虛擬檔案夾可以用來管理文件的附件，或列印及下載任何報表。這個工具會根據安裝的模組自動產生目錄。"
#. module: document
#: view:board.board:0
@@ -695,7 +704,7 @@ msgstr "九月"
#. module: document
#: field:document.directory.content,prefix:0
msgid "Prefix"
-msgstr "前綴"
+msgstr "字尾"
#. module: document
#: field:report.document.wall,last:0
@@ -710,7 +719,7 @@ msgstr "檔案名稱"
#. module: document
#: view:document.configuration:0
msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
#. module: document
#: field:document.directory,ressource_id:0
@@ -720,19 +729,19 @@ msgstr "資源ID"
#. module: document
#: selection:document.storage,type:0
msgid "External file storage"
-msgstr ""
+msgstr "外部檔案儲存"
#. module: document
#: view:board.board:0
#: model:ir.actions.act_window,name:document.action_view_wall
#: view:report.document.wall:0
msgid "Wall of Shame"
-msgstr ""
+msgstr "排行榜"
#. module: document
#: help:document.storage,path:0
msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "關於檔案儲存，儲存的根路徑"
#. module: document
#: model:ir.model,name:document.model_report_files_partner
@@ -747,17 +756,17 @@ msgstr "欄位"
#. module: document
#: model:ir.model,name:document.model_document_directory_dctx
msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "目錄動態內文"
#. module: document
#: field:document.directory,ressource_parent_type_id:0
msgid "Parent Model"
-msgstr ""
+msgstr "母模型"
#. module: document
#: view:report.document.user:0
msgid "Files by users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
#. module: document
#: field:report.document.file,month:0
@@ -771,12 +780,12 @@ msgstr "月"
#. module: document
#: view:report.document.user:0
msgid "This Months Files"
-msgstr ""
+msgstr "當月檔案"
#. module: document
#: model:ir.ui.menu,name:document.menu_reporting
msgid "Reporting"
-msgstr "報告"
+msgstr "報表"
#. module: document
#: field:document.directory,ressource_tree:0
@@ -792,29 +801,29 @@ msgstr "五月"
#. module: document
#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
msgid "All Users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
#. module: document
#: model:ir.model,name:document.model_report_document_wall
msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "使用者已經一個月未插入文件"
#. module: document
#: model:ir.actions.act_window,help:document.action_document_file_form
msgid ""
"The Documents repository gives you access to all attachments, such as mails, "
"project documents, invoices etc."
-msgstr ""
+msgstr "文件儲存室讓您可以存取所有附件，如電郵、專案文件、商業發票等"
#. module: document
#: view:document.directory:0
msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "對於每一輸入，虛擬檔案在檔案夾中出現"
#. module: document
#: model:ir.model,name:document.model_ir_attachment
msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
#. module: document
#: view:board.board:0
@@ -834,7 +843,7 @@ msgstr "各伙伴檔案"
#. module: document
#: view:ir.attachment:0
msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "已索引內容 - 實驗性質"
#. module: document
#: view:report.document.user:0
@@ -844,12 +853,12 @@ msgstr "本月"
#. module: document
#: view:ir.attachment:0
msgid "Notes"
-msgstr "注解"
+msgstr "備註"
#. module: document
#: model:ir.model,name:document.model_document_configuration
msgid "Directory Configuration"
-msgstr ""
+msgstr "目錄組態"
#. module: document
#: help:document.directory,type:0
@@ -860,6 +869,8 @@ msgid ""
"resources automatically possess sub-directories for each of resource types "
"defined in the parent directory."
msgstr ""
+"每一個目錄可以是靜態或連接於另一個資源。一個靜態的目錄與其作業系統，是一個典型的目錄可以包含一組檔案。這個目錄連接於系統資源，在母目錄中按資源別自動持有次"
+"目錄。"
#. module: document
#: selection:report.document.user,month:0
@@ -871,14 +882,14 @@ msgstr "二月"
#: model:ir.actions.act_window,name:document.open_board_document_manager1
#: model:ir.ui.menu,name:document.menu_reports_document_manager1
msgid "Statistics by User"
-msgstr "各用戶統計"
+msgstr "各使用者統計"
#. module: document
#: help:document.directory.dctx,field:0
msgid ""
"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
"what is typed here."
-msgstr ""
+msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。"
#. module: document
#: field:document.directory,name:0
@@ -889,7 +900,7 @@ msgstr "名稱"
#. module: document
#: sql_constraint:document.storage:0
msgid "The storage path must be unique!"
-msgstr ""
+msgstr "儲存路徑不能重複!"
#. module: document
#: view:document.directory:0
@@ -899,7 +910,7 @@ msgstr "欄位"
#. module: document
#: help:document.storage,readonly:0
msgid "If set, media is for reading only"
-msgstr ""
+msgstr "如果設定，媒體只能唯讀。"
#. module: document
#: selection:report.document.user,month:0
@@ -918,21 +929,21 @@ msgstr "檔案數"
#: code:addons/document/document.py:209
#, python-format
msgid "(copy)"
-msgstr ""
+msgstr "(copy)"
#. module: document
#: view:document.directory:0
msgid ""
"Only members of these groups will have access to this directory and its "
"files."
-msgstr ""
+msgstr "只有這個群組中的數字，才能存取這個目錄及其檔案。"
#. module: document
#: view:document.directory:0
msgid ""
"These groups, however, do NOT apply to children directories, which must "
"define their own groups."
-msgstr ""
+msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。"
#. module: document
#: field:document.directory.content.type,mimetype:0
@@ -942,7 +953,7 @@ msgstr "Mime 類型"
#. module: document
#: view:report.document.user:0
msgid "All Months Files"
-msgstr ""
+msgstr "所有月份文件"
#. module: document
#: field:document.directory.content,name:0
@@ -959,12 +970,12 @@ msgstr "檔案名不能重覆！"
#. module: document
#: selection:document.storage,type:0
msgid "Internal File storage"
-msgstr ""
+msgstr "內部文件儲存"
#. module: document
#: sql_constraint:document.directory:0
msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目錄必須要有母目錄或儲存"
#. module: document
#: model:ir.actions.act_window,name:document.action_document_directory_tree
@@ -1030,3 +1041,6 @@ msgstr "文件類型"
#~ msgid "Product"
#~ msgstr "產品"
+
+#~ msgid "Attached To"
+#~ msgstr "附屬於"
diff --git a/addons/document_page/i18n/zh_TW.po b/addons/document_page/i18n/zh_TW.po
index 0ce1ed5d91b..08d9b01e2d3 100644
--- a/addons/document_page/i18n/zh_TW.po
+++ b/addons/document_page/i18n/zh_TW.po
@@ -7,165 +7,165 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 09:36+0000\n"
+"Last-Translator: Bonnie Duan \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: 2012-08-28 06:43+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: document_page
#: field:document.page.type,template:0
msgid "Document page Template"
-msgstr ""
+msgstr "文檔頁面範本"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_wiki
#: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
msgid "Document Pages"
-msgstr ""
+msgstr "文檔頁面"
#. module: document_page
#: field:document.page.type,method:0
msgid "Display Method"
-msgstr ""
+msgstr "展示方法"
#. module: document_page
#: view:document.page:0 field:document.page,create_uid:0
msgid "Author"
-msgstr ""
+msgstr "作者"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_view_wiki_wiki_page_open
#: view:document.page.page.open:0
msgid "Open Page"
-msgstr ""
+msgstr "開啓葉面"
#. module: document_page
#: field:document.page,menu_id:0
msgid "Menu"
-msgstr ""
+msgstr "選單"
#. module: document_page
#: help:document.page,type:0
msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "表示，這個頁面至少有一個表的內容"
#. module: document_page
#: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
msgid "Document page History"
-msgstr ""
+msgstr "頁面歷史文件"
#. module: document_page
#: field:document.page,minor_edit:0
msgid "Minor edit"
-msgstr ""
+msgstr "小編輯"
#. module: document_page
#: view:document.page:0 field:document.page,content:0
msgid "Content"
-msgstr ""
+msgstr "內容"
#. module: document_page
#: field:document.page,child_ids:0
msgid "Child Pages"
-msgstr ""
+msgstr "子頁面"
#. module: document_page
#: field:document.page,parent_id:0
msgid "Parent Page"
-msgstr ""
+msgstr "上級頁面"
#. module: document_page
#: view:document.page:0 field:document.page,write_uid:0
msgid "Last Contributor"
-msgstr ""
+msgstr "最後的貢獻者"
#. module: document_page
#: field:document.page.create.menu,menu_parent_id:0
msgid "Parent Menu"
-msgstr ""
+msgstr "上級選單"
#. module: document_page
#: field:document.page,name:0
msgid "Title"
-msgstr ""
+msgstr "標題"
#. module: document_page
#: model:ir.model,name:document_page.model_wiki_create_menu
msgid "Wizard Create Menu"
-msgstr ""
+msgstr "嚮導創建選單"
#. module: document_page
#: field:document.page,history_id:0
msgid "History Lines"
-msgstr ""
+msgstr "歷史記錄"
#. module: document_page
#: view:document.page:0
msgid "Page Content"
-msgstr ""
+msgstr "頁面內容"
#. module: document_page
#: code:addons/document_page/document_page.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
#, python-format
msgid "Warning !"
-msgstr ""
+msgstr "警告！"
#. module: document_page
#: code:addons/document_page/document_page.py:237
#, python-format
msgid "There are no changes in revisions"
-msgstr ""
+msgstr "有沒有變化修訂"
#. module: document_page
#: field:document.page.create.menu,menu_name:0
msgid "Menu Name"
-msgstr ""
+msgstr "選單名稱"
#. module: document_page
#: field:document.page.type,notes:0
msgid "Description"
-msgstr ""
+msgstr "描述"
#. module: document_page
#: field:document.page,review:0
msgid "Needs Review"
-msgstr ""
+msgstr "需要回顧"
#. module: document_page
#: help:document.page,review:0
msgid ""
"Indicates that this page should be reviewed, raising the attention of other "
"contributors"
-msgstr ""
+msgstr "表示這個頁面應該檢討，提高其他出資人的注意"
#. module: document_page
#: view:document.page.create.menu:0 view:document.page.make.index:0
msgid "Menu Information"
-msgstr ""
+msgstr "選單資訊"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.act_wiki_wiki_history
msgid "Page History"
-msgstr ""
+msgstr "頁面歷史記錄"
#. module: document_page
#: selection:document.page.type,method:0
msgid "Tree"
-msgstr ""
+msgstr "目錄樹"
#. module: document_page
#: view:document.page.type:0
msgid "Page Template"
-msgstr ""
+msgstr "頁面模版"
#. module: document_page
#: field:document.page,tags:0
msgid "Keywords"
-msgstr ""
+msgstr "關鍵字"
#. module: document_page
#: model:ir.actions.act_window,help:document_page.action_wiki
@@ -175,173 +175,175 @@ msgid ""
"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
"There is a basic wiki editing for text format."
msgstr ""
+"Wiki頁面，您可以與您的同事的想法和問題。您可以創建一個新的文件，可以連接到一個或多個應用程序（客戶關係管理（CRM），銷售等）。您可以使用關鍵字，以便"
+"於訪問到您的wiki頁面。有一個基本的的維基編輯為文本格式。"
#. module: document_page
#: code:addons/document_page/wizard/document_page_show_diff.py:54
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "警告"
#. module: document_page
#: help:document.page.type,home:0
msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "在首頁,需要選擇首頁顯示的方法"
#. module: document_page
#: field:document.page.history,create_date:0
msgid "Date"
-msgstr ""
+msgstr "日期"
#. module: document_page
#: view:document.page.make.index:0
msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
+msgstr "要選定的頁面上創建一個索引呢？ "
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
#: view:wizard.document.page.history.show_diff:0
msgid "Difference"
-msgstr ""
+msgstr "差異"
#. module: document_page
#: field:document.page.type,page_ids:0
msgid "Pages"
-msgstr ""
+msgstr "頁面"
#. module: document_page
#: view:document.page.type:0
msgid "Group Description"
-msgstr ""
+msgstr "群組敘述"
#. module: document_page
#: view:document.page.page.open:0
msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "要打開一個wiki頁面？ "
#. module: document_page
#: field:document.page.history,content:0
msgid "Text area"
-msgstr ""
+msgstr "文本區域"
#. module: document_page
#: view:document.page:0
msgid "Meta Information"
-msgstr ""
+msgstr "中繼資訊"
#. module: document_page
#: field:document.page,create_date:0
msgid "Created on"
-msgstr ""
+msgstr "建立於"
#. module: document_page
#: view:document.page.type:0 view:wizard.document.page.history.show_diff:0
msgid "Notes"
-msgstr ""
+msgstr "備註"
#. module: document_page
#: selection:document.page.type,method:0
msgid "List"
-msgstr ""
+msgstr "列表"
#. module: document_page
#: field:document.page,summary:0 field:document.page.history,edit_summary:0
msgid "Summary"
-msgstr ""
+msgstr "摘要"
#. module: document_page
#: field:document.page.groups,create_date:0
msgid "Created Date"
-msgstr ""
+msgstr "建立日期"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_history
msgid "All Page Histories"
-msgstr ""
+msgstr "所有頁面的歷史記錄"
#. module: document_page
#: model:ir.model,name:document_page.model_wiki_wiki
msgid "document.page"
-msgstr ""
+msgstr "document.page"
#. module: document_page
#: help:document.page.type,method:0
msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "本組創建的選單中定義默認行為"
#. module: document_page
#: view:wizard.document.page.history.show_diff:0
msgid "Close"
-msgstr ""
+msgstr "結束"
#. module: document_page
#: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
#. module: document_page
#: field:document.page.history,wiki_id:0
msgid "Wiki Id"
-msgstr ""
+msgstr "維基標識"
#. module: document_page
#: field:document.page.type,home:0 selection:document.page.type,method:0
msgid "Home Page"
-msgstr ""
+msgstr "首頁"
#. module: document_page
#: help:document.page,parent_id:0
msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "允許您與其他頁的鏈接，在當前主題"
#. module: document_page
#: view:document.page:0
msgid "Modification Information"
-msgstr ""
+msgstr "修改信息"
#. module: document_page
#: model:ir.ui.menu,name:document_page.menu_wiki_configuration view:document.page:0
msgid "Wiki"
-msgstr ""
+msgstr "維基 (Wiki)"
#. module: document_page
#: field:document.page,write_date:0
msgid "Modification Date"
-msgstr ""
+msgstr "修改日期"
#. module: document_page
#: view:document.page.type:0
msgid "Configuration"
-msgstr ""
+msgstr "設置"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index
#: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index_values
#: model:ir.model,name:document_page.model_wiki_make_index view:document.page.make.index:0
msgid "Create Index"
-msgstr ""
+msgstr "創建索引"
#. module: document_page
#: code:addons/document_page/wizard/document_page_show_diff.py:54
#, python-format
msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
+msgstr "您需要選擇最小或最大歷史修訂！"
#. module: document_page
#: view:document.page:0
msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
#: view:document.page.create.menu:0 view:document.page.type:0 view:document.page.make.index:0
msgid "Create Menu"
-msgstr ""
+msgstr "建立選單"
#. module: document_page
#: field:document.page.history,minor_edit:0
msgid "This is a major edit ?"
-msgstr ""
+msgstr "這是一個主要的編輯嗎？"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_wiki_groups
@@ -349,56 +351,56 @@ msgstr ""
#: model:ir.model,name:document_page.model_wiki_groups
#: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
msgid "Document Types"
-msgstr ""
+msgstr "文件類型"
#. module: document_page
#: view:document.page:0
msgid "Topic"
-msgstr ""
+msgstr "主題"
#. module: document_page
#: field:document.page.history,write_uid:0
msgid "Modify By"
-msgstr ""
+msgstr "修改者"
#. module: document_page
#: code:addons/document_page/web/widgets/wikimarkup/__init__.py:1981
#: field:document.page,type:0
#, python-format
msgid "Type"
-msgstr ""
+msgstr "類型"
#. module: document_page
#: view:document.page.type:0 view:document.page.page.open:0
msgid "Open Document Page"
-msgstr ""
+msgstr "開啓文件"
#. module: document_page
#: model:ir.model,name:document_page.model_wiki_wiki_page_open
msgid "wiz open page"
-msgstr ""
+msgstr "WIZ打開的頁面"
#. module: document_page
#: view:document.page.create.menu:0 view:document.page.make.index:0 view:document.page.page.open:0
msgid "Cancel"
-msgstr ""
+msgstr "刪除"
#. module: document_page
#: field:wizard.document.page.history.show_diff,file_path:0
msgid "Diff"
-msgstr ""
+msgstr "差異"
#. module: document_page
#: view:document.page:0
msgid "Need Review"
-msgstr ""
+msgstr "需要回顧"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_wiki_review
msgid "Pages Waiting Review"
-msgstr ""
+msgstr "頁面等待審查"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.act_wiki_group_open
msgid "Search Page"
-msgstr ""
+msgstr "搜尋頁面"
diff --git a/addons/document_webdav/i18n/zh_TW.po b/addons/document_webdav/i18n/zh_TW.po
new file mode 100644
index 00000000000..121d57b341a
--- /dev/null
+++ b/addons/document_webdav/i18n/zh_TW.po
@@ -0,0 +1,196 @@
+# Chinese (Traditional) 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 , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan \n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "建立日期"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "文件"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "錯誤! 您不能建立循環的目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "搜尋文件目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Namespace"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "document.webdav.file.property"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "群組...."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "這些內容將被加到 WebDAV 請求"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "文件的DAV 內容"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV 匯入錯誤!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "文件"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "檔案夾"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "目錄不能成為自己的母目錄!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "動態背景"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "目錄名不能重覆！"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/，請安裝 PyWebDAV"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV 檔案夾內容"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "內容"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "document.webdav.dir.property"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "價值"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "目錄"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "最後修改使用者"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "路徑"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "修改日期"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "建立者"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "目錄必須要有母目錄或儲存室"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "替代項目"
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index d6ceca458cd..a8fedee4fe3 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -25,6 +25,8 @@ from tools.safe_eval import safe_eval as eval
import time
import urllib
import uuid
+from openerp import SUPERUSER_ID
+
try:
from tools.dict_tools import dict_filter
except ImportError:
@@ -233,7 +235,7 @@ class node_acl_mixin(object):
if props_to_delete:
# explicitly delete, as admin, any of the ids we have identified.
- propobj.unlink(cr, 1, props_to_delete)
+ propobj.unlink(cr, SUPERUSER_ID, props_to_delete)
if lock_data.get('unlock_mode', False):
return lock_found and True
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index f1f2e58c835..0f66363c553 100755
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -42,6 +42,7 @@ from tools import config
from xmlrpclib import Transport, ProtocolError
import StringIO
import base64
+from openerp import SUPERUSER_ID
_logger = logging.getLogger(__name__)
@@ -361,7 +362,7 @@ class DAVClient(object):
to break if "base_crypt" is used.
"""
ruob = obj.pool.get('res.users')
- res = ruob.read(cr, 1, [uid,], ['login', 'password'])
+ res = ruob.read(cr, SUPERUSER_ID, [uid,], ['login', 'password'])
assert res, "uid %s not found" % uid
self.user = res[0]['login']
self.passwd = res[0]['password']
diff --git a/addons/edi/i18n/zh_TW.po b/addons/edi/i18n/zh_TW.po
new file mode 100644
index 00000000000..3ea35742e44
--- /dev/null
+++ b/addons/edi/i18n/zh_TW.po
@@ -0,0 +1,386 @@
+# Chinese (Traditional) 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 , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan \n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "每個公司的貨幣代碼必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "業務夥伴地址"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名稱必須唯一！"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員"
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI權杖"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "接收EDI文件的唯一標識符"
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "錯誤！您不能建立循環引用的公司."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI權杖必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr "你要匯入的文件需要OpenERP的 %s 模組。你可以用管理員使用者安裝並打開配置精靈。"
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI文件內容"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI文件"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "%s是個無效的外部ID"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "不存在此功能"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "文件"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+" independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+" It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+" application that will be capable of importing "
+"any OpenERP EDI document.\n"
+" You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+" is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+" using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+" reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+" using one of the following bank accounts. Be sure to "
+"mention the document\n"
+" reference"
+msgstr ""
diff --git a/addons/email_template/i18n/zh_TW.po b/addons/email_template/i18n/zh_TW.po
new file mode 100644
index 00000000000..9094107915f
--- /dev/null
+++ b/addons/email_template/i18n/zh_TW.po
@@ -0,0 +1,711 @@
+# Chinese (Traditional) 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 , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:19+0000\n"
+"Last-Translator: Bonnie Duan \n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
+
+#. module: email_template
+#: field:email.template,subtype:0
+#: field:email_template.preview,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "報表檔名"
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr "SMTP 伺服器"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove the sidebar button currently displayed on related documents"
+msgstr "移除側邊欄按鈕目前顯示在相關的文件"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "側邊欄動作"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr "另存新的範本"
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "主旨 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr "副本收件人 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Received"
+msgstr "收到"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr "側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+"產生的報表文件命名(可能包含佔位符)\n"
+"可以省略分機號碼然後將會成為報表型態."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach existing files"
+msgstr "附加現有文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content"
+msgstr "郵件內容"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr "主旨"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "從"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: email_template
+#: field:email.template,partner_id:0
+#: field:email_template.preview,partner_id:0
+msgid "Related partner"
+msgstr "相關的合作夥伴"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "子欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display a button in the sidebar of related documents to open a composition "
+"wizard with this template"
+msgstr "相關文件螢幕上的精靈列按鈕可打開這範本之精靈"
+
+#. module: email_template
+#: field:email.template,state:0
+#: field:email_template.preview,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Sent"
+msgstr "傳送"
+
+#. module: email_template
+#: help:email.template,subtype:0
+#: help:email_template.preview,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "訊息類型, 經常是'html'或'plain', 用於選擇 plaintext 或 rich text 做為內容"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Values Builder"
+msgstr "建立動態值"
+
+#. module: email_template
+#: field:email.template,res_id:0
+msgid "Related Document ID"
+msgstr "相關文件 ID"
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language Selection"
+msgstr "語言選擇"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr "提出"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr "相關文檔模型"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+"從相關文件類型選擇目標\n"
+"若它是關聯欄位，您就可以在這關聯關係中，取得這欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Null value"
+msgstr "空值"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr "子類型"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+#: help:email_template.preview,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr "啟用，這是您希望包括一個特殊的追蹤電子郵件標記，這樣您就可以找出答覆並連接到相應的資源記錄。這是有用的，例如CRM的線索"
+
+#. module: email_template
+#: field:mail.compose.message,use_template:0
+msgid "Use Template"
+msgstr "使用範本"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Files to attach"
+msgstr "附加的文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "選項"
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Related document model"
+msgstr "相關文件類型"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr "發信人地址(佔位符可以用在這)"
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr "若勾選, 這個合作夥伴將不會收到任何自動郵件回復, 例如有效發票"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "備註: 這是Raw HTML."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "分類方式..."
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr "加入簽名"
+
+#. module: email_template
+#: help:email.template,body_text:0
+#: help:email_template.preview,body_text:0
+msgid "Plaintext version of the message (placeholders may be used here)"
+msgstr "Plaintext 消息版本(佔位符可以用在這)"
+
+#. module: email_template
+#: help:email.template,original:0
+#: help:email_template.preview,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "消息原始版本, 因為它是在網路上發送"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:230
+#, python-format
+msgid "(copy)"
+msgstr "(副本)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Outgoing"
+msgstr "外送"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use a message template"
+msgstr "使用訊息範本"
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr "若勾選, 使用者的簽名將附加到郵件的文字版本"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Rich/HTML)"
+msgstr "內文 (Rich/HTML)"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+"當這相關欄位是選為第一欄位, this field shows the document model the relationship goes to."
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr "郵件範本"
+
+#. module: email_template
+#: field:email.template,date:0
+#: field:email_template.preview,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.preview,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add sidebar button"
+msgstr "加入側邊欄按鈕"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Text)"
+msgstr "內文 (Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "進階選項"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:183
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "傳送郵件 (%s)"
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Rich-text Contents"
+msgstr "富文本內容"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Expression"
+msgstr "表達"
+
+#. module: email_template
+#: field:email.template,original:0
+#: field:email_template.preview,original:0
+msgid "Original"
+msgstr "原作"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "地址"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr "最後的模板欄位，找到要複製-貼上的區塊"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr "郵件詳情"
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr "副本"
+
+#. module: email_template
+#: field:email.template,body_text:0
+#: field:email_template.preview,body_text:0
+msgid "Text Contents"
+msgstr "文字內容"
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "永久刪除已發送的郵件以節省空間"
+
+#. module: email_template
+#: field:email.template,references:0
+#: field:email_template.preview,references:0
+msgid "References"
+msgstr "參考"
+
+#. module: email_template
+#: field:email.template,display_text:0
+#: field:email_template.preview,display_text:0
+msgid "Display Text"
+msgstr "顯示文字"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr "這個範本您可以加入附件, 從這範本新建所有郵件"
+
+#. module: email_template
+#: help:email.template,headers:0
+#: help:email_template.preview,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "發送郵件伺服器"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr "側邊欄動作使這個範本記錄相關的文件類型"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: email_template
+#: field:email.template,user_id:0
+#: field:email_template.preview,user_id:0
+msgid "Related user"
+msgstr "相關使用者"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr "範本"
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "不參加"
+
+#. module: email_template
+#: help:email.template,email_bcc:0
+#: help:email_template.preview,email_bcc:0
+msgid "Blind carbon copy recipients (placeholders may be used here)"
+msgstr "密件副本收件人（佔位符可以用在這裡）"
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+"選擇翻譯語言（ISO代碼）選擇發送電子郵件時。如果沒有設置，將使用英文版本。通常，這應該是一個佔位符，表達式，提供適當的語言代碼，例如$ "
+"{object.partner_id.lang.code}。"
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr "文件範本"
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr "逗號分隔的收件人地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+#: field:email_template.preview,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "資源追蹤"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "預覽郵件範本"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "預覽郵件"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+msgid ""
+"Message-ID SMTP header to use in outgoing messages based on this template. "
+"Please note that this overrides the 'Resource Tracking' option, so if you "
+"simply need to track replies to outgoing emails, enable that option "
+"instead.\n"
+"Placeholders must be used here, as this value always needs to be unique!"
+msgstr ""
+"消息ID SMTP頭使用在基於此模板的傳出消息。請注意，這將覆蓋'資源追蹤'選項，所以如果您只需要跟蹤答覆外發郵件，啟用該選項。\n"
+"佔位符必須用在這裡，這個值永遠必須是唯一的！"
+
+#. module: email_template
+#: field:email.template,headers:0
+#: field:email_template.preview,headers:0
+msgid "Message headers"
+msgstr "訊息頂端"
+
+#. module: email_template
+#: field:email.template,email_bcc:0
+#: field:email_template.preview,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本收件人"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr "首選的回覆地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove sidebar button"
+msgstr "移動側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr "若欄位是空的需選擇使用值"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr "型號"
+
+#. module: email_template
+#: help:email.template,references:0
+#: help:email_template.preview,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "消息引用，如以前的消息標識符"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr "側邊欄按鈕來打開側邊欄動作"
+
+#. module: email_template
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤 ! 您不行建立相關成員"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr "刪除的動作記錄失敗"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr "可選擇伺服器發送的郵件。如果沒有設置，優先級最高的將被使用。"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Delivery Failed"
+msgstr "傳送失敗"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr "當相關欄位已被選擇為第一欄位, 這欄位，讓您選擇目標欄位內的目標文件類型（子類型型）。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach Report"
+msgstr "附加報表"
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr "選擇報表列印與附加"
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr "Rich-text/HTML版本的消息（佔位符可以用在這裡）"
+
+#~ msgid "Sidebar button"
+#~ msgstr "側邊欄按鈕"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件合併精靈"
+
+#~ msgid "Related Document model"
+#~ msgstr "相關文件類型"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "豐富的文字內容"
+
+#~ msgid "Text contents"
+#~ msgstr "文字內容"
+
+#~ msgid "Opt-out"
+#~ msgstr "退出選擇"
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index 55264e50f48..a6c27495e1c 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-08-30 03:33+0000\n"
+"PO-Revision-Date: 2012-08-30 10:20+0000\n"
"Last-Translator: Bonnie Duan \n"
-"Language-Team: \n"
+"Language-Team: Cenoq Corp.\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: event
#: view:event.event:0
@@ -24,55 +24,55 @@ msgstr "發票資訊"
#. module: event
#: view:partner.event.registration:0
msgid "Event Details"
-msgstr "活動詳情"
+msgstr "事件細節"
#. module: event
#: field:event.event,main_speaker_id:0
msgid "Main Speaker"
-msgstr "主講者"
+msgstr "主要關注者"
#. module: event
#: view:event.event:0
#: view:event.registration:0
#: view:report.event.registration:0
msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
#. module: event
#: field:event.event,register_min:0
msgid "Minimum Registrations"
-msgstr "最小登記數"
+msgstr "最少的登記記錄"
#. module: event
#: model:ir.model,name:event.model_event_confirm_registration
msgid "Confirmation for Event Registration"
-msgstr "活動登記確認"
+msgstr "確認事件的登記記錄"
#. module: event
#: field:event.registration.badge,title:0
msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
#. module: event
#: field:event.event,mail_registr:0
msgid "Registration Email"
-msgstr "登記電郵"
+msgstr "登記記錄的郵件"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_confirm_registration
msgid "Make Invoices"
-msgstr "開立發票"
+msgstr "生成發票"
#. module: event
#: view:event.event:0
#: view:event.registration:0
msgid "Registration Date"
-msgstr "登記日期"
+msgstr "登錄日期"
#. module: event
#: view:partner.event.registration:0
msgid "_Close"
-msgstr "結束(_C)"
+msgstr "結束"
#. module: event
#: model:event.event,name:event.event_0
@@ -82,17 +82,17 @@ msgstr "Bon Jovi 演唱會"
#. module: event
#: view:report.event.registration:0
msgid "Invoiced Registrations only"
-msgstr ""
+msgstr "僅已開發票的報名者"
#. module: event
#: selection:report.event.registration,month:0
msgid "March"
-msgstr "三月"
+msgstr "3月"
#. module: event
#: field:event.event,mail_confirm:0
msgid "Confirmation Email"
-msgstr "確認電郵"
+msgstr "確認電子郵件"
#. module: event
#: field:event.registration,nb_register:0
@@ -103,7 +103,7 @@ msgstr "數量"
#: code:addons/event/wizard/event_make_invoice.py:63
#, python-format
msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "登記記錄沒有給任何業務夥伴開發票"
#. module: event
#: field:event.event,company_id:0
@@ -121,7 +121,7 @@ msgstr "發票日期"
#. module: event
#: help:event.event,pricelist_id:0
msgid "Pricelist version for current event."
-msgstr "當前活動價目表版本"
+msgstr "當前事件的價目表版本"
#. module: event
#: code:addons/event/wizard/partner_event_registration.py:88
@@ -131,17 +131,17 @@ msgstr "當前活動價目表版本"
#: view:partner.event.registration:0
#, python-format
msgid "Event Registration"
-msgstr "活動登記"
+msgstr "事件登錄"
#. module: event
#: field:event.event,parent_id:0
msgid "Parent Event"
-msgstr "上級活動"
+msgstr "上級事件"
#. module: event
#: model:ir.actions.act_window,name:event.action_make_invoices
msgid "Make Invoice"
-msgstr "開立發票"
+msgstr "生成發票"
#. module: event
#: field:event.registration,price_subtotal:0
@@ -151,27 +151,27 @@ msgstr "小計"
#. module: event
#: view:report.event.registration:0
msgid "Event on Registration"
-msgstr "正登記活動"
+msgstr "登錄的事件"
#. module: event
#: help:event.event,reply_to:0
msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "所有系統的電子郵件在「回覆」填入這郵件地址。"
#. module: event
#: view:event.registration:0
msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "新增內部備註"
#. module: event
#: view:event.event:0
msgid "Confirmed events"
-msgstr ""
+msgstr "已確認的活動"
#. module: event
#: view:report.event.registration:0
msgid "Event Beginning Date"
-msgstr ""
+msgstr "活動開始日期"
#. module: event
#: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -179,12 +179,12 @@ msgstr ""
#: model:ir.ui.menu,name:event.menu_report_event_registration
#: view:report.event.registration:0
msgid "Events Analysis"
-msgstr "活動分析"
+msgstr "事件分析"
#. module: event
#: field:event.registration,message_ids:0
msgid "Messages"
-msgstr "郵件"
+msgstr "訊息"
#. module: event
#: model:ir.model,name:event.model_event_registration_badge
@@ -206,25 +206,25 @@ msgstr "歌劇門票"
#: view:event.event:0
#, python-format
msgid "Confirm Event"
-msgstr "確認活動"
+msgstr "確認事件"
#. module: event
#: selection:event.event,state:0
#: selection:event.registration,state:0
#: selection:report.event.registration,state:0
msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
#. module: event
#: field:event.event,reply_to:0
msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆:"
#. module: event
#: model:ir.actions.act_window,name:event.open_board_associations_manager
#: model:ir.ui.menu,name:event.menu_board_associations_manager
msgid "Event Dashboard"
-msgstr "活動儀錶板"
+msgstr "事件控制台"
#. module: event
#: model:event.event,name:event.event_1
@@ -234,40 +234,40 @@ msgstr "威爾第歌劇"
#. module: event
#: selection:report.event.registration,month:0
msgid "July"
-msgstr "七月"
+msgstr "7月"
#. module: event
#: help:event.event,register_prospect:0
msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "意向報名者合計"
#. module: event
#: help:event.event,mail_auto_confirm:0
msgid ""
"Check this box if you want to use automatic confirmation emailing or "
"reminder."
-msgstr ""
+msgstr "如果你想用自動確認郵件或提醒請勾選這裡。"
#. module: event
#: field:event.registration,ref:0
msgid "Reference"
-msgstr "參照"
+msgstr "關聯"
#. module: event
#: help:event.event,date_end:0
#: help:partner.event.registration,end_date:0
msgid "Closing Date of Event"
-msgstr "活動結束日期"
+msgstr "事件的結束日期"
#. module: event
#: view:event.registration:0
msgid "Emails"
-msgstr "電郵"
+msgstr "電子郵件"
#. module: event
#: view:event.registration:0
msgid "Extra Info"
-msgstr "額外資訊"
+msgstr "附加資訊"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:83
@@ -279,17 +279,17 @@ msgstr "客戶發票"
#: selection:event.event,state:0
#: selection:report.event.registration,state:0
msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
#. module: event
#: field:event.type,name:0
msgid "Event type"
-msgstr "活動類型"
+msgstr "事件類型"
#. module: event
#: model:ir.model,name:event.model_event_type
msgid " Event Type "
-msgstr " 活動類型 "
+msgstr " 事件類型 "
#. module: event
#: view:event.event:0
@@ -301,13 +301,13 @@ msgstr " 活動類型 "
#: field:report.event.registration,event_id:0
#: view:res.partner:0
msgid "Event"
-msgstr "活動"
+msgstr "事件"
#. module: event
#: view:event.registration:0
#: field:event.registration,badge_ids:0
msgid "Badges"
-msgstr "襟章"
+msgstr "標記"
#. module: event
#: view:event.event:0
@@ -316,17 +316,17 @@ msgstr "襟章"
#: selection:event.registration,state:0
#: selection:report.event.registration,state:0
msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
#. module: event
#: view:event.confirm.registration:0
msgid "Registration Confirmation"
-msgstr "登記確認"
+msgstr "確認登記記錄"
#. module: event
#: view:event.event:0
msgid "Events in New state"
-msgstr ""
+msgstr "在新建狀態的活動"
#. module: event
#: view:report.event.registration:0
@@ -337,17 +337,17 @@ msgstr "確認"
#: view:event.event:0
#: field:event.event,speaker_ids:0
msgid "Other Speakers"
-msgstr "其他講者"
+msgstr "其他關注者"
#. module: event
#: model:ir.model,name:event.model_event_make_invoice
msgid "Event Make Invoice"
-msgstr "活動開立發票"
+msgstr "事件建立發票"
#. module: event
#: help:event.registration,nb_register:0
msgid "Number of Registrations or Tickets"
-msgstr "登記或門票數量"
+msgstr "登錄編號或票"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:50
@@ -361,30 +361,30 @@ msgstr "警告！"
#. module: event
#: view:event.registration:0
msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新電子郵件"
#. module: event
#: help:event.event,register_min:0
msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "提供最小的報名人數"
#. module: event
#: view:event.event:0
msgid "Location"
-msgstr "地點"
+msgstr "位置"
#. module: event
#: view:event.event:0
#: view:event.registration:0
#: view:report.event.registration:0
msgid "New"
-msgstr ""
+msgstr "新建"
#. module: event
#: field:event.event,register_current:0
#: view:report.event.registration:0
msgid "Confirmed Registrations"
-msgstr "已確認登記"
+msgstr "確認登記記錄"
#. module: event
#: field:event.event,mail_auto_registr:0
@@ -400,7 +400,7 @@ msgstr "類型"
#. module: event
#: field:event.registration,email_from:0
msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
#. module: event
#: help:event.event,mail_confirm:0
@@ -408,17 +408,17 @@ msgid ""
"This email will be sent when the event gets confirmed or when someone "
"subscribes to a confirmed event. This is also the email sent to remind "
"someone about the event."
-msgstr ""
+msgstr "這封郵件會在活動已確認或有人註冊了已確認的郵件時發送。此郵件也會發送關於本活動的提醒。"
#. module: event
#: field:event.registration,tobe_invoiced:0
msgid "To be Invoiced"
-msgstr ""
+msgstr "待開票"
#. module: event
#: view:event.event:0
msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
#. module: event
#: code:addons/event/event.py:398
@@ -430,55 +430,55 @@ msgstr "錯誤！"
#: field:event.event,name:0
#: field:event.registration,name:0
msgid "Summary"
-msgstr "摘要"
+msgstr "概要"
#. module: event
#: field:event.registration,create_date:0
msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
#. module: event
#: view:event.event:0
#: view:event.registration:0
#: view:res.partner:0
msgid "Cancel Registration"
-msgstr "取消登記"
+msgstr "取消登記記錄"
#. module: event
#: code:addons/event/event.py:399
#, python-format
msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "要開票的登記記錄裡的業務夥伴沒地址"
#. module: event
#: view:report.event.registration:0
msgid "Events created in last month"
-msgstr ""
+msgstr "上個月新建的活動"
#. module: event
#: view:report.event.registration:0
msgid "Events created in current year"
-msgstr ""
+msgstr "本年新建的活動"
#. module: event
#: help:event.event,type:0
msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr "活動類型，如座談會、展覽、會議、培訓"
+msgstr "事件類型如：研討會，展覽，會議，培訓。"
#. module: event
#: view:event.registration:0
msgid "Confirmed registrations"
-msgstr ""
+msgstr "確認報名者"
#. module: event
#: view:event.event:0
msgid "Event Organization"
-msgstr "活動組織"
+msgstr "事件結構"
#. module: event
#: view:event.registration:0
msgid "History Information"
-msgstr "歷史資訊"
+msgstr "日誌資訊"
#. module: event
#: view:event.registration:0
@@ -489,18 +489,18 @@ msgstr "日期"
#: view:event.confirm:0
#: view:event.confirm.registration:0
msgid "Confirm Anyway"
-msgstr "無論如何確認"
+msgstr "總是確認"
#. module: event
#: code:addons/event/wizard/event_confirm_registration.py:54
#, python-format
msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "警告：這事件 '%s'已達到最高極限 (%s)。"
#. module: event
#: view:report.event.registration:0
msgid " Month-1 "
-msgstr ""
+msgstr " 上月 "
#. module: event
#: view:event.event:0
@@ -508,17 +508,17 @@ msgstr ""
#: field:event.registration.badge,registration_id:0
#: model:ir.actions.act_window,name:event.act_event_list_register_event
msgid "Registration"
-msgstr "登記"
+msgstr "登記記錄"
#. module: event
#: field:report.event.registration,nbevent:0
msgid "Number Of Events"
-msgstr "活動數目"
+msgstr "事件數"
#. module: event
#: help:event.event,main_speaker_id:0
msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "要在這次活動上發言的演講者"
#. module: event
#: help:event.event,state:0
@@ -527,17 +527,18 @@ msgid ""
"particular dates the state is set to 'Confirmed'. If the event is over, the "
"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'."
msgstr ""
+"如果事件剛建立狀態是「草稿」。如果事件在具體的日期已確認狀態是「已確認」。如果事件結束狀態設為「完成」。如果事件已經取消狀態是「已取消」。"
#. module: event
#: view:event.event:0
msgid "Cancel Event"
-msgstr "取消活動"
+msgstr "取消事件"
#. module: event
#: view:event.event:0
#: view:event.registration:0
msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯繫方式"
#. module: event
#: view:event.event:0
@@ -545,45 +546,45 @@ msgstr "聯絡人"
#: field:event.registration,partner_id:0
#: model:ir.model,name:event.model_res_partner
msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
#. module: event
#: view:board.board:0
#: model:ir.actions.act_window,name:event.act_event_reg
#: view:report.event.registration:0
msgid "Events Filling Status"
-msgstr ""
+msgstr "事件填充狀態"
#. module: event
#: field:event.make.invoice,grouped:0
msgid "Group the invoices"
-msgstr "發票分類"
+msgstr "發票組"
#. module: event
#: view:event.event:0
msgid "Mailing"
-msgstr ""
+msgstr "郵遞"
#. module: event
#: view:report.event.registration:0
msgid "Events States"
-msgstr ""
+msgstr "活動狀態"
#. module: event
#: view:board.board:0
#: field:event.event,register_prospect:0
msgid "Unconfirmed Registrations"
-msgstr "未確認登記"
+msgstr "不確認登記記錄"
#. module: event
#: field:event.registration,partner_invoice_id:0
msgid "Partner Invoiced"
-msgstr ""
+msgstr "已開票業務夥伴"
#. module: event
#: help:event.event,register_max:0
msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "提供本次報名的最大人數"
#. module: event
#: field:event.registration,log_ids:0
@@ -598,17 +599,17 @@ msgstr "日誌"
#: view:report.event.registration:0
#: field:report.event.registration,state:0
msgid "State"
-msgstr ""
+msgstr "狀態"
#. module: event
#: selection:report.event.registration,month:0
msgid "September"
-msgstr "九月"
+msgstr "9月"
#. module: event
#: selection:report.event.registration,month:0
msgid "December"
-msgstr "十二月"
+msgstr "12月"
#. module: event
#: field:event.registration,event_product:0
@@ -618,28 +619,28 @@ msgstr "發票名稱"
#. module: event
#: field:report.event.registration,draft_state:0
msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # 沒草稿狀態的登記記錄"
#. module: event
#: view:report.event.registration:0
#: field:report.event.registration,month:0
msgid "Month"
-msgstr "月"
+msgstr "月份"
#. module: event
#: view:event.event:0
msgid "Event Done"
-msgstr "活動完結"
+msgstr "事件完成"
#. module: event
#: view:event.registration:0
msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "未確認狀態的報名者"
#. module: event
#: help:event.event,register_current:0
msgid "Total of Open and Done Registrations"
-msgstr "開放及完成登記總數"
+msgstr "開啟和完成的登記記錄共有"
#. module: event
#: field:event.confirm.registration,msg:0
@@ -649,35 +650,35 @@ msgstr "訊息"
#. module: event
#: constraint:event.event:0
msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！你不能建立互相調用的事件。"
#. module: event
#: field:event.registration,ref2:0
msgid "Reference 2"
-msgstr "參照 2"
+msgstr "關聯2"
#. module: event
#: code:addons/event/event.py:361
#: view:report.event.registration:0
#, python-format
msgid "Invoiced"
-msgstr "已開發票"
+msgstr "已開票"
#. module: event
#: view:event.event:0
#: view:report.event.registration:0
msgid "My Events"
-msgstr "我的活動"
+msgstr "我的事件"
#. module: event
#: view:event.event:0
msgid "Speakers"
-msgstr "講者"
+msgstr "關注者"
#. module: event
#: view:event.make.invoice:0
msgid "Create invoices"
-msgstr ""
+msgstr "開立發票"
#. module: event
#: help:event.registration,email_cc:0
@@ -685,12 +686,12 @@ msgid ""
"These email addresses will be added to the CC field of all inbound and "
"outbound emails for this record before being sent. Separate multiple email "
"addresses with a comma"
-msgstr ""
+msgstr "這些郵箱地址將添加到所有接收的發送郵件的副本欄位，用逗號分隔多個郵件地址。"
#. module: event
#: view:event.make.invoice:0
msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成發票嗎 ？"
#. module: event
#: view:event.event:0
@@ -700,12 +701,12 @@ msgstr "開始日期"
#. module: event
#: field:event.registration,date_closed:0
msgid "Closed"
-msgstr "結束"
+msgstr "已結束"
#. module: event
#: view:report.event.registration:0
msgid "Events which are in New state"
-msgstr ""
+msgstr "新建狀態的活動"
#. module: event
#: view:event.event:0
@@ -714,28 +715,28 @@ msgstr ""
#: model:ir.ui.menu,name:event.menu_event_event_assiciation
#: view:res.partner:0
msgid "Events"
-msgstr "活動"
+msgstr "事件"
#. module: event
#: field:partner.event.registration,nb_register:0
msgid "Number of Registration"
-msgstr "登記數量"
+msgstr "登記記錄數"
#. module: event
#: field:event.event,child_ids:0
msgid "Child Events"
-msgstr "子活動"
+msgstr "子事件"
#. module: event
#: selection:report.event.registration,month:0
msgid "August"
-msgstr "八月"
+msgstr "8月"
#. module: event
#: field:res.partner,event_ids:0
#: field:res.partner,event_registration_ids:0
msgid "unknown"
-msgstr "不詳"
+msgstr "未知的"
#. module: event
#: help:event.event,product_id:0
@@ -743,39 +744,39 @@ msgid ""
"The invoices of this event registration will be created with this Product. "
"Thus it allows you to set the default label and the accounting info you want "
"by default on these invoices."
-msgstr ""
+msgstr "將建立這事件登記記錄的產品發票。因此對這些預設發票它允許你設置預設的標籤和會計資訊。"
#. module: event
#: selection:report.event.registration,month:0
msgid "June"
-msgstr "六月"
+msgstr "6月"
#. module: event
#: model:product.template,name:event.event_product_0_product_template
msgid "Ticket for Concert"
-msgstr ""
+msgstr "合作的門票"
#. module: event
#: field:event.registration,write_date:0
msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
#. module: event
#: view:event.registration:0
msgid "My Registrations"
-msgstr "我的登記"
+msgstr "我的登記記錄"
#. module: event
#: view:event.confirm:0
msgid ""
"Warning: This Event has not reached its Minimum Registration Limit. Are you "
"sure you want to confirm it?"
-msgstr "警告：本活動未達最少登記限制。是否確認？"
+msgstr "警告：這事件沒有達到最低登記記錄的規定，你肯定要確認它？"
#. module: event
#: field:event.registration,active:0
msgid "Active"
-msgstr ""
+msgstr "生效"
#. module: event
#: field:event.registration,date:0
@@ -785,12 +786,12 @@ msgstr "開始日期"
#. module: event
#: selection:report.event.registration,month:0
msgid "November"
-msgstr "十一月"
+msgstr "11月"
#. module: event
#: view:report.event.registration:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件"
#. module: event
#: field:partner.event.registration,start_date:0
@@ -800,7 +801,7 @@ msgstr "開始日期"
#. module: event
#: selection:report.event.registration,month:0
msgid "October"
-msgstr "十月"
+msgstr "10月"
#. module: event
#: field:event.event,language:0
@@ -811,22 +812,22 @@ msgstr "語言"
#: view:event.registration:0
#: field:event.registration,email_cc:0
msgid "CC"
-msgstr "副本(CC)"
+msgstr "抄送"
#. module: event
#: selection:report.event.registration,month:0
msgid "January"
-msgstr "一月"
+msgstr "1月"
#. module: event
#: help:event.registration,email_from:0
msgid "These people will receive email."
-msgstr "此等人士會收到電郵"
+msgstr "這些人將收到電子郵件。"
#. module: event
#: view:event.event:0
msgid "Set To Draft"
-msgstr "設為草案"
+msgstr "設為草稿"
#. module: event
#: code:addons/event/event.py:499
@@ -835,7 +836,7 @@ msgstr "設為草案"
#: view:res.partner:0
#, python-format
msgid "Confirm Registration"
-msgstr "確認登記"
+msgstr "確認登記記錄"
#. module: event
#: view:event.event:0
@@ -847,39 +848,39 @@ msgstr "日期"
#. module: event
#: view:event.event:0
msgid "Registration Email Body"
-msgstr "登記電郵內容"
+msgstr "登記記錄的郵件內容"
#. module: event
#: view:event.event:0
msgid "Confirmation Email Body"
-msgstr "確認電郵內容"
+msgstr "確認郵件內容"
#. module: event
#: view:report.event.registration:0
msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "在已確認或已完成狀態的報名者"
#. module: event
#: view:event.registration:0
#: view:res.partner:0
msgid "History"
-msgstr "歷史"
+msgstr "日誌"
#. module: event
#: field:event.event,address_id:0
msgid "Location Address"
-msgstr "地點位址"
+msgstr "地址"
#. module: event
#: model:ir.actions.act_window,name:event.action_event_type
#: model:ir.ui.menu,name:event.menu_event_type
msgid "Types of Events"
-msgstr "活動類型"
+msgstr "事件類型"
#. module: event
#: field:event.registration,contact_id:0
msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯繫方式"
#. module: event
#: field:event.event,pricelist_id:0
@@ -890,12 +891,12 @@ msgstr "價目表"
#: code:addons/event/wizard/event_make_invoice.py:59
#, python-format
msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "事件沒關聯任何定義的產品"
#. module: event
#: view:event.event:0
msgid "Auto Confirmation Email"
-msgstr "自動確認電郵"
+msgstr "自動確認郵件"
#. module: event
#: view:event.registration:0
@@ -905,7 +906,7 @@ msgstr "雜項"
#. module: event
#: constraint:event.event:0
msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "錯誤！結束日期不能早於開始日期"
+msgstr "錯誤！結束日期不能在開始日期前。"
#. module: event
#: code:addons/event/event.py:446
@@ -932,7 +933,7 @@ msgstr "發票"
#: view:report.event.registration:0
#: field:report.event.registration,year:0
msgid "Year"
-msgstr "年份"
+msgstr "年"
#. module: event
#: code:addons/event/event.py:465
@@ -945,30 +946,30 @@ msgstr "取消"
#: view:event.confirm.registration:0
#: view:event.make.invoice:0
msgid "Close"
-msgstr "關閉"
+msgstr "結束"
#. module: event
#: view:event.event:0
msgid "Event by Registration"
-msgstr "各登記活動"
+msgstr "事件登記記錄"
#. module: event
#: code:addons/event/event.py:436
#, python-format
msgid "Open"
-msgstr "開放"
+msgstr "開啟"
#. module: event
#: field:event.event,user_id:0
msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "責任用戶"
#. module: event
#: code:addons/event/event.py:561
#: code:addons/event/event.py:568
#, python-format
msgid "Auto Confirmation: [%s] %s"
-msgstr "自動確認：[%s] %s"
+msgstr "自動確認： [%s] %s"
#. module: event
#: view:event.event:0
@@ -977,14 +978,14 @@ msgstr "自動確認：[%s] %s"
#: view:report.event.registration:0
#: field:report.event.registration,user_id:0
msgid "Responsible"
-msgstr "負責"
+msgstr "負責人"
#. module: event
#: field:event.event,unit_price:0
#: view:event.registration:0
#: field:partner.event.registration,unit_price:0
msgid "Registration Cost"
-msgstr "登記成本"
+msgstr "登記記錄的成本"
#. module: event
#: field:event.registration,unit_price:0
@@ -996,7 +997,7 @@ msgstr "單價"
#: field:report.event.registration,speaker_id:0
#: field:res.partner,speaker:0
msgid "Speaker"
-msgstr "講者"
+msgstr "關注者"
#. module: event
#: model:event.event,name:event.event_2
@@ -1011,13 +1012,13 @@ msgstr "回覆"
#. module: event
#: view:report.event.registration:0
msgid "Events created in current month"
-msgstr ""
+msgstr "本月新建的活動"
#. module: event
#: help:event.event,mail_auto_registr:0
msgid ""
"Check this box if you want to use automatic emailing for new registration."
-msgstr ""
+msgstr "如果你要自動發郵件給新的報名者請勾選此項。"
#. module: event
#: field:event.event,date_end:0
@@ -1038,12 +1039,12 @@ msgstr "產品"
#: view:event.registration:0
#: field:event.registration,description:0
msgid "Description"
-msgstr "說明"
+msgstr "描述"
#. module: event
#: field:report.event.registration,confirm_state:0
msgid " # No of Confirmed Registrations"
-msgstr " # 已確認登記數"
+msgstr " # 沒確認登記記錄"
#. module: event
#: model:ir.actions.act_window,name:event.act_register_event_partner
@@ -1053,17 +1054,17 @@ msgstr "訂閱"
#. module: event
#: selection:report.event.registration,month:0
msgid "May"
-msgstr "五月"
+msgstr "5月"
#. module: event
#: view:res.partner:0
msgid "Events Registration"
-msgstr "活動登記"
+msgstr "事件登記記錄"
#. module: event
#: help:event.event,mail_registr:0
msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "當有人讚同這事件時將發送這郵件"
#. module: event
#: model:product.template,name:event.event_product_2_product_template
@@ -1073,34 +1074,34 @@ msgstr "會議門票"
#. module: event
#: model:ir.ui.menu,name:event.menu_event_type_association
msgid "Events Type"
-msgstr ""
+msgstr "活動類型"
#. module: event
#: field:event.registration.badge,address_id:0
msgid "Address"
-msgstr "地址"
+msgstr "地址:"
#. module: event
#: view:board.board:0
#: model:ir.actions.act_window,name:event.act_event_view
msgid "Next Events"
-msgstr "下個活動"
+msgstr "下一個事件"
#. module: event
#: view:partner.event.registration:0
msgid "_Subcribe"
-msgstr "訂閱(_S)"
+msgstr "訂閱"
#. module: event
#: model:ir.model,name:event.model_partner_event_registration
msgid " event Registration "
-msgstr " 活動登記 "
+msgstr " 事件登記記錄 "
#. module: event
#: help:event.event,date_begin:0
#: help:partner.event.registration,start_date:0
msgid "Beginning Date of Event"
-msgstr "活動開始日"
+msgstr "事件開始日期"
#. module: event
#: selection:event.registration,state:0
@@ -1111,22 +1112,22 @@ msgstr "未確認"
#: code:addons/event/event.py:565
#, python-format
msgid "Auto Registration: [%s] %s"
-msgstr "自動登記：[%s] %s"
+msgstr "自動登記記錄： [%s] %s"
#. module: event
#: field:event.registration,date_deadline:0
msgid "End Date"
-msgstr "結束日"
+msgstr "結束日期"
#. module: event
#: selection:report.event.registration,month:0
msgid "February"
-msgstr "二月"
+msgstr "2月"
#. module: event
#: view:board.board:0
msgid "Association Dashboard"
-msgstr ""
+msgstr "商會控制台"
#. module: event
#: view:event.event:0
@@ -1140,18 +1141,18 @@ msgstr "名稱"
#: view:report.event.registration:0
#: field:report.event.registration,section_id:0
msgid "Sale Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
#. module: event
#: field:event.event,country_id:0
msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:55
#, python-format
msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "登記記錄設置為不能開發票"
#. module: event
#: code:addons/event/event.py:527
@@ -1160,24 +1161,24 @@ msgstr ""
#: view:res.partner:0
#, python-format
msgid "Close Registration"
-msgstr "結束登記"
+msgstr "結束登記記錄"
#. module: event
#: selection:report.event.registration,month:0
msgid "April"
-msgstr "四月"
+msgstr "4月"
#. module: event
#: help:event.event,unit_price:0
msgid ""
"This will be the default price used as registration cost when invoicing this "
"event. Note that you can specify a specific amount for each registration."
-msgstr ""
+msgstr "這裡是開發票是預設的報名價格，注意你可以對每個報名者用不同的價格。"
#. module: event
#: view:report.event.registration:0
msgid "Events which are in confirm state"
-msgstr ""
+msgstr "已確認狀態的活動"
#. module: event
#: view:event.event:0
@@ -1185,7 +1186,7 @@ msgstr ""
#: view:report.event.registration:0
#: field:report.event.registration,type:0
msgid "Event Type"
-msgstr "活動類型"
+msgstr "事件類型"
#. module: event
#: view:event.event:0
@@ -1194,51 +1195,51 @@ msgstr "活動類型"
#: model:ir.ui.menu,name:event.menu_action_registration
#: model:ir.ui.menu,name:event.menu_action_registration_association
msgid "Registrations"
-msgstr "登記"
+msgstr "登記記錄"
#. module: event
#: field:event.registration,id:0
msgid "ID"
-msgstr ""
+msgstr "標識"
#. module: event
#: field:event.event,register_max:0
#: field:report.event.registration,register_max:0
msgid "Maximum Registrations"
-msgstr "最大登記數"
+msgstr "最多的登記記錄"
#. module: event
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤，您不能建立循環引用的會員用戶"
#. module: event
#: field:report.event.registration,date:0
msgid "Event Start Date"
-msgstr "活動開始日"
+msgstr "事件開始日期"
#. module: event
#: view:partner.event.registration:0
msgid "Event For Registration"
-msgstr "可登記活動"
+msgstr "登記記錄引起的事件"
#. module: event
#: code:addons/event/wizard/event_make_invoice.py:51
#, python-format
msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "如果登記記錄在 %s 狀態，不能開發票。"
#. module: event
#: view:event.confirm:0
#: model:ir.actions.act_window,name:event.action_event_confirm
#: model:ir.model,name:event.model_event_confirm
msgid "Event Confirmation"
-msgstr "活動確認"
+msgstr "事件確認"
#. module: event
#: view:event.event:0
msgid "Auto Registration Email"
-msgstr "自動登記電郵"
+msgstr "自動登記記錄郵件"
#. module: event
#: view:event.registration:0
@@ -1250,7 +1251,7 @@ msgstr "總計"
#. module: event
#: field:event.event,speaker_confirmed:0
msgid "Speaker Confirmed"
-msgstr "已確認講者"
+msgstr "關注者確認"
#. module: event
#: model:ir.actions.act_window,help:event.action_event_view
@@ -1259,7 +1260,7 @@ msgid ""
"should be synchronized with mobile devices or calendar applications through "
"caldav. Most of the users should work in the Calendar menu, and not in the "
"list of events."
-msgstr ""
+msgstr "事件是低層對象用於會議和其它文檔通過caldar同步移動設備或日程表應用程序。大多數用戶將使用日程表菜單而不是事件列表。"
#~ msgid "Provide Maximun Number of Registrations"
#~ msgstr "提供登記最大數"
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index e32df5eb306..764a9d8957f 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-30 05:12+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-08-31 04:56+0000\n"
+"X-Generator: Launchpad (build 15887)\n"
#. module: event_project
#: model:ir.model,name:event_project.model_event_project
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 8f41a9d7b21..694f5736c72 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -3,7 +3,7 @@ var _t = instance.web._t;
instance.web.Sidebar = instance.web.Sidebar.extend({
on_attachments_loaded: function(attachments) {
- self = this
+ var self = this;
self._super(attachments);
// if attachment contains a google doc url do nothing
// else display a button to create a google doc
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 5840217d7ee..f687e91c3f0 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -25,6 +25,7 @@ import datetime, time
from itertools import groupby
from operator import itemgetter
+import math
import netsvc
from osv import fields, osv
from tools.translate import _
@@ -112,7 +113,7 @@ class hr_holidays(osv.osv):
return result
_columns = {
- 'name': fields.char('Description', required=True, size=64),
+ 'name': fields.char('Description', size=64),
'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
\nThe state is \'To Approve\', when holiday request is confirmed by user.\
@@ -123,8 +124,6 @@ class hr_holidays(osv.osv):
'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
- #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
- #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
@@ -134,8 +133,8 @@ class hr_holidays(osv.osv):
'parent_id': fields.many2one('hr.holidays', 'Parent'),
'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
- 'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
- 'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
+ 'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+ 'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
}
@@ -147,16 +146,11 @@ class hr_holidays(osv.osv):
'holiday_type': 'employee'
}
_sql_constraints = [
- ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category."),
+ ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "The employee or employee category of this request is missing."),
('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
]
- def create(self, cr, uid, vals, context=None):
- obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
- self.create_notificate(cr, uid, [obj_id], context=context)
- return obj_id
-
def _create_resource_leave(self, cr, uid, leaves, context=None):
'''This method will create entry in resource calendar leave object at the time of holidays validated '''
obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -201,8 +195,8 @@ class hr_holidays(osv.osv):
def unlink(self, cr, uid, ids, context=None):
for rec in self.browse(cr, uid, ids, context=context):
- if rec.state<>'draft':
- raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft state !'))
+ if rec.state not in ['draft', 'cancel', 'confirm']:
+ raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state!')%(rec.state))
return super(hr_holidays, self).unlink(cr, uid, ids, context)
def onchange_date_from(self, cr, uid, ids, date_to, date_from):
@@ -210,7 +204,7 @@ class hr_holidays(osv.osv):
if date_to and date_from:
diff_day = self._get_number_of_days(date_from, date_to)
result['value'] = {
- 'number_of_days_temp': round(diff_day)+1
+ 'number_of_days_temp': round(math.floor(diff_day))+1
}
return result
result['value'] = {
@@ -244,29 +238,30 @@ class hr_holidays(osv.osv):
self.unlink(cr, uid, to_unlink, context=context)
return True
- def holidays_validate(self, cr, uid, ids, context=None):
+ def holidays_first_validate(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
- self.holidays_validate_notificate(cr, uid, ids, context=context)
+ self.holidays_first_validate_notificate(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
- def holidays_validate2(self, cr, uid, ids, context=None):
+ def holidays_validate(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
self.write(cr, uid, ids, {'state':'validate'})
data_holiday = self.browse(cr, uid, ids)
- holiday_ids = []
for record in data_holiday:
- if record.holiday_status_id.double_validation:
- holiday_ids.append(record.id)
+ if record.double_validation:
+ self.write(cr, uid, [record.id], {'manager_id2': manager})
+ else:
+ self.write(cr, uid, [record.id], {'manager_id': manager})
if record.holiday_type == 'employee' and record.type == 'remove':
meeting_obj = self.pool.get('crm.meeting')
meeting_vals = {
- 'name': record.name,
+ 'name': record.name or _('Leave Request'),
'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
'duration': record.number_of_days_temp * 8,
'description': record.notes,
@@ -301,25 +296,27 @@ class hr_holidays(osv.osv):
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
- if holiday_ids:
- self.holidays_valid2_notificate(cr, uid, holiday_ids, context=context)
- self.write(cr, uid, holiday_ids, {'manager_id2': manager})
+ self.holidays_validate_notificate(cr, uid, ids, context=context)
return True
def holidays_confirm(self, cr, uid, ids, context=None):
self.check_holidays(cr, uid, ids, context=context)
+ for record in self.browse(cr, uid, ids, context=context):
+ if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
+ self.message_subscribe(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
self.holidays_confirm_notificate(cr, uid, ids, context=context)
return self.write(cr, uid, ids, {'state':'confirm'})
- def holidays_refuse(self, cr, uid, ids, approval, context=None):
+ def holidays_refuse(self, cr, uid, ids, context=None):
obj_emp = self.pool.get('hr.employee')
ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
manager = ids2 and ids2[0] or False
- if approval == 'first_approval':
- self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
- else:
- self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
- self.holidays_refuse_notificate(cr, uid, ids, approval, context=context)
+ for holiday in self.browse(cr, uid, ids, context=context):
+ if holiday.state == 'validate1':
+ self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id': manager})
+ else:
+ self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id2': manager})
+ self.holidays_refuse_notificate(cr, uid, ids, context=context)
self.holidays_cancel(cr, uid, ids, context=context)
return True
@@ -333,7 +330,7 @@ class hr_holidays(osv.osv):
# If a category that created several holidays, cancel all related
wf_service = netsvc.LocalService("workflow")
for request in record.linked_request_ids or []:
- wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
+ wf_service.trg_validate(uid, 'hr.holidays', request.id, 'refuse', cr)
self._remove_resource_leave(cr, uid, ids, context=context)
return True
@@ -355,7 +352,7 @@ class hr_holidays(osv.osv):
def get_needaction_user_ids(self, cr, uid, ids, context=None):
result = super(hr_holidays, self).get_needaction_user_ids(cr, uid, ids, context=context)
for obj in self.browse(cr, uid, ids, context=context):
- if obj.state == 'confirm' and obj.employee_id.parent_id:
+ if obj.state == 'confirm' and obj.holiday_type == 'employee' and obj.employee_id.parent_id:
result[obj.id] = [obj.employee_id.parent_id.user_id.id]
elif obj.state == 'validate1':
# get group_hr_manager: everyone will be warned of second validation
@@ -369,44 +366,38 @@ class hr_holidays(osv.osv):
def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
""" Add 'user_id' and 'manager' to the monitored fields """
res = super(hr_holidays, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
- # TODO: add manager
return res + ['user_id']
def create_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
self.message_append_note(cr, uid, ids, _('System notification'),
- _("The %s request has been created and is waiting confirmation.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been created and is waiting confirmation."), type='notification', context=context)
return True
def holidays_confirm_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been confirmed and is waiting for validation by the manager.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
+ _("The request has been submitted and is waiting for validation by the manager."), type='notification')
+ def holidays_first_validate_notificate(self, cr, uid, ids, context=None):
+ for obj in self.browse(cr, uid, ids, context=context):
+ self.message_append_note(cr, uid, [obj.id], _('System notification'),
+ _("The request has been approved. A second validation is necessary and is now pending."), type='notification', context=context)
+
def holidays_validate_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
- if obj.holiday_status_id.double_validation:
+ if obj.double_validation:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been approved. A second validation is necessary and is now pending.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been double validated. The validation process is now over."), type='notification', context=context)
else:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been approved. The validation process is now over.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been approved. The validation process is now over."), type='notification', context=context)
- def holidays_valid2_notificate(self, cr, uid, ids, context=None):
+
+ def holidays_refuse_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids):
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been double validated. The validation process is now over.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-
- def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None):
- for obj in self.browse(cr, uid, ids):
- self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been refused. The validation process is now over.")
- % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+ _("The request has been refused. The validation process is now over."), type='notification', context=context)
hr_holidays()
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 6ad5a442a38..4c9d18683c7 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
Trip with Family
-
+
remove
@@ -52,13 +52,10 @@
-
-
-
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 711d07bbfe8..650445b2ade 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -84,56 +84,42 @@
-
+
Leave Request
hr.holidays
1
+
-
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index bbae3770541..6678287c01e 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -7,30 +7,30 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-08-18 17:40+0000\n"
-"Last-Translator: Heling Yao \n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos \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: 2012-08-28 06:07+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
#. module: sale_crm
#: field:sale.order,categ_id:0
msgid "Category"
-msgstr ""
+msgstr "分类"
#. module: sale_crm
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:112
#, python-format
msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "转换为销售报价单(%s)。"
#. module: sale_crm
#: view:crm.make.sale:0
@@ -73,7 +73,7 @@ msgstr "在生成销售订单后检查是否关闭商机。"
#. module: sale_crm
#: view:board.board:0
msgid "My Opportunities"
-msgstr ""
+msgstr "我的商机"
#. module: sale_crm
#: view:crm.lead:0
@@ -104,13 +104,13 @@ msgstr "关闭商机"
#. module: sale_crm
#: view:board.board:0
msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "这阶段我的计划收入"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:110
#, python-format
msgid "Opportunity '%s' is converted to Quotation."
-msgstr ""
+msgstr "商机 '%s' 被转换为报价单"
#. module: sale_crm
#: view:sale.order:0
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index 86105255a19..bb04533ef97 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 05:04+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:34+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-09-01 04:55+0000\n"
+"X-Generator: Launchpad (build 15890)\n"
#. module: sale_mrp
#: help:mrp.production,sale_ref:0
@@ -40,12 +40,12 @@ msgstr "销售名称"
#. module: sale_mrp
#: sql_constraint:mrp.production:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
#. module: sale_mrp
#: constraint:mrp.production:0
msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "订单数量不能是负数或者0！"
#. module: sale_mrp
#: help:mrp.production,sale_name:0
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 598bb085967..204ca1e92e1 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -23,6 +23,7 @@ import random
import time
from urllib import quote_plus
import uuid
+from openerp import SUPERUSER_ID
import simplejson
@@ -545,7 +546,7 @@ class share_wizard(osv.TransientModel):
_logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
else:
# otherwise we can simply link the rule to keep it dynamic
- rule_obj.write(cr, 1, [rule.id], {
+ rule_obj.write(cr, SUPERUSER_ID, [rule.id], {
'groups': [(4,group_id)]
})
_logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)