[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121129114302-fdkq0kxb6wubsuaw
2012-11-29 12:43:02 +01:00
parent 7f5ad72429 098ac4cf11
commit 76eede3c21
28 changed files with 1115 additions and 690 deletions
@@ -1,271 +1,7 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-"""
-OpenERP - Server
-OpenERP is an ERP+CRM program for small and medium businesses.
-
-The whole source code is distributed under the terms of the
-GNU Public Licence.
-
-(c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
-"""
-
-import logging
-import os
-import signal
-import sys
-import threading
-import traceback
-import time
-
 import openerp
-__author__ = openerp.release.author
-__version__ = openerp.release.version
-
-# Also use the `openerp` logger for the main script.
-_logger = logging.getLogger('openerp')
-
-def check_root_user():
-    """ Exit if the process's user is 'root' (on POSIX system)."""
-    if os.name == 'posix':
-        import pwd
-        if pwd.getpwuid(os.getuid())[0] == 'root' :
-            sys.stderr.write("Running as user 'root' is a security risk, aborting.\n")
-            sys.exit(1)
-
-def check_postgres_user():
-    """ Exit if the configured database user is 'postgres'.
-
-    This function assumes the configuration has been initialized.
-    """
-    config = openerp.tools.config
-    if config['db_user'] == 'postgres':
-        sys.stderr.write("Using the database user 'postgres' is a security risk, aborting.")
-        sys.exit(1)
-
-def report_configuration():
-    """ Log the server version and some configuration values.
-
-    This function assumes the configuration has been initialized.
-    """
-    config = openerp.tools.config
-    _logger.info("OpenERP version %s", __version__)
-    for name, value in [('addons paths', config['addons_path']),
-                        ('database hostname', config['db_host'] or 'localhost'),
-                        ('database port', config['db_port'] or '5432'),
-                        ('database user', config['db_user'])]:
-        _logger.info("%s: %s", name, value)
-
-def setup_pid_file():
-    """ Create a file with the process id written in it.
-
-    This function assumes the configuration has been initialized.
-    """
-    config = openerp.tools.config
-    if config['pidfile']:
-        fd = open(config['pidfile'], 'w')
-        pidtext = "%d" % (os.getpid())
-        fd.write(pidtext)
-        fd.close()
-
-def preload_registry(dbname):
-    """ Preload a registry, and start the cron."""
-    try:
-        db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=openerp.tools.config['init'] or openerp.tools.config['update'], pooljobs=False)
-
-        # jobs will start to be processed later, when openerp.cron.start_master_thread() is called by openerp.service.start_services()
-        registry.schedule_cron_jobs()
-    except Exception:
-        _logger.exception('Failed to initialize database `%s`.', dbname)
-
-def run_test_file(dbname, test_file):
-    """ Preload a registry, possibly run a test file, and start the cron."""
-    try:
-        config = openerp.tools.config
-        db, registry = openerp.pooler.get_db_and_pool(dbname, update_module=config['init'] or config['update'], pooljobs=False)
-        cr = db.cursor()
-        _logger.info('loading test file %s', test_file)
-        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
-        cr.rollback()
-        cr.close()
-    except Exception:
-        _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file)
-
-def export_translation():
-    config = openerp.tools.config
-    dbname = config['db_name']
-
-    if config["language"]:
-        msg = "language %s" % (config["language"],)
-    else:
-        msg = "new language"
-    _logger.info('writing translation file for %s to %s', msg,
-        config["translate_out"])
-
-    fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
-    buf = file(config["translate_out"], "w")
-    cr = openerp.pooler.get_db(dbname).cursor()
-    openerp.tools.trans_export(config["language"],
-        config["translate_modules"] or ["all"], buf, fileformat, cr)
-    cr.close()
-    buf.close()
-
-    _logger.info('translation file written successfully')
-
-def import_translation():
-    config = openerp.tools.config
-    context = {'overwrite': config["overwrite_existing_translations"]}
-    dbname = config['db_name']
-
-    cr = openerp.pooler.get_db(dbname).cursor()
-    openerp.tools.trans_load( cr, config["translate_in"], config["language"],
-        context=context)
-    cr.commit()
-    cr.close()
-
-# Variable keeping track of the number of calls to the signal handler defined
-# below. This variable is monitored by ``quit_on_signals()``.
-quit_signals_received = 0
-
-def signal_handler(sig, frame):
-    """ Signal handler: exit ungracefully on the second handled signal.
-
-    :param sig: the signal number
-    :param frame: the interrupted stack frame or None
-    """
-    global quit_signals_received
-    quit_signals_received += 1
-    if quit_signals_received > 1:
-        # logging.shutdown was already called at this point.
-        sys.stderr.write("Forced shutdown.\n")
-        os._exit(0)
-
-def dumpstacks(sig, frame):
-    """ Signal handler: dump a stack trace for each existing thread."""
-    # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
-    # modified for python 2.5 compatibility
-    threads_info = dict([(th.ident, {'name': th.name,
-                                    'uid': getattr(th,'uid','n/a')})
-                                for th in threading.enumerate()])
-    code = []
-    for threadId, stack in sys._current_frames().items():
-        thread_info = threads_info.get(threadId)
-        code.append("\n# Thread: %s (id:%s) (uid:%s)" % \
-                    (thread_info and thread_info['name'] or 'n/a',
-                     threadId,
-                     thread_info and thread_info['uid'] or 'n/a'))
-        for filename, lineno, name, line in traceback.extract_stack(stack):
-            code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
-            if line:
-                code.append("  %s" % (line.strip()))
-    _logger.info("\n".join(code))
-
-def setup_signal_handlers():
-    """ Register the signal handler defined above. """
-    SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split())
-    if os.name == 'posix':
-        map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
-        signal.signal(signal.SIGQUIT, dumpstacks)
-    elif os.name == 'nt':
-        import win32api
-        win32api.SetConsoleCtrlHandler(lambda sig: signal_handler(sig, None), 1)
-
-def quit_on_signals():
-    """ Wait for one or two signals then shutdown the server.
-
-    The first SIGINT or SIGTERM signal will initiate a graceful shutdown while
-    a second one if any will force an immediate exit.
-
-    """
-    # Wait for a first signal to be handled. (time.sleep will be interrupted
-    # by the signal handler.) The try/except is for the win32 case.
-    try:
-        while quit_signals_received == 0:
-            time.sleep(60)
-    except KeyboardInterrupt:
-        pass
-
-    config = openerp.tools.config
-    if config['pidfile']:
-        os.unlink(config['pidfile'])
-
-    openerp.service.stop_services()
-    sys.exit(0)
-
-def configure_babel_localedata_path():
-    # Workaround: py2exe and babel.
-    if hasattr(sys, 'frozen'):
-        import babel
-        babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
-
-def main():
-    os.environ["TZ"] = "UTC"
-
-    check_root_user()
-    openerp.tools.config.parse_config(sys.argv[1:])
-
-    check_postgres_user()
-    openerp.netsvc.init_logger()
-    report_configuration()
-
-    config = openerp.tools.config
-
-    configure_babel_localedata_path()
-
-    setup_signal_handlers()
-
-    if config["test_file"]:
-        run_test_file(config['db_name'], config['test_file'])
-        sys.exit(0)
-
-    if config["translate_out"]:
-        export_translation()
-        sys.exit(0)
-
-    if config["translate_in"]:
-        import_translation()
-        sys.exit(0)
-
-    if not config["stop_after_init"]:
-        setup_pid_file()
-        # Some module register themselves when they are loaded so we need the
-        # services to be running before loading any registry.
-        if config['workers']:
-            openerp.service.start_services_workers()
-        else:
-            openerp.service.start_services()
-
-    if config['db_name']:
-        for dbname in config['db_name'].split(','):
-            preload_registry(dbname)
-
-    if config["stop_after_init"]:
-        sys.exit(0)
-
-    _logger.info('OpenERP server is running, waiting for connections...')
-    quit_on_signals()

 if __name__ == "__main__":
-    main()
+    openerp.cli.main()

 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -26,6 +26,7 @@
 SUPERUSER_ID = 1

 import addons
+import cli
 import conf
 import loglevels
 import modules
@@ -149,7 +149,6 @@ CREATE TABLE res_users (
    active boolean default True,
    login varchar(64) NOT NULL UNIQUE,
    password varchar(64) default null,
-    tz varchar(64) default null,
    lang varchar(64) default '',
    -- No FK references below, will be added later by ORM
    -- (when the destination rows exist)
@@ -88,6 +88,7 @@ gk//2Q==</field>

        <record model="res.partner" id="base.partner_root">
            <field name="email">admin@example.com</field>
+            <field name="tz">Europe/Brussels</field>
            <field name="image">/9j/4AAQSkZJRgABAQEBLAEsAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEP
 ERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4e
 Hh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCACmAKYDASIA
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-23 10:47+0000\n"
+"PO-Revision-Date: 2012-11-28 12:43+0000\n"
 "Last-Translator: Juhász Krisztián <Unknown>\n"
 "Language-Team: Hungarian <openerp-hungarian-team@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:12+0000\n"
+"X-Generator: Launchpad (build 16319)\n"

 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -69,7 +69,7 @@ msgstr "Nincs rés"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
-msgstr "Magyar"
+msgstr "Magyar / Hungarian"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -330,7 +330,7 @@ msgstr "Modulok Száma"
 #. module: base
 #: help:multi_company.default,company_dest_id:0
 msgid "Company to store the current record"
-msgstr "Vállalat a jelenlegi rekord tárolására"
+msgstr "Cég a jelenlegi rekord tárolására"

 #. module: base
 #: field:res.partner.bank.type.field,size:0
@@ -716,7 +716,7 @@ msgstr "Lefordítatlan"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Kimenő Mail szerver"

 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -851,7 +851,7 @@ msgstr "Eritrea"
 #. module: base
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "A válláalkozás nevének egyedinek kell lennie"
+msgstr "A cég nevének egyedinek kell lennie"

 #. module: base
 #: model:ir.ui.menu,name:base.menu_base_action_rule_admin
@@ -895,7 +895,7 @@ msgstr "Biztonság és  Hitelesítés"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "Web Calendar"
-msgstr ""
+msgstr "Web Naptár"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -906,7 +906,7 @@ msgstr "Svéd"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Fájl Név"

 #. module: base
 #: model:res.country,name:base.rs
@@ -1098,7 +1098,7 @@ msgstr "Egyéb OSI Által Engedélyezett Licensz"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Web Gantt"

 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1125,7 +1125,7 @@ msgstr "Google felhasználók"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Flotta Kezelő"

 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1247,7 +1247,7 @@ msgstr "Érvénytelen XML a nézet felépítéshez!"
 #. module: base
 #: view:res.partner:0
 msgid "Tel:"
-msgstr ""
+msgstr "Tel:"

 #. module: base
 #: model:res.country,name:base.ky
@@ -1552,10 +1552,10 @@ msgid ""
 "use the accounting application of OpenERP, journals and accounts will be "
 "created automatically based on these data."
 msgstr ""
-"A vállalata bank számláinak beállítása és a jelentés lábjegyzetben "
-"megjelenítani kívánt számla kiválasztása. A bankszámokat újrarendezheti a "
-"lista nézetből. Ha használja az OpenERP könyvelését akkor naplók és "
-"folyószámlák lesznek létrehozva automatikussan ezekből az adatokból."
+"Állítsa be a cége bankszámláit és válassza ki azokat, melyeket riport "
+"lábjegyzetben megjeleníteni kíván. A bankszámokat újrarendezheti a lista "
+"nézetből. Ha használja az OpenERP könyvelését akkor naplók és folyószámlák "
+"ezekből az adatokból automatikussan létre lesznek hozva."

 #. module: base
 #: report:ir.module.reference:0
@@ -2475,9 +2475,9 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
-"Adja meg a mezőt/kifejezést, ami visszaadja a listát. Pl. válassza ki az "
-"értékesítési megbízást az Objektumban, és a ciklus lehet az értékesítési "
-"megbízási soron. Kifejezés= 'object.orde_line'."
+"Adja meg a mezőt/kifejezést, ami visszaadja a listát. Pl. válassza ki a "
+"vevői rendelés az Objektumban, és a ciklus lehet a vevői rendelés soron. "
+"Kifejezés= 'object.orde_line'."

 #. module: base
 #: field:ir.mail_server,smtp_debug:0
@@ -2578,7 +2578,7 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Slogan"
-msgstr ""
+msgstr "Cég Szlogen"

 #. module: base
 #: model:res.country,name:base.bb
@@ -2643,12 +2643,11 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"Elemzések osztályozásának és vevői rendeléseknek az alap rendszerező "
-"modulja.\n"
+"Gyűjtő osztályozásának és vevői rendeléseknek az alap rendszerező modulja.\n"
 "=================================================================\n"
 "\n"
-"Ezzel a modullal elemzési számlákat lehet hozzárendelni a vevői "
-"megrendelésekhez.\n"
+"Ezzel a modullal gyüjtő számlákat lehet hozzárendelni a vevői "
+"rendelésekhez.\n"
 "    "

 #. module: base
@@ -2765,7 +2764,7 @@ msgstr "Rekordazonosító ID"
 #. module: base
 #: view:ir.filters:0
 msgid "My Filters"
-msgstr ""
+msgstr "Szűrőim"

 #. module: base
 #: field:ir.actions.server,email:0
@@ -2970,7 +2969,7 @@ msgstr "Örökölt"
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "igen"

 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -3061,7 +3060,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
 msgid "LinkedIn Integration"
-msgstr ""
+msgstr "LinkedIn Integráció"

 #. module: base
 #: code:addons/orm.py:2012
@@ -3102,7 +3101,7 @@ msgstr "Ismétlési műveletek"
 #. module: base
 #: help:multi_company.default,company_id:0
 msgid "Company where the user is connected"
-msgstr "A vállalat, ahová a felhasználó kapcsolódik"
+msgstr "A Cég, melyhez a felhasználó kapcsolódik"

 #. module: base
 #: model:res.groups,comment:base.group_sale_manager
@@ -3447,7 +3446,7 @@ msgstr "Függőségek"
 #. module: base
 #: field:multi_company.default,company_id:0
 msgid "Main Company"
-msgstr "Fő vállalat"
+msgstr "Fő Cég"

 #. module: base
 #: field:ir.ui.menu,web_icon_hover:0
@@ -3916,7 +3915,7 @@ msgstr ""
 #. module: base
 #: field:res.company,name:0
 msgid "Company Name"
-msgstr "Vállalat neve"
+msgstr "Cég neve"

 #. module: base
 #: code:addons/orm.py:2796
@@ -4042,7 +4041,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Szlovákia"

 #. module: base
 #: model:res.country,name:base.nr
@@ -4203,7 +4202,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_crm
 msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+msgstr "Érdeklődők, Lehetőségek, Telefonhívások"

 #. module: base
 #: view:res.lang:0
@@ -4213,7 +4212,7 @@ msgstr "6.  %d, %m         ==> 05, 12"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_it
 msgid "Italy - Accounting"
-msgstr ""
+msgstr "Olasz - Könyvelés"

 #. module: base
 #: field:ir.actions.act_url,help:0
@@ -4305,7 +4304,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr "Vásárlók"
+msgstr "Vevők"

 #. module: base
 #: model:res.country,name:base.au
@@ -4349,7 +4348,7 @@ msgstr "res.config"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_pl
 msgid "Poland - Accounting"
-msgstr ""
+msgstr "Lengyel - Könyvelés"

 #. module: base
 #: view:ir.cron:0
@@ -4440,7 +4439,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
-msgstr ""
+msgstr "Kapcsolt Cég"

 #. module: base
 #: help:ir.actions.act_url,help:0
@@ -4481,7 +4480,7 @@ msgstr "Objektum Indítása"
 #. module: base
 #: sql_constraint:ir.sequence.type:0
 msgid "`code` must be unique."
-msgstr ""
+msgstr "'kód'-nak egyedinek kell lennie."

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_knowledge
@@ -4563,7 +4562,7 @@ msgstr "Sorszám típus"
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Unicode/UTF-8"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -4575,12 +4574,12 @@ msgstr "Hindi / हिंदी"
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 #: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load a Translation"
-msgstr ""
+msgstr "Fordítás Betöltése"

 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Telepített Verzió"

 #. module: base
 #: field:ir.module.module,license:0
@@ -4728,7 +4727,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
 msgid "Switzerland - Accounting"
-msgstr ""
+msgstr "Svájc - Könyvelés"

 #. module: base
 #: field:res.bank,zip:0
@@ -4809,7 +4808,7 @@ msgstr "Szabályok"
 #. module: base
 #: field:ir.mail_server,smtp_host:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP Szerver"

 #. module: base
 #: code:addons/base/module/module.py:269
@@ -4909,7 +4908,7 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:328
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "név"

 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -5032,7 +5031,7 @@ msgstr "NULL-ra állítás"
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Mentés"

 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
@@ -5237,7 +5236,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_localization
 #: model:ir.ui.menu,name:base.menu_localisation
 msgid "Localization"
-msgstr ""
+msgstr "Lokalizáció"

 #. module: base
 #: model:ir.module.module,description:base.module_web_api
@@ -5379,7 +5378,7 @@ msgstr ""
 #: view:ir.filters:0
 #: field:ir.filters,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Szűrő Neve"

 #. module: base
 #: view:ir.attachment:0
@@ -5391,7 +5390,7 @@ msgstr "Előzmények"
 #. module: base
 #: model:res.country,name:base.im
 msgid "Isle of Man"
-msgstr ""
+msgstr "Man Sziget"

 #. module: base
 #: help:ir.actions.client,res_model:0
@@ -5554,7 +5553,7 @@ msgstr ""
 #. module: base
 #: model:res.groups,name:base.group_sale_salesman_all_leads
 msgid "See all Leads"
-msgstr ""
+msgstr "Minden Érdeklődőt mutat"

 #. module: base
 #: model:res.country,name:base.ci
@@ -6642,7 +6641,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_syscohada
 msgid "OHADA - Accounting"
-msgstr ""
+msgstr "OHADA - Könyvelés"

 #. module: base
 #: help:res.bank,bic:0
@@ -6652,7 +6651,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in
 msgid "Indian - Accounting"
-msgstr ""
+msgstr "Indiai - Könyvelés"

 #. module: base
 #: field:res.partner,mobile:0
@@ -6745,7 +6744,7 @@ msgstr ""
 #. module: base
 #: field:res.users,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"

 #. module: base
 #: field:ir.cron,doall:0
@@ -6767,7 +6766,7 @@ msgstr "Objektum feltérképezése"
 #: field:ir.module.category,xml_id:0
 #: field:ir.ui.view,xml_id:0
 msgid "External ID"
-msgstr ""
+msgstr "Külső ID"

 #. module: base
 #: help:res.currency.rate,rate:0
@@ -6809,7 +6808,7 @@ msgstr "Partner cégformák"
 #: code:addons/base/ir/ir_fields.py:228
 #, python-format
 msgid "Use the format '%s'"
-msgstr ""
+msgstr "Használja a '%s' formátumot"

 #. module: base
 #: help:ir.actions.act_window,auto_refresh:0
@@ -7016,7 +7015,7 @@ msgstr "Szomália"
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_doctor
 msgid "Dr."
-msgstr ""
+msgstr "Dr."

 #. module: base
 #: model:res.groups,name:base.group_user
@@ -7222,12 +7221,12 @@ msgstr "Több dokumentumon"
 #: view:res.users:0
 #: view:wizard.ir.model.menu.create:0
 msgid "or"
-msgstr ""
+msgstr "vagy"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_accountant
 msgid "Accounting and Finance"
-msgstr ""
+msgstr "Könyvelés és Pénzügy"

 #. module: base
 #: view:ir.module.module:0
@@ -7281,7 +7280,7 @@ msgstr "Kérem nevezzen meg egy végrehajtandó műveletet !"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ec
 msgid "Ecuador - Accounting"
-msgstr ""
+msgstr "Ecuador - Könyvelés"

 #. module: base
 #: field:res.partner.category,name:0
@@ -7296,7 +7295,7 @@ msgstr "Északi-Mariana-szigetek"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hn
 msgid "Honduras - Accounting"
-msgstr ""
+msgstr "Honduras - Könyvelés"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_report_intrastat
@@ -7365,12 +7364,12 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_14
 msgid "Manufacturer"
-msgstr ""
+msgstr "Gyártó"

 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working for."
-msgstr "A vállalat,amelynek a jelenlegi felhasznál dolgozik."
+msgstr "A cég,amelynek a jelenlegi felhasználó dolgozik."

 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create
@@ -7546,7 +7545,7 @@ msgstr ""
 #: model:ir.module.category,name:base.module_category_localization_payroll
 #: model:ir.module.module,shortdesc:base.module_hr_payroll
 msgid "Payroll"
-msgstr ""
+msgstr "Bérszámfejtés"

 #. module: base
 #: model:ir.actions.act_window,help:base.action_country_state
@@ -8140,7 +8139,7 @@ msgstr "Kapcsolattartó"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_at
 msgid "Austria - Accounting"
-msgstr ""
+msgstr "Osztrák - Könyvelés"

 #. module: base
 #: model:ir.model,name:base.model_ir_ui_menu
@@ -8198,7 +8197,7 @@ msgstr "ir.server.object.lines"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be
 msgid "Belgium - Accounting"
-msgstr ""
+msgstr "Belga - Könyvelés"

 #. module: base
 #: view:ir.model.access:0
@@ -8546,10 +8545,9 @@ msgid ""
 "(You can click on Cancel in the User Preferences now)"
 msgstr ""
 "Kérem vegye figyelembe, hogy a jelenleg megjelenített dokumentumok nem "
-"lesznek aktuálisak miután átváltott egy másik vállalatra. Ha van mentetlen "
-"változtatása, kérem mentsen és zárjon be minden űrlapot, mielőtt átvált egy "
-"másik vállalatra. (Most rákattinthat a Mégse gombra a Felhasználói "
-"beállításokban)"
+"lesznek aktuálisak miután átváltott egy másik cégre. Ha nem mentette el a "
+"változásokat, kérem mentsen és zárjon be minden űrlapot, mielőtt átvált egy "
+"másik cégre. (Most rákattinthat a Mégse gombra a Felhasználói beállításokban)"

 #. module: base
 #: code:addons/orm.py:2806
@@ -8712,7 +8710,7 @@ msgstr ""
 #. module: base
 #: field:multi_company.default,company_dest_id:0
 msgid "Default Company"
-msgstr "Alapértelmezett Vállalat"
+msgstr "Alapértelmezett Cég"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -9937,7 +9935,7 @@ msgstr "Létrehozás dátuma"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_cn
 msgid "中国会计科目表 - Accounting"
-msgstr ""
+msgstr "Kinai - Könyvelés"

 #. module: base
 #: sql_constraint:ir.model.constraint:0
@@ -10594,7 +10592,7 @@ msgstr "Vagy"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_br
 msgid "Brazilian - Accounting"
-msgstr ""
+msgstr "Brazil - Könyvelés"

 #. module: base
 #: model:res.country,name:base.pk
@@ -11650,7 +11648,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uk
 msgid "UK - Accounting"
-msgstr ""
+msgstr "Egyesült Királyság - Könyvelés"

 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
@@ -11702,7 +11700,7 @@ msgstr "Csak olvasható"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gt
 msgid "Guatemala - Accounting"
-msgstr ""
+msgstr "Guatemala - Könyvelés"

 #. module: base
 #: help:ir.cron,args:0
@@ -11832,7 +11830,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_prof
 msgid "Professor"
-msgstr ""
+msgstr "Professzor"

 #. module: base
 #: model:res.country,name:base.hm
@@ -11943,7 +11941,7 @@ msgstr "Bináris"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_doctor
 msgid "Doctor"
-msgstr ""
+msgstr "Doktor"

 #. module: base
 #: model:ir.module.module,description:base.module_mrp_repair
@@ -12162,7 +12160,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_mister
 msgid "Mr."
-msgstr ""
+msgstr "Úr"

 #. module: base
 #: model:res.country,name:base.mv
@@ -12401,7 +12399,7 @@ msgstr "Görögország"
 #. module: base
 #: view:res.config:0
 msgid "Apply"
-msgstr ""
+msgstr "Alkalmaz"

 #. module: base
 #: field:res.request,trigger_date:0
@@ -12427,7 +12425,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_gr
 msgid "Greece - Accounting"
-msgstr ""
+msgstr "Görög - Könyvelés"

 #. module: base
 #: sql_constraint:res.country:0
@@ -12624,7 +12622,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_th
 msgid "Thailand - Accounting"
-msgstr ""
+msgstr "Thaiföld - Könyvelés"

 #. module: base
 #: view:res.lang:0
@@ -12649,7 +12647,7 @@ msgstr "Ciprus"
 #. module: base
 #: field:res.users,new_password:0
 msgid "Set Password"
-msgstr ""
+msgstr "Jelszó beállítás"

 #. module: base
 #: field:ir.actions.server,subject:0
@@ -12988,7 +12986,7 @@ msgstr "Fordítás szinkronizálása"
 #: view:res.partner.bank:0
 #: field:res.partner.bank,bank_name:0
 msgid "Bank Name"
-msgstr ""
+msgstr "Bank Neve"

 #. module: base
 #: model:res.country,name:base.ki
@@ -13133,7 +13131,7 @@ msgstr "Információ"
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "false"
-msgstr ""
+msgstr "hamis"

 #. module: base
 #: model:ir.module.module,description:base.module_account_analytic_analysis
@@ -13287,7 +13285,7 @@ msgstr "Diagram"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_es
 msgid "Spanish - Accounting (PGCE 2008)"
-msgstr ""
+msgstr "Spanyol - Könyvelés (PGCE 2008)"

 #. module: base
 #: constraint:res.partner:0
@@ -13443,7 +13441,7 @@ msgstr "Export"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ma
 msgid "Maroc - Accounting"
-msgstr ""
+msgstr "Marokkó - Könyvelés"

 #. module: base
 #: field:res.bank,bic:0
@@ -13567,7 +13565,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "Szállítói Partnerek"

 #. module: base
 #: view:res.config.installer:0
@@ -13582,7 +13580,7 @@ msgstr ""
 #. module: base
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "Vevői Partnerek"

 #. module: base
 #: sql_constraint:res.users:0
@@ -13645,7 +13643,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm
 msgid "CRM"
-msgstr ""
+msgstr "CRM"

 #. module: base
 #: model:ir.module.module,description:base.module_base_report_designer
@@ -13724,7 +13722,7 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "no"
-msgstr ""
+msgstr "nem"

 #. module: base
 #: field:ir.actions.server,trigger_obj_id:0
@@ -13884,7 +13882,7 @@ msgstr "Luxemburg"
 #. module: base
 #: model:ir.module.module,summary:base.module_base_calendar
 msgid "Personal & Shared Calendar"
-msgstr ""
+msgstr "Személyes és Megosztott Naptár"

 #. module: base
 #: selection:res.request,priority:0
@@ -14279,7 +14277,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_de
 msgid "Deutschland - Accounting"
-msgstr ""
+msgstr "Németország - Könyvelés"

 #. module: base
 #: view:ir.sequence:0
@@ -14559,7 +14557,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr
 msgid "France - Accounting"
-msgstr ""
+msgstr "Franciaország - Könyvelés"

 #. module: base
 #: view:ir.actions.todo:0
@@ -14846,7 +14844,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_nl
 msgid "Netherlands - Accounting"
-msgstr ""
+msgstr "Hollandia - Könyvelés"

 #. module: base
 #: model:res.country,name:base.gs
@@ -14952,7 +14950,7 @@ msgstr "ir.actions.server"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ca
 msgid "Canada - Accounting"
-msgstr ""
+msgstr "Kanada - Könyvelés"

 #. module: base
 #: model:ir.actions.act_window,name:base.act_ir_actions_todo_form
@@ -14993,7 +14991,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ve
 msgid "Venezuela - Accounting"
-msgstr ""
+msgstr "Venezuela - Könyvelés"

 #. module: base
 #: model:res.country,name:base.cl
@@ -15275,14 +15273,14 @@ msgstr "Partnerek: "
 #. module: base
 #: view:res.partner:0
 msgid "Is a Company?"
-msgstr ""
+msgstr "Ez egy Cég?"

 #. module: base
 #: code:addons/base/res/res_company.py:159
 #: field:res.partner.bank,name:0
 #, python-format
 msgid "Bank Account"
-msgstr ""
+msgstr "Bankszámla"

 #. module: base
 #: model:res.country,name:base.kp
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-08-20 15:28+0000\n"
-"Last-Translator: Leonardo Pistone - Agile BG - Domsense "
-"<leonardo.pistone@domsense.com>\n"
+"PO-Revision-Date: 2012-11-28 20:04+0000\n"
+"Last-Translator: Massimiliano Casa <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:12+0000\n"
+"X-Generator: Launchpad (build 16319)\n"

 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -25,6 +24,10 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Modulo per la compilazione e la stampa di assegni.\n"
+"================================================\n"
+"    "

 #. module: base
 #: model:res.country,name:base.sh
@@ -60,7 +63,7 @@ msgstr "Visualizza Architettura"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Preventivi, Ordini di vendita, Spedizioni & Controllo Fatturazione"

 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -70,7 +73,7 @@ msgstr "Nessun gap"
 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Hungarian / Magyar"
-msgstr "Ungherese / Magiaro"
+msgstr "Hungarian / Magyar"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -89,12 +92,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Interfaccia Touchscreen per Negozzi"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr ""
+msgstr "Gestione Paghe Indiana"

 #. module: base
 #: help:ir.cron,model:0
@@ -128,7 +131,7 @@ msgstr ""
 #. module: base
 #: field:ir.actions.client,params:0
 msgid "Supplementary arguments"
-msgstr ""
+msgstr "Argomenti supplementari"

 #. module: base
 #: model:ir.module.module,description:base.module_google_base_account
@@ -141,7 +144,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "Seleziona questo box se il contatto è un Impiegato."

 #. module: base
 #: help:ir.model.fields,domain:0
@@ -172,7 +175,7 @@ msgstr "Finestra di Destinazione"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "Percorso Principale del Report"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -270,7 +273,7 @@ msgstr "creato."
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "Percorso XSL"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -296,7 +299,7 @@ msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Multi Valuta"

 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -354,6 +357,15 @@ msgid ""
 "    * Commitment Date\n"
 "    * Effective Date\n"
 msgstr ""
+"\n"
+"Aggiungere informazioni addizionali all'ordine di vendita.\n"
+"====================================================\n"
+"\n"
+"Puoi aggiungere le seguenti date aggiuntive all'ordine di vendita:\n"
+"----------------------------------------------------------\n"
+"    * Data della richiesta\n"
+"    * Data dell'ordine\n"
+"    * Data effettiva\n"

 #. module: base
 #: help:ir.actions.act_window,res_id:0
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-08-20 15:28+0000\n"
-"Last-Translator: Bayuka <bayuka1988@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 13:28+0000\n"
+"Last-Translator: gobi <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"

 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -24,6 +24,10 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Чек бичих болон Чек хэвлэх модуль.\n"
+"================================================\n"
+"    "

 #. module: base
 #: model:res.country,name:base.sh
@@ -59,7 +63,7 @@ msgstr "Дэлгэцийн архитектур"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Үнийн санал, Борлуулалтын захиалга, Хүргэлт & Нэхэмжлэлийн хяналт"

 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -88,12 +92,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Дэлгүүрт зориулагдсан маажих дэлгэц"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr ""
+msgstr "Энэтхэг Цалин"

 #. module: base
 #: help:ir.cron,model:0
@@ -121,6 +125,17 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"Барааны маягт дээр үйлдвэрлэгч болон үзүүлэлтүүд нэмдэг модуль.\n"
+"====================================================================\n"
+"\n"
+"Бараанд дараах зүйлсийг тодорхойлох боломжтой болно:\n"
+"-----------------------------------------------\n"
+"    * Үйлдвэрлэгч\n"
+"    * Барааны Үйлдвэрлэгчийн өгсөн нэр\n"
+"    * Барааны Үйлдвэрлэгчийн өгсөн код\n"
+"    * Барааны үзүүлэлтүүд\n"
+"    "

 #. module: base
 #: field:ir.actions.client,params:0
@@ -134,11 +149,14 @@ msgid ""
 "The module adds google user in res user.\n"
 "========================================\n"
 msgstr ""
+"\n"
+"Энэ модуль нь res_user-т google хэрэглэгчийг нэмдэг.\n"
+"========================================\n"

 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "Хэрэв холбогч нь ажилтан бол үүнийг тэмдэглэ."

 #. module: base
 #: help:ir.model.fields,domain:0
@@ -168,7 +186,7 @@ msgstr "Ашиглах цонх"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "Тайлангийн Үндсэн Файлын Зам"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -189,6 +207,14 @@ msgid ""
 "revenue\n"
 "reports."
 msgstr ""
+"\n"
+"Зардал, Цагийн хуудсын бичилтээс нэхэмжлэлийг үүсгэдэг.\n"
+"========================================================\n"
+"\n"
+"Өртөг (хүний нөөц, зардал, ...) дээр суурилан нэхэмжлэл үүсгэдэг модуль .\n"
+"\n"
+"Шинжилгээний данс дээр зарах үнийн хүснэгт үүсгэж орох ашгийн онолийн "
+"тайланг үүсгэж болно."

 #. module: base
 #: model:ir.module.module,description:base.module_crm
@@ -223,6 +249,33 @@ msgid ""
 "* Planned Revenue by Stage and User (graph)\n"
 "* Opportunities by Stage (graph)\n"
 msgstr ""
+"\n"
+"OpenERP-н Захиалагчийн Харилцааны Менежмент (CRM)-н ерөнхий модуль\n"
+"=====================================================\n"
+"\n"
+"Энэ модуль нь хүмүүсийн бүлэгүүд сэжим, боломж, уулзалт, утасны дуудлагыг "
+"ухаалаг бөгөөд оновчтой зохион байгуулах боломжийг олгодог.\n"
+"\n"
+"Түүнчлэн харилцах, олж таних, эрэмбэлэх, оноох, шийдэх, мэдэгдэх гэх мэт "
+"түлхүүр даалгавруудыг удирддаг.\n"
+"\n"
+"OpenERP нь бүх хэрэгүүд хэрэглэгч, захиалагч, нийлүүлэгчээр амжилттай "
+"хөтлөгдөх баталгааг хангадаг. Автомат сануулга илгээх, хүсэлтийг дээд шат "
+"рүү хүргэх, байгууллагын дүрэм дээр тулгуурласан маш олон төрлийн "
+"үйлдлүүдийг гүйцэтгэх боломжтой. \n"
+"\n"
+"Системийн гайхалтай тал нь хэрэглэгчид ямар нэг нарийвчилсан ажил хийх "
+"шаардлагагүй байдаг.  CRM модуль нь имэйл болон OpenERP-г хооронд нь холбох "
+"имэйл үүдтэй. Иймээс зөвхөн имэйл илгээх замаар сэжим үүсгэж боломж "
+"олгодог.\n"
+"\n"
+"OpenERP нь талархлын мессеж илгээгээд имэйлийг харгалзах ажилтан руу илгээж "
+"цаашид авах бүх арга хэмжээг авч зөв боловсруулалтыг хийлгэдэг.\n"
+"\n"
+"CRM-н хянах самбар дараах зүйлсийг агуулдаг:\n"
+"-------------------------------\n"
+"* Төлөвлөсөн орлого үеээр болон хэрэглэгчээр (graph)\n"
+"* Боломж үеээр (график)\n"

 #. module: base
 #: code:addons/base/ir/ir_model.py:394
@@ -266,7 +319,7 @@ msgstr "үүсгэгдсэн."
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "XSL зам"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -292,7 +345,7 @@ msgstr "Инуит хэл / ᐃᓄᒃᑎᑐᑦ"
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Олон валютууд"

 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -315,7 +368,7 @@ msgstr "Борлуулалтын менежмент"
 msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
-msgstr ""
+msgstr "Энэ холбогчтой харилцах дотоод хэрэглэгч (хэрэв байгаа бол)."

 #. module: base
 #: view:res.partner:0
@@ -350,6 +403,15 @@ msgid ""
 "    * Commitment Date\n"
 "    * Effective Date\n"
 msgstr ""
+"\n"
+"Борлуулалтын захиалгад огнооны нэмэлт мэдээлэл нэмдэг .\n"
+"===================================================\n"
+"\n"
+"Борлуулалтын захиалгад дараах огноонуудыг нэмж болно:\n"
+"-----------------------------------------------------------\n"
+"    * Хүссэн Огноо\n"
+"    * Амласан Огноо\n"
+"    * Зохистой Огноо\n"

 #. module: base
 #: help:ir.actions.act_window,res_id:0
@@ -357,6 +419,8 @@ msgid ""
 "Database ID of record to open in form view, when ``view_mode`` is set to "
 "'form' only"
 msgstr ""
+"Форм харагдацийг нээх бичлэгийн өгөгдлийн баазын ID, зөвхөн ``view_mode`` нь "
+"'form' гэж тохируулагдсан үед."

 #. module: base
 #: field:res.partner.address,name:0
@@ -407,6 +471,13 @@ msgid ""
 "document and Wiki based Hidden.\n"
 "    "
 msgstr ""
+"\n"
+"Нууцлагдсан мэдлэгийн санг суулгагч.\n"
+"=====================================\n"
+"\n"
+"Мэдлэг Програмын Тохируулагчийг ил болгож нууцлагдсан байдаг баримт болон "
+"Викиг суулгах боломжтой болгодог.\n"
+"    "

 #. module: base
 #: model:ir.module.category,name:base.module_category_customer_relationship_management
@@ -425,6 +496,14 @@ msgid ""
 "invoices from picking, OpenERP is able to add and compute the shipping "
 "line.\n"
 msgstr ""
+"\n"
+"Борлуулалтын захиалга болон бэлтгэх баримтанд хүргэх аргыг нэмэх боломжийг "
+"олгодог.\n"
+"==============================================================\n"
+"\n"
+"Өөрийн тээвэрлэгчид болон хүргэлтийн сүлжээг үнэнд зориулан тодорхойлж "
+"болно. Бэлтгэх баримтаас нэхэмжлэх үүсгэхэд OpenERP нь хүргэлтийн мөрийг "
+"нэмж тооцоолж чаддаг.\n"

 #. module: base
 #: code:addons/base/ir/ir_filters.py:83
@@ -433,6 +512,8 @@ msgid ""
 "There is already a shared filter set as default for %(model)s, delete or "
 "change it before setting a new default"
 msgstr ""
+"%(model)s-д анхны шүүлтүүр аль хэдийнээ тохируулагдсан байна, шинийг "
+"тохируулахыг тулд хуучныг нь устгах буюу солино уу"

 #. module: base
 #: code:addons/orm.py:2639
@@ -528,7 +609,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.relation,name:0
 msgid "Relation Name"
-msgstr ""
+msgstr "Харьцааны Нэр"

 #. module: base
 #: model:res.country,name:base.tv
@@ -568,7 +649,7 @@ msgstr ""
 #. module: base
 #: view:workflow.transition:0
 msgid "Workflow Transition"
-msgstr ""
+msgstr "Ажлын урсгалын шилжилт"

 #. module: base
 #: model:res.country,name:base.gf
@@ -578,7 +659,7 @@ msgstr "Франц Гуана"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr ""
+msgstr "Ажлууд, Хэлтсүүд, Ажилчдийн дэлгэрэнгүй"

 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -594,6 +675,15 @@ msgid ""
 "that have no counterpart in the general financial accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Шинжилгээний обьект тодорхойлох модуль.\n"
+"===============================================\n"
+"\n"
+"OpenERP-д шинжилгээний дансд нь ерөнхий дансдадтай холбогддог боловч \n"
+"бүрэн үл хамаарах байдаг. Иймээс ерөнхий санхүүгийн данс эсрэг тал нь болгох "
+"албагүй \n"
+"бөгөөд төрөл бүрийн шинжилгээний үйлдлүүдийг оруулж болно.\n"
+"    "

 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
@@ -617,6 +707,18 @@ msgid ""
 "* Use emails to automatically confirm and send acknowledgements for any "
 "event registration\n"
 msgstr ""
+"\n"
+"Үйл явдлуудын зохион байгуулалт болон менежмент.\n"
+"======================================\n"
+"\n"
+"Үйл явдал модуль нь үйл явдлыг оновчтой зохион байгуулж холбогдох бүх "
+"даалгаврыг менеж хийдэг. \n"
+"Үүнд: төлөвлөх, бүргэлийг хөтлөх, ирц гэх мэт зүйлс хамаарна.\n"
+"\n"
+"Түлхүүр Онцлогууд\n"
+"------------\n"
+"* Үйл явдлын бүртгэлийг менеж хийнэ\n"
+"* Имэйл ашиглан үйл явдлын бүртгэлийн магадлагааг автоматаар илгээнэ\n"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -642,6 +744,21 @@ msgid ""
 "requested it.\n"
 "    "
 msgstr ""
+"\n"
+"Gengo API-н тусламжтай автомат орчуулга\n"
+"----------------------------------------\n"
+"\n"
+"Энэ модуль нь Gengo API-г ашиглан автомат орчуулгын идэлвхгүй товлогдсон "
+"үйлдлийг суулгадаг.\n"
+"Идэвхжүүлэхийн тулд:\n"
+"1) Gengo эрхийн тохиргоог `Тохиргоо > Компаниуд > Gengo параметрүүд`-д "
+"тохируулах ёстой\n"
+"2) `Тохиргоо > Програмын нэр томъёо > Gengo: Орчуулгын Гар хүсэлт` харилцах "
+"цонхыг дуудаж тохиргоог хийнэ.\n"
+"\n"
+"Энэ харилцах цонх нь CRON даалгавр болон Товлогчийг идэвхжүүлдэг бөгөөд таны "
+"хүссэн бүх нэр томъёог Gengo сервисээр автомат орчуулж эхэлдэг.\n"
+"    "

 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
@@ -691,7 +808,7 @@ msgstr "Колумб"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
 msgid "Mister"
-msgstr ""
+msgstr "Ноён"

 #. module: base
 #: help:res.country,code:0
@@ -720,7 +837,7 @@ msgstr "Орчуулагдаагүй"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Гарах Мэйл Сервер"

 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -794,6 +911,32 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"\n"
+"Санхүү болон санхүүгийн менежмент\n"
+"====================================\n"
+"\n"
+"Санхүү, НББ модулийн хамрах хүрээ:\n"
+"--------------------------------------------\n"
+"    * Ерөнхий санхүү\n"
+"    * Өртөг/Шинжилгээний санхүү\n"
+"    * Гуравдагч этгээдийн санхүү\n"
+"    * Татварын менежмент\n"
+"    * Төсөв\n"
+"    * Захиалагч болон Нийлүүлэгчийн нэхэмжлэл\n"
+"    * Банкны хуулга\n"
+"    * Харилцагчаарх тулгалт\n"
+"\n"
+"Нягтлангуудад зориулсан хянах самбар үүсгэдэг бөгөөд агууламж нь:\n"
+"--------------------------------------------------\n"
+"    * Захиалагчийн батлах нэхэмжлэх\n"
+"    * Компаний шинжилгээ\n"
+"    * Мөнгөн сангийн график\n"
+"\n"
+"Ерөнхий дэвтэр хөтөлдөг шиг боловсруулалт нь тухайлсан санхүүгийн жилд "
+"тодорхойлогдсон санхүүүгийн журналуудаар хийгддэг (бичилтийн мөрүүдийн "
+"шилжилт, бүлэглэлт зэрэг нь журналаар хийгддэг) \n"
+"бөгөөд account_voucher гэсэн нэртэй ваучер бэлддэг модуль байдаг.\n"
+"    "

 #. module: base
 #: view:ir.model:0
@@ -813,6 +956,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Хаягийн дэвтэрт холбогчийг нэмэхийн тулд дарна уу.\n"
+"              </p><p>\n"
+"                OpenERP нь захиалагчтай холбогдох бүх харилцааг хялбархан \n"
+"                боломж олгодог: харилцаа, бизнес боломжуудын түүх,\n"
+"                баримтууд, гм.\n"
+"              </p>\n"
+"            "

 #. module: base
 #: model:ir.module.module,description:base.module_web_linkedin
@@ -823,6 +974,11 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Вебийн LinkedIn модуль.\n"
+"============================\n"
+"Энэ модуль нь OpenERP-г LinkedIn-тэй холбодог.\n"
+"        "

 #. module: base
 #: help:ir.actions.act_window,src_model:0
@@ -868,7 +1024,7 @@ msgstr "Руминь - Санхүү"
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"

 #. module: base
 #: help:res.partner,image_small:0
@@ -877,6 +1033,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Холбогчийн жижиг хэмжээтэй зураг. Энэ нь автоматаар харьцаа нь хадгалагдан "
+"64x64px хэмжээтэй болдог. Энэ талбарыг жижиг зураг хэрэг болсон газар бүрт "
+"хэрэглэж болно."

 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -896,7 +1055,7 @@ msgstr "Нууцлал ба Эрх олголт"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "Web Calendar"
-msgstr ""
+msgstr "Веб Цаглабар"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -907,7 +1066,7 @@ msgstr "Швед хэл / svenska"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Файлын нэр"

 #. module: base
 #: model:res.country,name:base.rs
@@ -958,6 +1117,30 @@ msgid ""
 "also possible in order to automatically create a meeting when a holiday "
 "request is accepted by setting up a type of meeting in Leave Type.\n"
 msgstr ""
+"\n"
+"Амралт, чөлөө болон амралт, чөлөөний хуваарилалтын хүсэлтүүдийг менеж хийнэ\n"
+"=====================================\n"
+"\n"
+"Энэ програм нь компаний амралтын товыг хянадаг. Энэ модуль нь ажилчид "
+"амралтаа хүсэх боломжийг олгогдог. Менежер дараад нь амралтын хүсэлтийг "
+"хянаж зөвшөөрөх юмуу татгалздаг. Ийм байдлаар байгууллагыг бүхэлд нь буюу "
+"хэлтсээр нь бүх амралтыг хянадаг. \n"
+"\n"
+"Амралт чөлөөний хэд хэдэн төрөл (өвчний, баяр ёслолын, цалинтай, ...)-г "
+"тохируулж болдог бөгөөд ажилчинд эсвэл хэлтэст амралт, чөлөөг хуваарилах "
+"хүсэлтийг үүсгэх замаар хуваарилж өгдөг. Ажилчин нь мөн амралт, чөлөөг шинэ "
+"хуваарилалт үүсгэх байдлаар хүсч болдог. Хэрэв хүсэлт зөвшөөрөгдвөл тухайн "
+"төрөлийн амралт чөлөөний хуваарилагдсан хугацаа нь нэмэгддэг.\n"
+"\n"
+"Амралт, чөлөөг дараах төрөл бүрийн тайлангуудын тусламжтайгаар хянах "
+"боломжтой: \n"
+"\n"
+"* Амралт чөлөөний товчоо\n"
+"* Амралт, чөлөө хэлтсээр\n"
+"* Амралт, чөлөөний шинжилгээ\n"
+"\n"
+"Захиалагчийн харилцагчийн CRM модульд уулзалт үүсгэсэн тохиолдолд уулзалт "
+"төрөлтэй чөлөө үүсч дотоод цагалбарт ижилтгэгддэг.\n"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -1003,7 +1186,7 @@ msgstr "Имэйл тохиргоо"
 #: code:addons/base/ir/ir_fields.py:196
 #, python-format
 msgid "'%s' does not seem to be a valid date for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' нь '%%(field)s' гэсэн огноо талбарт тохирохгүй бололтой"

 #. module: base
 #: view:res.partner:0
@@ -1020,6 +1203,7 @@ msgstr "Зимбаб"
 msgid ""
 "Type of the constraint: `f` for a foreign key, `u` for other constraints."
 msgstr ""
+"Хязгаарлалтын төрөл: `f` нь гадаад түлхүүр, `u` нь бусад хязгаарлалт."

 #. module: base
 #: view:ir.actions.report.xml:0
@@ -1105,7 +1289,7 @@ msgstr "Бусад батлагдсан OSI лиценз"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Веб Гант"

 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1132,7 +1316,7 @@ msgstr "Google Хэрэглэгчид"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Машин Зогсоолын Менежмент"

 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1187,7 +1371,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:724
 #, python-format
 msgid "Document model"
-msgstr ""
+msgstr "Баримтын модель"

 #. module: base
 #: view:res.lang:0
@@ -1237,7 +1421,7 @@ msgstr "Улсын нэр давхцахгүй байх ёстой !"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "Сүүлийн Хувилбар"

 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:213
@@ -1259,7 +1443,7 @@ msgstr "Дэлгэцийн XML алдаатай!"
 #. module: base
 #: view:res.partner:0
 msgid "Tel:"
-msgstr ""
+msgstr "Утас:"

 #. module: base
 #: model:res.country,name:base.ky
@@ -1269,7 +1453,7 @@ msgstr "Кайманы арлууд"
 #. module: base
 #: view:ir.rule:0
 msgid "Record Rule"
-msgstr ""
+msgstr "Бичлэгийн Дүрэм"

 #. module: base
 #: model:res.country,name:base.kr
@@ -1312,7 +1496,7 @@ msgstr "Харагдхуйц"
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
 msgid "Open Settings Menu"
-msgstr ""
+msgstr "Тохиргооны Менюг Нээх"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -1612,12 +1796,12 @@ msgstr "%Y - Зуунтай хамт он."
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Тайлангийн Хөлний Тохиргоо"

 #. module: base
 #: field:ir.translation,comments:0
 msgid "Translation comments"
-msgstr ""
+msgstr "Орчуулгын Сэтгэгдлүүд"

 #. module: base
 #: model:ir.module.module,description:base.module_lunch
@@ -2170,7 +2354,7 @@ msgstr "Бүтэн зам"
 #. module: base
 #: view:base.language.export:0
 msgid "The next step depends on the file format:"
-msgstr ""
+msgstr "Дараагийн алхам файлын форматаас хамаарна:"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-24 23:58+0000\n"
-"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 02:51+0000\n"
+"Last-Translator: Carlos Paiva <Unknown>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:40+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"

 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -127,6 +127,17 @@ msgid ""
 "    * Product Attributes\n"
 "    "
 msgstr ""
+"\n"
+"Módulo que acrescenta fabricantes e seus atributos ao formulário de poduto\n"
+"====================================================================\n"
+"\n"
+"Agora você pode definir para o produto:\n"
+"-----------------------------------------------\n"
+"* Fabricante\n"
+"* Nome do Produto para o Fabricante\n"
+"* Código (referência) do Produto para o Fabricante\n"
+"* Atributos do Produto\n"
+"    "

 #. module: base
 #: field:ir.actions.client,params:0
@@ -276,7 +287,7 @@ msgstr "criado."
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "Caminho do arquivo XSL"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -314,6 +325,10 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Plano de contas e impostos chileno\n"
+"\n"
+"    "

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale
@@ -837,6 +852,11 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"Módulo de intregração do OpenERP Web com LinkedIn.\n"
+"============================\n"
+"Este módulo integra o LinkedIn ao OpenERP.\n"
+"        "

 #. module: base
 #: help:ir.actions.act_window,src_model:0
@@ -892,6 +912,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Imagem (foto) em tamannho reduzido do contato. O tamanho da imagem será "
+"automaticamente ajustado para 64x64px, mantendo-se as proporções da imagem "
+"original. Utilize esse campo em lugares onde uma pequena imagem é necessária."

 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -1386,6 +1409,9 @@ msgid ""
 "                                for uploading to OpenERP's translation "
 "platform,"
 msgstr ""
+"Formato TGZ: arquivo comprimido contendo um arquivo do tipo PO, adequado\n"
+"                                para ser carregado na plataforma de tradução "
+"do OpenERP's,"

 #. module: base
 #: view:res.lang:0
@@ -1449,7 +1475,7 @@ msgstr "Haití"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
 msgid "French Payroll"
-msgstr ""
+msgstr "Folha de pagamento - França"

 #. module: base
 #: view:ir.ui.view:0
@@ -1571,6 +1597,12 @@ msgid ""
 "=============\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo adiciona o menu e funções de reclamações de clientes ao seu "
+"portal caso os módulos portal e reclamações estejam instalados.\n"
+"============================================================================="
+"=============\n"
+"    "

 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
@@ -1986,6 +2018,21 @@ msgid ""
 "synchronization with other companies.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo acrescenta ferramentas genéricas de compartilhamento ao seu "
+"banco de dados OpenERP\n"
+"========================================================================\n"
+"\n"
+"Adiciona um botão \"compartilhar\" ao cliente Web permitindo compartilhar \n"
+"qualquer dado do OpenERP com colegas, clientes e amigos\n"
+"\n"
+"Cria em tempo real regras (ir.rules), usuários e grupos com os direitos "
+"apropriados para acessar o objeto compartilhado, restringindo o acesso às "
+"demais informações do sistema.\n"
+"\n"
+"É extremamente útil para trabalhos em conjunto, compartilhar conhecimento e "
+"sincronização de dados com outras empresas.\n"
+"    "

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_process
@@ -2211,7 +2258,7 @@ msgstr ""
 #. module: base
 #: view:base.language.export:0
 msgid "PO(T) format: you should edit it with a PO editor such as"
-msgstr ""
+msgstr "Arquivo tipo PO(T): Deve ser editado com um editor de PO tal como"

 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
@@ -2326,6 +2373,8 @@ msgid ""
 "Appears by default on the top right corner of your printed documents (report "
 "header)."
 msgstr ""
+"Aparece por padrão no canto superior direito dos documentos impressos "
+"(cabeçalho de relatório)."

 #. module: base
 #: field:base.module.update,update:0
@@ -2375,6 +2424,8 @@ msgstr ""
 msgid ""
 "No matching record found for %(field_type)s '%(value)s' in field '%%(field)s'"
 msgstr ""
+"Nenhum registro encontrado com  '%%(field)s' correspondendo a %(field_type)s "
+"'%(value)s'"

 #. module: base
 #: model:ir.actions.act_window,help:base.action_ui_view
@@ -2549,6 +2600,8 @@ msgid ""
 "View type: Tree type to use for the tree view, set to 'tree' for a "
 "hierarchical tree view, or 'form' for a regular list view"
 msgstr ""
+"Tipo de visão: Tipo de árvore a ser utilizado na visão em árvore. Atribua "
+"'tree' para uma visão hierárquica ou 'form' para uma visão de lista simples."

 #. module: base
 #: sql_constraint:ir.ui.view_sc:0
@@ -2622,7 +2675,7 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Slogan"
-msgstr ""
+msgstr "Slogan da empresa"

 #. module: base
 #: model:res.country,name:base.bb
@@ -2668,7 +2721,7 @@ msgstr "Grego / Ελληνικά"
 #. module: base
 #: field:res.company,custom_footer:0
 msgid "Custom Footer"
-msgstr ""
+msgstr "Rodapé Personalizado"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
@@ -2702,6 +2755,10 @@ msgid ""
 "==================================\n"
 "    "
 msgstr ""
+"\n"
+"Plano de contas dos EUA.\n"
+"==================================\n"
+"    "

 #. module: base
 #: field:ir.actions.act_url,target:0
@@ -2736,7 +2793,7 @@ msgstr "Nome do atalho"
 #. module: base
 #: field:res.partner,contact_address:0
 msgid "Complete Address"
-msgstr ""
+msgstr "Endereço completo"

 #. module: base
 #: help:ir.actions.act_window,limit:0
@@ -2808,7 +2865,7 @@ msgstr "ID do Registro"
 #. module: base
 #: view:ir.filters:0
 msgid "My Filters"
-msgstr ""
+msgstr "Meus Filtros"

 #. module: base
 #: field:ir.actions.server,email:0
@@ -2822,12 +2879,17 @@ msgid ""
 "Module to attach a google document to any model.\n"
 "================================================\n"
 msgstr ""
+"\n"
+"Módulo que anexa documentos do google docs a qualquer modelo.\n"
+"================================================\n"

 #. module: base
 #: code:addons/base/ir/ir_fields.py:334
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
 msgstr ""
+"Encontradas múltiplas correspondências para o campo '%%(field)s' (%d "
+"correspondências)"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -2861,7 +2923,7 @@ msgstr "Argumentos enviados ao cliente juntamente com a tag view"
 #. module: base
 #: model:ir.module.module,summary:base.module_contacts
 msgid "Contacts, People and Companies"
-msgstr ""
+msgstr "Contatos, Pessoas e Empresas"

 #. module: base
 #: model:res.country,name:base.tt
@@ -2927,7 +2989,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:715
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
-msgstr ""
+msgstr "Usuário não autorizado a acessar esse documento."

 #. module: base
 #: model:res.country,name:base.py
@@ -2942,7 +3004,7 @@ msgstr "Fiji"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "Relatório XML"

 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -3013,7 +3075,7 @@ msgstr "Herdado"
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "sim"

 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -3104,7 +3166,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
 msgid "LinkedIn Integration"
-msgstr ""
+msgstr "Integração com LinkedIn"

 #. module: base
 #: code:addons/orm.py:2012
@@ -3153,6 +3215,8 @@ msgid ""
 "the user will have an access to the sales configuration as well as statistic "
 "reports."
 msgstr ""
+"o usuário terá acesso à configuração de vendas bem como a relatórios "
+"estatísticos."

 #. module: base
 #: model:res.country,name:base.nz
@@ -3239,6 +3303,8 @@ msgid ""
 "the user will have an access to the human resources configuration as well as "
 "statistic reports."
 msgstr ""
+"o usuário terá acesso à configuração de recursos humanos bem como a "
+"relatórios estatísticos."

 #. module: base
 #: model:ir.module.module,description:base.module_web_shortcuts
@@ -3254,6 +3320,16 @@ msgid ""
 "shortcut.\n"
 "    "
 msgstr ""
+"\n"
+"Habilitar a funcionalidade de atalhos no cliente web.\n"
+"===========================================\n"
+"\n"
+"Adicionar um ícone na bandeja do sistema (systray) para acessar os atalhos "
+"do usuário (se houverem)\n"
+"\n"
+"Adicionar um ícone ao lado do título da visão para adicionar / remover "
+"atalhos.\n"
+"    "

 #. module: base
 #: field:ir.actions.client,params_store:0
@@ -3280,7 +3356,7 @@ msgstr "Tipo de relatório desconhecido: %s"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense
 msgid "Expenses Validation, Invoicing"
-msgstr ""
+msgstr "Validação de Despesas, Faturamento"

 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
@@ -3381,7 +3457,7 @@ msgstr ""
 #: code:addons/orm.py:3824
 #, python-format
 msgid "Missing document(s)"
-msgstr ""
+msgstr "Documento(s) faltante(s)"

 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
@@ -3396,6 +3472,7 @@ msgid ""
 "For more details about translating OpenERP in your language, please refer to "
 "the"
 msgstr ""
+"Para maiores detalhes de como traduzir o OpenERP para o seu idioma refira a"

 #. module: base
 #: field:res.partner,image:0
@@ -3418,7 +3495,7 @@ msgstr "Calendário"
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
 msgid "Knowledge"
-msgstr ""
+msgstr "Conhecimento"

 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3583,7 +3660,7 @@ msgstr "workflow.activity"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Exportação Concluida"

 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3612,7 +3689,7 @@ msgstr "Finlândia / Suomi"
 #. module: base
 #: view:ir.config_parameter:0
 msgid "System Properties"
-msgstr ""
+msgstr "Propriedades do Sistema"

 #. module: base
 #: field:ir.sequence,prefix:0
@@ -3669,7 +3746,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,modules:0
 msgid "Modules To Export"
-msgstr ""
+msgstr "Módulos a Exportar"

 #. module: base
 #: model:res.country,name:base.mt
@@ -3682,6 +3759,8 @@ msgstr "Malta"
 msgid ""
 "Only users with the following access level are currently allowed to do that"
 msgstr ""
+"Apenas usuários com os níveis de acesso abaixo têm permissaõ para executar "
+"essa ação"

 #. module: base
 #: field:ir.actions.server,fields_lines:0
@@ -3772,7 +3851,7 @@ msgstr "Antártida"
 #. module: base
 #: view:res.partner:0
 msgid "Persons"
-msgstr ""
+msgstr "Pessoas"

 #. module: base
 #: view:base.language.import:0
@@ -3842,7 +3921,7 @@ msgstr "Erro! Você não pode criar membros associados recursivamente."
 #: field:res.company,rml_footer:0
 #: field:res.company,rml_footer_readonly:0
 msgid "Report Footer"
-msgstr ""
+msgstr "Rodapé do Relatório"

 #. module: base
 #: selection:res.lang,direction:0
@@ -3852,7 +3931,7 @@ msgstr "Direita-para-esquerda"
 #. module: base
 #: model:res.country,name:base.sx
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Sint Maarten (Dutch part)"

 #. module: base
 #: view:ir.actions.act_window:0
@@ -3960,7 +4039,7 @@ msgstr "Urdu / اردو"
 #: code:addons/orm.py:3855
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Acesso Negado"

 #. module: base
 #: field:res.company,name:0
@@ -4018,6 +4097,17 @@ msgid ""
 "If you need to manage your meetings, you should install the CRM module.\n"
 "    "
 msgstr ""
+"\n"
+"Este é um sistema completo de agenda.\n"
+"========================================\n"
+"\n"
+"Suporta::\n"
+"------------\n"
+"    - Eventos agendados\n"
+"    - Eventos recorrentes\n"
+"\n"
+"Se for necessário administrar suas reuniões, instale o módulo CRM.\n"
+"    "

 #. module: base
 #: model:res.country,name:base.je
@@ -4032,6 +4122,10 @@ msgid ""
 "==================================\n"
 " "
 msgstr ""
+"\n"
+"Permitir acesso anônimo ao OpenERP.\n"
+"==================================\n"
+" "

 #. module: base
 #: view:res.lang:0
@@ -4093,7 +4187,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Eslováquia"

 #. module: base
 #: model:res.country,name:base.nr
@@ -4134,6 +4228,10 @@ msgid ""
 "Italian accounting chart and localization.\n"
 "    "
 msgstr ""
+"\n"
+"Plano de contas genérico italiano.\n"
+"================================================\n"
+"    "

 #. module: base
 #: model:res.country,name:base.me
@@ -4296,6 +4394,18 @@ msgid ""
 "comptable\n"
 "Seddik au cours du troisième trimestre 2010."
 msgstr ""
+"\n"
+"Módulo base para o plano de contas Marrocos.\n"
+"=================================================================\n"
+"\n"
+"Ce Module charge le modèle du plan de comptes standard Marocain et permet "
+"de\n"
+"générer les états comptables aux normes marocaines (Bilan, CPC (comptes de\n"
+"produits et charges), balance générale à 6 colonnes, Grand livre "
+"cumulatif...).\n"
+"L'intégration comptable a été validé avec l'aide du Cabinet d'expertise "
+"comptable\n"
+"Seddik au cours du troisième trimestre 2010."

 #. module: base
 #: help:ir.module.module,auto_install:0
@@ -4353,7 +4463,7 @@ msgstr "Planos de Contas"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organization"
-msgstr ""
+msgstr "Organização de Eventos"

 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -4381,7 +4491,7 @@ msgstr "Campo Base"
 #. module: base
 #: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
 msgid "Managing vehicles and contracts"
-msgstr ""
+msgstr "Administração de veículos e contratos"

 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
@@ -4631,7 +4741,7 @@ msgstr "Tipo de Sequencia"
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Unicode/UTF-8"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -4643,12 +4753,12 @@ msgstr "Hindi / हिंदी"
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 #: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load a Translation"
-msgstr ""
+msgstr "Carregar Tradução"

 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Versão Instalada"

 #. module: base
 #: field:ir.module.module,license:0
@@ -4791,7 +4901,7 @@ msgstr "ir.actions.report.xml"
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Território Palestino Ocupado"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
@@ -4944,12 +5054,12 @@ msgstr "Workflows"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Compras"

 #. module: base
 #: selection:base.language.install,lang:0
 msgid "Portuguese (BR) / Português (BR)"
-msgstr ""
+msgstr "Portuguese (BR) / Português (BR)"

 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
@@ -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-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-10-25 07:14+0000\n"
+"PO-Revision-Date: 2012-11-27 14:04+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"

 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -60,7 +60,7 @@ msgstr "Архитектура представления"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Предложение, заказ продажи, доставка и управление выставлением счета"

 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -89,7 +89,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Сенсорный интерфейс для магазинов"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
@@ -135,11 +135,14 @@ msgid ""
 "The module adds google user in res user.\n"
 "========================================\n"
 msgstr ""
+"\n"
+"Модуль добавляет пользователя Google в  res user.\n"
+"========================================\n"

 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "Выберите эту опцию, если этот контакт - сотрудник ."

 #. module: base
 #: help:ir.model.fields,domain:0
@@ -170,7 +173,7 @@ msgstr "Окно назначения"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "Главный путь к файлу отчета"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -293,7 +296,7 @@ msgstr "Инуктитут / ᐃᓄᒃᑎᑐᑦ"
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Валюты"

 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -317,6 +320,8 @@ msgid ""
 "The internal user that is in charge of communicating with this contact if "
 "any."
 msgstr ""
+"Внутренний пользователь, который отвечает за связи с этим контактом , если "
+"таковые имеются."

 #. module: base
 #: view:res.partner:0
@@ -570,7 +575,7 @@ msgstr ""
 #. module: base
 #: view:workflow.transition:0
 msgid "Workflow Transition"
-msgstr ""
+msgstr "Переход рабочего процесса"

 #. module: base
 #: model:res.country,name:base.gf
@@ -580,7 +585,7 @@ msgstr "Французская Гвиана"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr ""
+msgstr "Вакансии, отделы, сотрудники"

 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -693,7 +698,7 @@ msgstr "Колумбия"
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
 msgid "Mister"
-msgstr ""
+msgstr "Господин"

 #. module: base
 #: help:res.country,code:0
@@ -722,7 +727,7 @@ msgstr "Без перевода"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Сервер исходящей почты"

 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -872,7 +877,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"

 #. module: base
 #: help:res.partner,image_small:0
@@ -881,6 +886,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Маленькое изображение контакта. Автоматически преобразуется в изображение "
+"64x64px, с сохранением пропорций. Используйте это поле там, где требуется "
+"маленькое изображение."

 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -901,7 +909,7 @@ msgstr "Безопасность и аутентификация"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "Web Calendar"
-msgstr ""
+msgstr "Веб календарь"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -912,7 +920,7 @@ msgstr "Шведский / svenska"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Имя файла"

 #. module: base
 #: model:res.country,name:base.rs
@@ -1111,7 +1119,7 @@ msgstr "Другие лицензии утвержденные OSI"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Веб Гант"

 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1138,7 +1146,7 @@ msgstr "Пользователи Google"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Управление транспортом"

 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1163,7 +1171,7 @@ msgstr "Княжество Андорра"
 #. module: base
 #: field:ir.rule,perm_read:0
 msgid "Apply for Read"
-msgstr ""
+msgstr "Применить для чтения"

 #. module: base
 #: model:res.country,name:base.mn
@@ -1193,7 +1201,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:724
 #, python-format
 msgid "Document model"
-msgstr ""
+msgstr "Модель документа"

 #. module: base
 #: view:res.lang:0
@@ -1243,7 +1251,7 @@ msgstr "Название страны должно быть уникальным
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "Последняя версия"

 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:213
@@ -1265,7 +1273,7 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: base
 #: view:res.partner:0
 msgid "Tel:"
-msgstr ""
+msgstr "Тел:"

 #. module: base
 #: model:res.country,name:base.ky
@@ -1275,7 +1283,7 @@ msgstr "Каймановы острова"
 #. module: base
 #: view:ir.rule:0
 msgid "Record Rule"
-msgstr ""
+msgstr "Ограничение доступа"

 #. module: base
 #: model:res.country,name:base.kr
@@ -1303,7 +1311,7 @@ msgstr "Участники"
 #. module: base
 #: field:ir.rule,perm_unlink:0
 msgid "Apply for Delete"
-msgstr ""
+msgstr "Применить для удаления"

 #. module: base
 #: selection:ir.property,type:0
@@ -1318,7 +1326,7 @@ msgstr "Видимый"
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
 msgid "Open Settings Menu"
-msgstr ""
+msgstr "Открыть меню настройки"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -1593,7 +1601,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mf
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Сен-Мартен (Франция)"

 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1610,7 +1618,7 @@ msgstr "Нет языка с кодом \"%s\""
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Социальная сеть"

 #. module: base
 #: view:res.lang:0
@@ -1620,7 +1628,7 @@ msgstr "%Y - год полностью"
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Настройка нижнего колонтитула отчета"

 #. module: base
 #: field:ir.translation,comments:0
@@ -1690,7 +1698,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,website:0
 msgid "Website of Partner or Company"
-msgstr ""
+msgstr "Сайт партнера или компании"

 #. module: base
 #: help:base.language.install,overwrite:0
@@ -1735,7 +1743,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_sale
 msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
+msgstr "Предложения, заказы продаж, счета"

 #. module: base
 #: field:res.users,login:0
@@ -1754,7 +1762,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_portal_project_issue
 msgid "Portal Issue"
-msgstr ""
+msgstr "Портал выпуска"

 #. module: base
 #: model:ir.ui.menu,name:base.menu_tools
@@ -1778,7 +1786,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Маленькое изображение"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock
@@ -1930,7 +1938,7 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,state:0
 msgid "Translation in Progress"
-msgstr ""
+msgstr "Перевод в процессе"

 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1945,7 +1953,7 @@ msgstr "Дней"
 #. module: base
 #: model:ir.module.module,summary:base.module_fleet
 msgid "Vehicle, leasing, insurances, costs"
-msgstr ""
+msgstr "Автомобиль, лизинг, страховка, затраты"

 #. module: base
 #: view:ir.model.access:0
@@ -2170,7 +2178,7 @@ msgstr "Полный путь"
 #. module: base
 #: view:base.language.export:0
 msgid "The next step depends on the file format:"
-msgstr ""
+msgstr "Следующий шаг зависит от формата файла:"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_idea
@@ -2192,6 +2200,7 @@ msgstr ""
 #: view:base.language.export:0
 msgid "PO(T) format: you should edit it with a PO editor such as"
 msgstr ""
+"Формат PO(T): вы должны редактировать его редактором PO файлов, таким как"

 #. module: base
 #: model:ir.ui.menu,name:base.menu_administration
@@ -2215,7 +2224,7 @@ msgstr "Создание / Запись / Копирование"
 #. module: base
 #: view:ir.sequence:0
 msgid "Second: %(sec)s"
-msgstr ""
+msgstr "Второй: %(sec)s"

 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -2244,7 +2253,7 @@ msgstr "Корейский (KP) / 한국어 (KP)"
 #. module: base
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
-msgstr ""
+msgstr "Аландские острова"

 #. module: base
 #: field:res.company,logo:0
@@ -2280,7 +2289,7 @@ msgstr "Багамские острова"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply for Create"
-msgstr ""
+msgstr "Применить для создания"

 #. module: base
 #: code:addons/base/res/res_partner.py:522
@@ -2307,6 +2316,8 @@ msgid ""
 "Appears by default on the top right corner of your printed documents (report "
 "header)."
 msgstr ""
+"По умолчанию отображается в верхнем правом углу печатных документов "
+"(заголовок отчета)."

 #. module: base
 #: field:base.module.update,update:0
@@ -2602,7 +2613,7 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Slogan"
-msgstr ""
+msgstr "Девиз компании"

 #. module: base
 #: model:res.country,name:base.bb
@@ -2648,7 +2659,7 @@ msgstr "Греческий / Ελληνικά"
 #. module: base
 #: field:res.company,custom_footer:0
 msgid "Custom Footer"
-msgstr ""
+msgstr "Пользовательский нижний колонтитул"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
@@ -2716,7 +2727,7 @@ msgstr "Название закладки"
 #. module: base
 #: field:res.partner,contact_address:0
 msgid "Complete Address"
-msgstr ""
+msgstr "Полный адрес"

 #. module: base
 #: help:ir.actions.act_window,limit:0
@@ -2788,7 +2799,7 @@ msgstr "ID записи"
 #. module: base
 #: view:ir.filters:0
 msgid "My Filters"
-msgstr ""
+msgstr "Мой фильтры"

 #. module: base
 #: field:ir.actions.server,email:0
@@ -2802,12 +2813,15 @@ msgid ""
 "Module to attach a google document to any model.\n"
 "================================================\n"
 msgstr ""
+"\n"
+"Модуль для приложения документа Google к любой модели.\n"
+"======================================================\n"

 #. module: base
 #: code:addons/base/ir/ir_fields.py:334
 #, python-format
 msgid "Found multiple matches for field '%%(field)s' (%d matches)"
-msgstr ""
+msgstr "Найдено несколько полей  '%%(field)s' (%d найдено)"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -2841,7 +2855,7 @@ msgstr "Аргументы, отправленные клиенту вместе
 #. module: base
 #: model:ir.module.module,summary:base.module_contacts
 msgid "Contacts, People and Companies"
-msgstr ""
+msgstr "Контакты, люди и компании"

 #. module: base
 #: model:res.country,name:base.tt
@@ -2907,7 +2921,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:715
 #, python-format
 msgid "Sorry, you are not allowed to access this document."
-msgstr ""
+msgstr "Извините, вы не можете получить доступ к этому документу."

 #. module: base
 #: model:res.country,name:base.py
@@ -2922,7 +2936,7 @@ msgstr "Фиджи"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "Отчет Xml"

 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -2993,7 +3007,7 @@ msgstr "Унаследованный"
 #: code:addons/base/ir/ir_fields.py:147
 #, python-format
 msgid "yes"
-msgstr ""
+msgstr "да"

 #. module: base
 #: field:ir.model.fields,serialization_field_id:0
@@ -3023,7 +3037,7 @@ msgstr ""
 #: code:addons/base/ir/ir_fields.py:175
 #, python-format
 msgid "'%s' does not seem to be an integer for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' не является целым числом для поля '%%(field)s'"

 #. module: base
 #: model:ir.module.category,description:base.module_category_report_designer
@@ -3084,7 +3098,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_linkedin
 msgid "LinkedIn Integration"
-msgstr ""
+msgstr "Интеграция с LinkedIn"

 #. module: base
 #: code:addons/orm.py:2012
@@ -3133,6 +3147,8 @@ msgid ""
 "the user will have an access to the sales configuration as well as statistic "
 "reports."
 msgstr ""
+"пользователь будет иметь доступ к настройке продаж, а также к статистическим "
+"отчетам ."

 #. module: base
 #: model:res.country,name:base.nz
@@ -3218,6 +3234,8 @@ msgid ""
 "the user will have an access to the human resources configuration as well as "
 "statistic reports."
 msgstr ""
+"пользователь будет иметь доступ к настройке управления персоналом, а также к "
+"статистическим отчетам ."

 #. module: base
 #: model:ir.module.module,description:base.module_web_shortcuts
@@ -3259,7 +3277,7 @@ msgstr "Неизвестный тип отчета: %s"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense
 msgid "Expenses Validation, Invoicing"
-msgstr ""
+msgstr "Утверждение расходов, выставление счетов"

 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll_account
@@ -3278,7 +3296,7 @@ msgstr "Армения"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_evaluation
 msgid "Periodical Evaluations, Appraisals, Surveys"
-msgstr ""
+msgstr "Периодические оценки, оценки, опросы"

 #. module: base
 #: model:ir.actions.act_window,name:base.ir_property_form
@@ -3327,7 +3345,7 @@ msgstr "Швеция"
 #. module: base
 #: field:ir.actions.report.xml,report_file:0
 msgid "Report File"
-msgstr ""
+msgstr "Файл отчета"

 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -3360,7 +3378,7 @@ msgstr ""
 #: code:addons/orm.py:3824
 #, python-format
 msgid "Missing document(s)"
-msgstr ""
+msgstr "Отсутствует документ(ы)"

 #. module: base
 #: model:ir.model,name:base.model_res_partner_bank_type
@@ -3375,6 +3393,8 @@ msgid ""
 "For more details about translating OpenERP in your language, please refer to "
 "the"
 msgstr ""
+"Для более подробной информаций о переводе OpenERP на ваш язык, пожалуйста, "
+"обратитесь к"

 #. module: base
 #: field:res.partner,image:0
@@ -3397,7 +3417,7 @@ msgstr "Календарь"
 #. module: base
 #: model:ir.module.category,name:base.module_category_knowledge_management
 msgid "Knowledge"
-msgstr ""
+msgstr "Знания"

 #. module: base
 #: field:workflow.activity,signal_send:0
@@ -3561,7 +3581,7 @@ msgstr "workflow.activity"
 #. module: base
 #: view:base.language.export:0
 msgid "Export Complete"
-msgstr ""
+msgstr "Экспорт завершен"

 #. module: base
 #: help:ir.ui.view_sc,res_id:0
@@ -3590,7 +3610,7 @@ msgstr "Финский / Suomi"
 #. module: base
 #: view:ir.config_parameter:0
 msgid "System Properties"
-msgstr ""
+msgstr "Свойства системы"

 #. module: base
 #: field:ir.sequence,prefix:0
@@ -3639,7 +3659,7 @@ msgstr ""
 #. module: base
 #: field:base.language.export,modules:0
 msgid "Modules To Export"
-msgstr ""
+msgstr "Модули для экспорта"

 #. module: base
 #: model:res.country,name:base.mt
@@ -3652,6 +3672,7 @@ msgstr "Мальта"
 msgid ""
 "Only users with the following access level are currently allowed to do that"
 msgstr ""
+"Только пользователям со следующим уровнем доступа, разрешено делать это"

 #. module: base
 #: field:ir.actions.server,fields_lines:0
@@ -3742,7 +3763,7 @@ msgstr "Антарктида"
 #. module: base
 #: view:res.partner:0
 msgid "Persons"
-msgstr ""
+msgstr "Люди"

 #. module: base
 #: view:base.language.import:0
@@ -3812,7 +3833,7 @@ msgstr "Ошибка! Вы не можете создавать рекурсив
 #: field:res.company,rml_footer:0
 #: field:res.company,rml_footer_readonly:0
 msgid "Report Footer"
-msgstr ""
+msgstr "Нижний колонтитул отчета"

 #. module: base
 #: selection:res.lang,direction:0
@@ -3822,7 +3843,7 @@ msgstr "Справа-налево"
 #. module: base
 #: model:res.country,name:base.sx
 msgid "Sint Maarten (Dutch part)"
-msgstr ""
+msgstr "Синт-Мартен (голландская часть)"

 #. module: base
 #: view:ir.actions.act_window:0
@@ -3909,7 +3930,7 @@ msgstr "Того"
 #: field:ir.actions.act_window,res_model:0
 #: field:ir.actions.client,res_model:0
 msgid "Destination Model"
-msgstr ""
+msgstr "Модель назначения"

 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -3932,7 +3953,7 @@ msgstr "Урду / اردو"
 #: code:addons/orm.py:3855
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Доступ запрещён"

 #. module: base
 #: field:res.company,name:0
@@ -3994,7 +4015,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.je
 msgid "Jersey"
-msgstr ""
+msgstr "Джерси"

 #. module: base
 #: model:ir.module.module,description:base.module_auth_anonymous
@@ -4004,6 +4025,10 @@ msgid ""
 "==================================\n"
 " "
 msgstr ""
+"\n"
+"Анонимный доступ к OpenERP.\n"
+"===========================\n"
+" "

 #. module: base
 #: view:res.lang:0
@@ -4065,7 +4090,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.sk
 msgid "Slovakia"
-msgstr ""
+msgstr "Словакия"

 #. module: base
 #: model:res.country,name:base.nr
@@ -4228,7 +4253,7 @@ msgstr "Совместный доступ к любым документам"
 #. module: base
 #: model:ir.module.module,summary:base.module_crm
 msgid "Leads, Opportunities, Phone Calls"
-msgstr ""
+msgstr "Кандидаты, предложения, телефонные звонки"

 #. module: base
 #: view:res.lang:0
@@ -4325,7 +4350,7 @@ msgstr "План счетов"
 #. module: base
 #: model:ir.ui.menu,name:base.menu_event_main
 msgid "Events Organization"
-msgstr ""
+msgstr "Организация мероприятий"

 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
@@ -4353,7 +4378,7 @@ msgstr "Базовое поле"
 #. module: base
 #: model:ir.module.category,name:base.module_category_managing_vehicles_and_contracts
 msgid "Managing vehicles and contracts"
-msgstr ""
+msgstr "Управление транспортом и контрактами"

 #. module: base
 #: model:ir.module.module,description:base.module_base_setup
@@ -4407,7 +4432,7 @@ msgstr "По умолчанию"
 #. module: base
 #: model:ir.module.module,summary:base.module_lunch
 msgid "Lunch Order, Meal, Food"
-msgstr ""
+msgstr "Заказ обеда, еда, питание"

 #. module: base
 #: view:ir.model.fields:0
@@ -4478,7 +4503,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,parent_id:0
 msgid "Related Company"
-msgstr ""
+msgstr "Связанная компания"

 #. module: base
 #: help:ir.actions.act_url,help:0
@@ -4524,7 +4549,7 @@ msgstr "Код должен быть уникальным"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_knowledge
 msgid "Knowledge Management System"
-msgstr ""
+msgstr "Система управления знаниями"

 #. module: base
 #: view:workflow.activity:0
@@ -4601,7 +4626,7 @@ msgstr "Тип нумерации"
 #. module: base
 #: view:base.language.export:0
 msgid "Unicode/UTF-8"
-msgstr ""
+msgstr "Юникод/UTF-8"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -4613,12 +4638,12 @@ msgstr "Хинди / हिंदी"
 #: model:ir.actions.act_window,name:base.action_view_base_language_install
 #: model:ir.ui.menu,name:base.menu_view_base_language_install
 msgid "Load a Translation"
-msgstr ""
+msgstr "Загрузить перевод"

 #. module: base
 #: field:ir.module.module,latest_version:0
 msgid "Installed Version"
-msgstr ""
+msgstr "Установленная версия"

 #. module: base
 #: field:ir.module.module,license:0
@@ -4707,7 +4732,7 @@ msgstr "Экваториальная Гвинея"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_api
 msgid "OpenERP Web API"
-msgstr ""
+msgstr "OpenERP Web API"

 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_rib
@@ -4761,7 +4786,7 @@ msgstr "ir.actions.report.xml"
 #. module: base
 #: model:res.country,name:base.ps
 msgid "Palestinian Territory, Occupied"
-msgstr ""
+msgstr "Палестинская территория, оккупированная"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch
@@ -4914,7 +4939,7 @@ msgstr "Рабочие процессы"
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_73
 msgid "Purchase"
-msgstr ""
+msgstr "Закупка"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -4924,7 +4949,7 @@ msgstr ""
 #. module: base
 #: model:ir.model,name:base.model_ir_needaction_mixin
 msgid "ir.needaction_mixin"
-msgstr ""
+msgstr "ir.needaction_mixin"

 #. module: base
 #: view:base.language.export:0
@@ -4934,7 +4959,7 @@ msgstr ""
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
 msgid "IT Services"
-msgstr ""
+msgstr "ИТ услуги"

 #. module: base
 #: model:ir.module.category,name:base.module_category_specific_industry_applications
@@ -4944,13 +4969,13 @@ msgstr "Приложения для определенной индустрии"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_docs
 msgid "Google Docs integration"
-msgstr ""
+msgstr "Интеграция Google Docs"

 #. module: base
 #: code:addons/base/ir/ir_fields.py:328
 #, python-format
 msgid "name"
-msgstr ""
+msgstr "имя"

 #. module: base
 #: model:ir.module.module,description:base.module_mrp_operations
@@ -4996,7 +5021,7 @@ msgstr "Пропустить"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_event_sale
 msgid "Events Sales"
-msgstr ""
+msgstr "Мероприятия продаж"

 #. module: base
 #: model:res.country,name:base.ls
@@ -5006,7 +5031,7 @@ msgstr "Лесото"
 #. module: base
 #: view:base.language.export:0
 msgid ", or your preferred text editor"
-msgstr ""
+msgstr ", или ваш любимый текстовый редактор"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_partner_assign
@@ -5073,12 +5098,12 @@ msgstr "Установить в NULL"
 #. module: base
 #: view:res.users:0
 msgid "Save"
-msgstr ""
+msgstr "Сохранить"

 #. module: base
 #: field:ir.actions.report.xml,report_xml:0
 msgid "XML Path"
-msgstr ""
+msgstr "Путь XML"

 #. module: base
 #: model:res.country,name:base.bj
@@ -5270,7 +5295,7 @@ msgstr "Курсы"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Шаблоны писем"

 #. module: base
 #: model:res.country,name:base.sy
@@ -5370,7 +5395,7 @@ msgstr ""
 #. module: base
 #: view:res.company:0
 msgid "Preview Header/Footer"
-msgstr ""
+msgstr "Просмотр верхнего/нижнего колонтитула"

 #. module: base
 #: field:ir.ui.menu,parent_id:0
@@ -5403,12 +5428,12 @@ msgstr "Десятичный разделитель"
 #: code:addons/orm.py:5224
 #, python-format
 msgid "Missing required value for the field '%s'."
-msgstr ""
+msgstr "Отсутствие требуемого значения для поля '%s'."

 #. module: base
 #: model:ir.model,name:base.model_res_partner_address
 msgid "res.partner.address"
-msgstr ""
+msgstr "res.partner.address"

 #. module: base
 #: model:ir.actions.act_window,help:base.action_res_groups
@@ -5443,12 +5468,12 @@ msgstr "Журнал"
 #. module: base
 #: model:res.country,name:base.im
 msgid "Isle of Man"
-msgstr ""
+msgstr "Остров Мэн"

 #. module: base
 #: help:ir.actions.client,res_model:0
 msgid "Optional model, mostly used for needactions."
-msgstr ""
+msgstr "Дополнительная модель, в основном используется для needactions."

 #. module: base
 #: field:ir.attachment,create_uid:0
@@ -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-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-08-20 15:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 08:41+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"

 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -24,6 +24,10 @@ msgid ""
 "================================================\n"
 "    "
 msgstr ""
+"\n"
+"Çek yazımı ve basımı için modül.\n"
+"================================================\n"
+"    "

 #. module: base
 #: model:res.country,name:base.sh
@@ -59,7 +63,7 @@ msgstr "Görünüm Yapısı"
 #. module: base
 #: model:ir.module.module,summary:base.module_sale_stock
 msgid "Quotation, Sale Orders, Delivery & Invoicing Control"
-msgstr ""
+msgstr "Teklif, Satış Siparişi, Teslimat & Faturalama Kontrolü"

 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -88,12 +92,12 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_point_of_sale
 msgid "Touchscreen Interface for Shops"
-msgstr ""
+msgstr "Satış noktaları için dokunmatik ekran arayüzü"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll
 msgid "Indian Payroll"
-msgstr ""
+msgstr "Hindistan Bordro"

 #. module: base
 #: help:ir.cron,model:0
@@ -134,11 +138,14 @@ msgid ""
 "The module adds google user in res user.\n"
 "========================================\n"
 msgstr ""
+"\n"
+"Bu modül res user a google kullanıcıları ekler.\n"
+"========================================\n"

 #. module: base
 #: help:res.partner,employee:0
 msgid "Check this box if this contact is an Employee."
-msgstr ""
+msgstr "Bu kontak bir çalışan ise bu kutuyu işaretleyin"

 #. module: base
 #: help:ir.model.fields,domain:0
@@ -166,7 +173,7 @@ msgstr "Hedef Pencere"
 #. module: base
 #: field:ir.actions.report.xml,report_rml:0
 msgid "Main Report File Path"
-msgstr ""
+msgstr "Ana rapor dosya yolu"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
@@ -263,7 +270,7 @@ msgstr "Oluşturuldu."
 #. module: base
 #: field:ir.actions.report.xml,report_xsl:0
 msgid "XSL Path"
-msgstr ""
+msgstr "XSL Yolu"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_tr
@@ -289,7 +296,7 @@ msgstr "Eskimo / ᐃᓄᒃᑎᑐᑦ"
 #. module: base
 #: model:res.groups,name:base.group_multi_currency
 msgid "Multi Currencies"
-msgstr ""
+msgstr "Çoklu Para birimleri"

 #. module: base
 #: model:ir.module.module,description:base.module_l10n_cl
@@ -513,7 +520,7 @@ msgstr ""
 #. module: base
 #: field:ir.model.relation,name:0
 msgid "Relation Name"
-msgstr ""
+msgstr "İlişki Adı"

 #. module: base
 #: model:res.country,name:base.tv
@@ -553,7 +560,7 @@ msgstr ""
 #. module: base
 #: view:workflow.transition:0
 msgid "Workflow Transition"
-msgstr ""
+msgstr "İşakışı Geçişi"

 #. module: base
 #: model:res.country,name:base.gf
@@ -563,7 +570,7 @@ msgstr "Fransız Guyanası"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr
 msgid "Jobs, Departments, Employees Details"
-msgstr ""
+msgstr "İşler, Bölümler, Çalışan Bilgileri"

 #. module: base
 #: model:ir.module.module,description:base.module_analytic
@@ -705,7 +712,7 @@ msgstr "Çevrilmemiş"
 #. module: base
 #: view:ir.mail_server:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Giden Posta Sunucusu"

 #. module: base
 #: help:ir.actions.act_window,context:0
@@ -808,6 +815,11 @@ msgid ""
 "This module provides the Integration of the LinkedIn with OpenERP.\n"
 "        "
 msgstr ""
+"\n"
+"OpenERP Web LinkedIn modülü.\n"
+"============================\n"
+"Bu modül OpenERP ye LinkedIn bağlantısını katar.\n"
+"        "

 #. module: base
 #: help:ir.actions.act_window,src_model:0
@@ -853,7 +865,7 @@ msgstr "Romanya - Muhasebe"
 #. module: base
 #: model:ir.model,name:base.model_res_config_settings
 msgid "res.config.settings"
-msgstr ""
+msgstr "res.config.settings"

 #. module: base
 #: help:res.partner,image_small:0
@@ -862,6 +874,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Bu carinin küçük boylu resmi. Bu resim otomatik olarak 64x64 pixele en boy "
+"oranını koruyarak küçültülür. Bu alanı küçük resim gerektiğinde "
+"kullanabilirsiniz."

 #. module: base
 #: help:ir.actions.server,mobile:0
@@ -882,7 +897,7 @@ msgstr "Güvenlik ve Kimlik Doğrulama"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_calendar
 msgid "Web Calendar"
-msgstr ""
+msgstr "Web Takvimi"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -893,7 +908,7 @@ msgstr "İsveçce / Svenska"
 #: field:base.language.export,name:0
 #: field:ir.attachment,datas_fname:0
 msgid "File Name"
-msgstr ""
+msgstr "Dosya Adı"

 #. module: base
 #: model:res.country,name:base.rs
@@ -1085,7 +1100,7 @@ msgstr "Diğer OSI onaylı lisans"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
 msgid "Web Gantt"
-msgstr ""
+msgstr "Web Gantt"

 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -1112,7 +1127,7 @@ msgstr "Google Kullanıcıları"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_fleet
 msgid "Fleet Management"
-msgstr ""
+msgstr "Filo Yönetimi"

 #. module: base
 #: help:ir.server.object.lines,value:0
@@ -1132,7 +1147,7 @@ msgstr "Andorra"
 #. module: base
 #: field:ir.rule,perm_read:0
 msgid "Apply for Read"
-msgstr ""
+msgstr "Okunma için Başvur"

 #. module: base
 #: model:res.country,name:base.mn
@@ -1161,7 +1176,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:724
 #, python-format
 msgid "Document model"
-msgstr ""
+msgstr "Döküman Modeli"

 #. module: base
 #: view:res.lang:0
@@ -1211,7 +1226,7 @@ msgstr "Ülke adı tekil olmalı !"
 #. module: base
 #: field:ir.module.module,installed_version:0
 msgid "Latest Version"
-msgstr ""
+msgstr "En son Sürüm"

 #. module: base
 #: code:addons/base/ir/ir_mail_server.py:213
@@ -1233,7 +1248,7 @@ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 #. module: base
 #: view:res.partner:0
 msgid "Tel:"
-msgstr ""
+msgstr "Tel:"

 #. module: base
 #: model:res.country,name:base.ky
@@ -1243,7 +1258,7 @@ msgstr "Cayman Adaları"
 #. module: base
 #: view:ir.rule:0
 msgid "Record Rule"
-msgstr ""
+msgstr "Kayıt Kuralı"

 #. module: base
 #: model:res.country,name:base.kr
@@ -1271,7 +1286,7 @@ msgstr "Destekleyenler"
 #. module: base
 #: field:ir.rule,perm_unlink:0
 msgid "Apply for Delete"
-msgstr ""
+msgstr "Silinme için başvur"

 #. module: base
 #: selection:ir.property,type:0
@@ -1286,7 +1301,7 @@ msgstr "Görünür"
 #. module: base
 #: model:ir.actions.client,name:base.action_client_base_menu
 msgid "Open Settings Menu"
-msgstr ""
+msgstr "Ayarlar Menüsünü Aç"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -1409,7 +1424,7 @@ msgstr "Haiti"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_hr_payroll
 msgid "French Payroll"
-msgstr ""
+msgstr "Fransa Bodro"

 #. module: base
 #: view:ir.ui.view:0
@@ -1557,7 +1572,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.mf
 msgid "Saint Martin (French part)"
-msgstr ""
+msgstr "Sen Martin (Fransız bölümü)"

 #. module: base
 #: model:ir.model,name:base.model_ir_exports
@@ -1574,7 +1589,7 @@ msgstr "\"%s\" kodu ile tanımlı dil yok"
 #: model:ir.module.category,name:base.module_category_social_network
 #: model:ir.module.module,shortdesc:base.module_mail
 msgid "Social Network"
-msgstr ""
+msgstr "Sosyal Ağ"

 #. module: base
 #: view:res.lang:0
@@ -1584,12 +1599,12 @@ msgstr "%Y - Yüzyıl ile birlikte yıl"
 #. module: base
 #: view:res.company:0
 msgid "Report Footer Configuration"
-msgstr ""
+msgstr "Rapor tabanı Ayarları"

 #. module: base
 #: field:ir.translation,comments:0
 msgid "Translation comments"
-msgstr ""
+msgstr "Çeviri yorumları"

 #. module: base
 #: model:ir.module.module,description:base.module_lunch
@@ -1699,7 +1714,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_sale
 msgid "Quotations, Sale Orders, Invoicing"
-msgstr ""
+msgstr "Teklifler, Satış Siparişleri, Faturalama"

 #. module: base
 #: field:res.users,login:0
@@ -1742,7 +1757,7 @@ msgstr ""
 #. module: base
 #: field:res.partner,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Küçük-boylu resim"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock
@@ -1894,7 +1909,7 @@ msgstr ""
 #. module: base
 #: selection:ir.translation,state:0
 msgid "Translation in Progress"
-msgstr ""
+msgstr "Çeviri yapılıyor"

 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1909,7 +1924,7 @@ msgstr "Günler"
 #. module: base
 #: model:ir.module.module,summary:base.module_fleet
 msgid "Vehicle, leasing, insurances, costs"
-msgstr ""
+msgstr "Araç, leasing, sigortalar, maliyetler"

 #. module: base
 #: view:ir.model.access:0
@@ -2208,7 +2223,7 @@ msgstr "Korece (KP) / 한국어 (KP)"
 #. module: base
 #: model:res.country,name:base.ax
 msgid "Åland Islands"
-msgstr ""
+msgstr "Åland Adaları"

 #. module: base
 #: field:res.company,logo:0
@@ -2244,7 +2259,7 @@ msgstr "Bahamalar"
 #. module: base
 #: field:ir.rule,perm_create:0
 msgid "Apply for Create"
-msgstr ""
+msgstr "Oluşturulma için başvur"

 #. module: base
 #: code:addons/base/res/res_partner.py:522
@@ -2554,7 +2569,7 @@ msgstr ""
 #. module: base
 #: field:res.company,rml_header1:0
 msgid "Company Slogan"
-msgstr ""
+msgstr "Şirket Sloganı"

 #. module: base
 #: model:res.country,name:base.bb
@@ -2598,7 +2613,7 @@ msgstr "Yunanca / Ελληνικά"
 #. module: base
 #: field:res.company,custom_footer:0
 msgid "Custom Footer"
-msgstr ""
+msgstr "Özel Sayfa Altlığı"

 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_crm
@@ -2659,7 +2674,7 @@ msgstr "Kısayol Adı"
 #. module: base
 #: field:res.partner,contact_address:0
 msgid "Complete Address"
-msgstr ""
+msgstr "Tam Adres"

 #. module: base
 #: help:ir.actions.act_window,limit:0
@@ -2865,7 +2880,7 @@ msgstr "Fiji"
 #. module: base
 #: view:ir.actions.report.xml:0
 msgid "Report Xml"
-msgstr ""
+msgstr "Xml raporla"

 #. module: base
 #: model:ir.module.module,description:base.module_purchase
@@ -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-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-25 09:34+0000\n"
+"PO-Revision-Date: 2012-11-26 06:49+0000\n"
 "Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:40+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:22+0000\n"
+"X-Generator: Launchpad (build 16309)\n"

 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
@@ -14970,7 +14970,7 @@ msgstr "系统更新"
 #: field:ir.actions.report.xml,report_sxw_content:0
 #: field:ir.actions.report.xml,report_sxw_content_data:0
 msgid "SXW Content"
-msgstr ""
+msgstr "SXW内容"

 #. module: base
 #: help:ir.sequence,prefix:0
@@ -14985,7 +14985,7 @@ msgstr "塞舌尔"
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Gold"
-msgstr ""
+msgstr "黄金"

 #. module: base
 #: code:addons/base/res/res_company.py:159
@@ -15012,7 +15012,7 @@ msgstr "一般信息"
 #. module: base
 #: field:ir.model.data,complete_name:0
 msgid "Complete ID"
-msgstr ""
+msgstr "完整ID"

 #. module: base
 #: model:res.country,name:base.tc
@@ -15063,7 +15063,7 @@ msgstr "切换公司警告"
 msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
-msgstr ""
+msgstr "帮助您管理您的生产和其生成的报表。"

 #. module: base
 #: help:ir.sequence,number_increment:0
@@ -15125,12 +15125,12 @@ msgstr "公司"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_purchase_requisition
 msgid "Purchase Requisitions"
-msgstr ""
+msgstr "采购申请"

 #. module: base
 #: selection:ir.actions.act_window,target:0
 msgid "Inline Edit"
-msgstr ""
+msgstr "行内编辑"

 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -15151,7 +15151,7 @@ msgstr "业务伙伴： "
 #. module: base
 #: view:res.partner:0
 msgid "Is a Company?"
-msgstr ""
+msgstr "是一个公司？"

 #. module: base
 #: code:addons/base/res/res_company.py:159
@@ -15173,7 +15173,7 @@ msgstr "创建对象"
 #. module: base
 #: model:res.country,name:base.ss
 msgid "South Sudan"
-msgstr ""
+msgstr "苏丹南部"

 #. module: base
 #: field:ir.filters,context:0
@@ -15206,7 +15206,7 @@ msgstr "潜在客户"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_invoice_directly
 msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "根据装箱单开发票"

 #. module: base
 #: selection:base.language.install,lang:0
@@ -66,9 +66,11 @@
                    <field name="name" string="Record Rule"/>
                    <filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
                    <separator/>
-                    <filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
-                    <filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
-                    <filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
+                    <filter string="Full Access Right" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
+                    <filter string="Read Access Right" domain="[('perm_read','=',True)]"/>
+                    <filter string="Write Access Right" domain="[('perm_write','=',True)]"/>
+                    <filter string="Create Access Right" domain="[('perm_create','=',True)]"/>
+                    <filter string="Delete Access Right" domain="[('perm_unlink','=',True)]"/>
                    <field name="model_id"/>
                    <field name="groups"/>
                </search>
@@ -22,6 +22,9 @@
 import logging
 import time

+from osv import osv, fields
+from tools.translate import _
+
 import openerp

 _logger = logging.getLogger(__name__)
@@ -98,6 +101,8 @@ class ir_sequence(openerp.osv.osv.osv):

        There is no access rights check.
        """
+        if number_increment == 0:
+             raise osv.except_osv(_('Warning!'),_("Increment number must not be zero."))
        assert isinstance(id, (int, long))
        sql = "CREATE SEQUENCE ir_sequence_%03d INCREMENT BY %%s START WITH %%s" % id
        cr.execute(sql, (number_increment, number_next))
@@ -122,6 +127,8 @@ class ir_sequence(openerp.osv.osv.osv):

        There is no access rights check.
        """
+        if number_increment == 0:
+             raise osv.except_osv(_('Warning!'),_("Increment number must not be zero."))
        assert isinstance(id, (int, long))
        cr.execute("""
            ALTER SEQUENCE ir_sequence_%03d INCREMENT BY %%s RESTART WITH %%s
@@ -54,12 +54,12 @@
        <record id="view_translation_tree" model="ir.ui.view">
            <field name="model">ir.translation</field>
            <field name="arch" type="xml">
-                <tree string="Translations" editable="bottom">
-                    <field name="src" readonly="True"/>
+                <tree string="Translations" editable="top">
+                    <field name="src"/>
                    <field name="value"/>
-                    <field name="name" readonly="True"/>
-                    <field name="lang" readonly="True"/>
-                    <field name="type" readonly="True"/>
+                    <field name="name"/>
+                    <field name="lang"/>
+                    <field name="type"/>
                </tree>
            </field>
        </record>
@@ -20,7 +20,10 @@
 ##############################################################################

 import base64
+from docutils import io, nodes
 from docutils.core import publish_string
+from docutils.transforms import Transform, writer_aux
+from docutils.writers.html4css1 import Writer
 import imp
 import logging
 import re
@@ -28,6 +31,7 @@ import urllib
 import zipimport

 from openerp import modules, pooler, release, tools, addons
+from openerp.modules.db import create_categories
 from openerp.tools.parse_version import parse_version
 from openerp.tools.translate import _
 from openerp.osv import fields, osv, orm
@@ -80,6 +84,32 @@ class module_category(osv.osv):
        'visible' : 1,
    }

+class MyFilterMessages(Transform):
+    """
+    Custom docutils transform to remove `system message` for a document and
+    generate warnings.
+
+    (The standard filter removes them based on some `report_level` passed in
+    the `settings_override` dictionary, but if we use it, we can't see them
+    and generate warnings.)
+    """
+
+    default_priority = 870
+
+    def apply(self):
+        for node in self.document.traverse(nodes.system_message):
+            _logger.warning("docutils' system message present: %s", str(node))
+            node.parent.remove(node)
+
+class MyWriter(Writer):
+    """
+    Custom docutils html4ccs1 writer that doesn't add the warnings to the
+    output document.
+    """
+
+    def get_transforms(self):
+        return [MyFilterMessages, writer_aux.Admonitions]
+
 class module(osv.osv):
    _name = "ir.module.module"
    _rec_name = "shortdesc"
@@ -100,7 +130,7 @@ class module(osv.osv):
        res = dict.fromkeys(ids, '')
        for module in self.browse(cr, uid, ids, context=context):
            overrides = dict(embed_stylesheet=False, doctitle_xform=False, output_encoding='unicode')
-            output = publish_string(source=module.description, writer_name='html', settings_overrides=overrides)
+            output = publish_string(source=module.description, settings_overrides=overrides, writer=MyWriter())
            res[module.id] = output
        return res

@@ -609,21 +639,8 @@ class module(osv.osv):

        categs = category.split('/')
        if categs != current_category_path:
-            p_id = None
-            while categs:
-                if p_id is not None:
-                    cr.execute('SELECT id FROM ir_module_category WHERE name=%s AND parent_id=%s', (categs[0], p_id))
-                else:
-                    cr.execute('SELECT id FROM ir_module_category WHERE name=%s AND parent_id is NULL', (categs[0],))
-                c_id = cr.fetchone()
-                if not c_id:
-                    cr.execute('INSERT INTO ir_module_category (name, parent_id) VALUES (%s, %s) RETURNING id', (categs[0], p_id))
-                    c_id = cr.fetchone()[0]
-                else:
-                    c_id = c_id[0]
-                p_id = c_id
-                categs = categs[1:]
-            self.write(cr, uid, [mod_browse.id], {'category_id': p_id})
+            cat_id = create_categories(cr, categs)
+            mod_browse.write({'category_id': cat_id})

    def update_translations(self, cr, uid, ids, filter_lang=None, context=None):
        if not filter_lang:
@@ -2,7 +2,7 @@
 <openerp>
    <data>
        <record model="ir.module.category" id="module_category_hidden">
-            <field name="name">Hidden</field>
+            <field name="name">Technical Settings</field>
            <field name="sequence">0</field>
            <field name="visible" eval="0" />
        </record>
@@ -20,8 +20,8 @@
            <field name="arch" type="xml">
                <form string="Company" version="7.0">
                  <sheet>
-                    <div class="oe_right oe_avatar">
-                        <field name="logo" nolabel="1" widget="image"/>
+                    <div>
+                        <field name="logo" nolabel="1" widget="image"  class="oe_avatar oe_left"/>
                    </div>
                    <div class="oe_right oe_button_box" name="button_box">
                                <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print" class="oe_inline oe_right"/>
@@ -19,6 +19,7 @@
 #
 ##############################################################################

+import datetime
 import math
 import openerp
 from osv import osv, fields
@@ -178,6 +179,12 @@ class res_partner(osv.osv, format_address):
            result[obj.id] = tools.image_get_resized_images(obj.image)
        return result

+    def _get_tz_offset(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = datetime.datetime.now(pytz.timezone(obj.tz or 'GMT')).strftime('%z')
+        return result
+
    def _set_image(self, cr, uid, id, name, value, args, context=None):
        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)

@@ -195,6 +202,7 @@ class res_partner(osv.osv, format_address):
            help="The partner's timezone, used to output proper date and time values inside printed reports. "
                 "It is important to set a value for this field. You should use the same timezone "
                 "that is otherwise used to pick and render date and time values: your computer's timezone."),
+        'tz_offset': fields.function(_get_tz_offset, type='char', size=5, string='Timezone offset', store=True),
        'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this contact if any.'),
        'vat': fields.char('TIN', size=32, help="Tax Identification Number. Check the box if this contact is subjected to taxes. Used by the some of the legal statements."),
        'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
@@ -508,23 +516,6 @@ class res_partner(osv.osv, format_address):
            result[adr] = address_dict.get(adr, default_address)
        return result

-    def gen_next_ref(self, cr, uid, ids):
-        if len(ids) != 1:
-            return True
-
-        # compute the next number ref
-        cr.execute("select ref from res_partner where ref is not null order by char_length(ref) desc, ref desc limit 1")
-        res = cr.dictfetchall()
-        ref = res and res[0]['ref'] or '0'
-        try:
-            nextref = int(ref)+1
-        except:
-            raise osv.except_osv(_('Warning'), _("Couldn't generate the next id because some partners have an alphabetic id !"))
-
-        # update the current partner
-        cr.execute("update res_partner set ref=%s where id=%s", (nextref, ids[0]))
-        return True
-
    def view_header_get(self, cr, uid, view_id, view_type, context):
        res = super(res_partner, self).view_header_get(cr, uid, view_id, view_type, context)
        if res: return res
@@ -295,7 +295,7 @@
                   <filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
                   <separator/>
                   <filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
-                   <field name="category_id" string="Category" filter_domain="[('category_id','ilike', self)]"/>
+                   <field name="category_id" string="Tag" filter_domain="[('category_id','ilike', self)]"/>
                   <field name="user_id"/>
                   <field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
                   <group expand="0" string="Group By...">
@@ -527,7 +527,7 @@
            <field name="help">Manage the partner categories in order to better classify them for tracking and analysis purposes. A partner may belong to several categories and categories have a hierarchy structure: a partner belonging to a category also belong to his parent category.</field>
        </record>

-        <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Partner Categories" sequence="4" parent="menu_config_address_book" groups="base.group_no_one"/>
+        <menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Partner Tags" sequence="4" parent="menu_config_address_book" groups="base.group_no_one"/>

    </data>
 </openerp>
@@ -343,7 +343,7 @@ class res_users(osv.osv):
        for k in self._all_columns.keys():
            if k.startswith('context_'):
                context_key = k[8:]
-            elif k in ['lang', 'tz']:
+            elif k in ['lang', 'tz', 'tz_offset']:
                context_key = k
            else:
                context_key = False
@@ -0,0 +1,44 @@
+import logging
+import sys
+
+import openerp
+
+_logger = logging.getLogger(__name__)
+
+commands = {}
+
+class CommandType(type):
+    def __init__(cls, name, bases, attrs):
+        super(CommandType, cls).__init__(name, bases, attrs)
+        name = getattr(cls, name, cls.__name__.lower())
+        cls.name = name
+        if name != 'command':
+            commands[name] = cls
+
+class Command(object):
+    """Subclass this class to define new openerp subcommands """
+    __metaclass__ = CommandType
+
+    def run(self, args):
+        pass
+
+class Help(Command):
+    def run(self, args):
+        print "Available commands:\n"
+        for k, v in commands.items():
+            print "    %s" % k
+
+import server
+
+def main():
+    args = sys.argv[1:]
+    command = "server"
+    if len(args) and not args[0].startswith("-"):
+        command = args[0]
+        args = args[1:]
+
+    if command in commands:
+        o = commands[command]()
+        o.run(args)
+
+# vim:et:ts=4:sw=4:
@@ -0,0 +1,281 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+"""
+OpenERP - Server
+OpenERP is an ERP+CRM program for small and medium businesses.
+
+The whole source code is distributed under the terms of the
+GNU Public Licence.
+
+(c) 2003-TODAY, Fabien Pinckaers - OpenERP SA
+"""
+
+import logging
+import os
+import signal
+import sys
+import threading
+import traceback
+import time
+
+import openerp
+
+from . import Command
+
+__author__ = openerp.release.author
+__version__ = openerp.release.version
+
+# Also use the `openerp` logger for the main script.
+_logger = logging.getLogger('openerp')
+
+def check_root_user():
+    """ Exit if the process's user is 'root' (on POSIX system)."""
+    if os.name == 'posix':
+        import pwd
+        if pwd.getpwuid(os.getuid())[0] == 'root' :
+            sys.stderr.write("Running as user 'root' is a security risk, aborting.\n")
+            sys.exit(1)
+
+def check_postgres_user():
+    """ Exit if the configured database user is 'postgres'.
+
+    This function assumes the configuration has been initialized.
+    """
+    config = openerp.tools.config
+    if config['db_user'] == 'postgres':
+        sys.stderr.write("Using the database user 'postgres' is a security risk, aborting.")
+        sys.exit(1)
+
+def report_configuration():
+    """ Log the server version and some configuration values.
+
+    This function assumes the configuration has been initialized.
+    """
+    config = openerp.tools.config
+    _logger.info("OpenERP version %s", __version__)
+    for name, value in [('addons paths', config['addons_path']),
+                        ('database hostname', config['db_host'] or 'localhost'),
+                        ('database port', config['db_port'] or '5432'),
+                        ('database user', config['db_user'])]:
+        _logger.info("%s: %s", name, value)
+
+def setup_pid_file():
+    """ Create a file with the process id written in it.
+
+    This function assumes the configuration has been initialized.
+    """
+    config = openerp.tools.config
+    if config['pidfile']:
+        fd = open(config['pidfile'], 'w')
+        pidtext = "%d" % (os.getpid())
+        fd.write(pidtext)
+        fd.close()
+
+def preload_registry(dbname):
+    """ Preload a registry, and start the cron."""
+    try:
+        config = openerp.tools.config
+        update_module = True if config['init'] or config['update'] else False
+        db, registry = openerp.pooler.get_db_and_pool(
+            dbname, update_module=update_module, pooljobs=False,
+            force_demo=not config['without_demo'])
+
+        # jobs will start to be processed later, when openerp.cron.start_master_thread() is called by openerp.service.start_services()
+        registry.schedule_cron_jobs()
+    except Exception:
+        _logger.exception('Failed to initialize database `%s`.', dbname)
+
+def run_test_file(dbname, test_file):
+    """ Preload a registry, possibly run a test file, and start the cron."""
+    try:
+        config = openerp.tools.config
+        update_module = True if config['init'] or config['update'] else False
+        db, registry = openerp.pooler.get_db_and_pool(
+            dbname, update_module=update_module, pooljobs=False, force_demo=not config['without_demo'])
+        cr = db.cursor()
+        _logger.info('loading test file %s', test_file)
+        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
+        cr.rollback()
+        cr.close()
+    except Exception:
+        _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file)
+
+def export_translation():
+    config = openerp.tools.config
+    dbname = config['db_name']
+
+    if config["language"]:
+        msg = "language %s" % (config["language"],)
+    else:
+        msg = "new language"
+    _logger.info('writing translation file for %s to %s', msg,
+        config["translate_out"])
+
+    fileformat = os.path.splitext(config["translate_out"])[-1][1:].lower()
+    buf = file(config["translate_out"], "w")
+    cr = openerp.pooler.get_db(dbname).cursor()
+    openerp.tools.trans_export(config["language"],
+        config["translate_modules"] or ["all"], buf, fileformat, cr)
+    cr.close()
+    buf.close()
+
+    _logger.info('translation file written successfully')
+
+def import_translation():
+    config = openerp.tools.config
+    context = {'overwrite': config["overwrite_existing_translations"]}
+    dbname = config['db_name']
+
+    cr = openerp.pooler.get_db(dbname).cursor()
+    openerp.tools.trans_load( cr, config["translate_in"], config["language"],
+        context=context)
+    cr.commit()
+    cr.close()
+
+# Variable keeping track of the number of calls to the signal handler defined
+# below. This variable is monitored by ``quit_on_signals()``.
+quit_signals_received = 0
+
+def signal_handler(sig, frame):
+    """ Signal handler: exit ungracefully on the second handled signal.
+
+    :param sig: the signal number
+    :param frame: the interrupted stack frame or None
+    """
+    global quit_signals_received
+    quit_signals_received += 1
+    if quit_signals_received > 1:
+        # logging.shutdown was already called at this point.
+        sys.stderr.write("Forced shutdown.\n")
+        os._exit(0)
+
+def dumpstacks(sig, frame):
+    """ Signal handler: dump a stack trace for each existing thread."""
+    # code from http://stackoverflow.com/questions/132058/getting-stack-trace-from-a-running-python-application#answer-2569696
+    # modified for python 2.5 compatibility
+    threads_info = dict([(th.ident, {'name': th.name,
+                                    'uid': getattr(th,'uid','n/a')})
+                                for th in threading.enumerate()])
+    code = []
+    for threadId, stack in sys._current_frames().items():
+        thread_info = threads_info.get(threadId)
+        code.append("\n# Thread: %s (id:%s) (uid:%s)" % \
+                    (thread_info and thread_info['name'] or 'n/a',
+                     threadId,
+                     thread_info and thread_info['uid'] or 'n/a'))
+        for filename, lineno, name, line in traceback.extract_stack(stack):
+            code.append('File: "%s", line %d, in %s' % (filename, lineno, name))
+            if line:
+                code.append("  %s" % (line.strip()))
+    _logger.info("\n".join(code))
+
+def setup_signal_handlers():
+    """ Register the signal handler defined above. """
+    SIGNALS = map(lambda x: getattr(signal, "SIG%s" % x), "INT TERM".split())
+    if os.name == 'posix':
+        map(lambda sig: signal.signal(sig, signal_handler), SIGNALS)
+        signal.signal(signal.SIGQUIT, dumpstacks)
+    elif os.name == 'nt':
+        import win32api
+        win32api.SetConsoleCtrlHandler(lambda sig: signal_handler(sig, None), 1)
+
+def quit_on_signals():
+    """ Wait for one or two signals then shutdown the server.
+
+    The first SIGINT or SIGTERM signal will initiate a graceful shutdown while
+    a second one if any will force an immediate exit.
+
+    """
+    # Wait for a first signal to be handled. (time.sleep will be interrupted
+    # by the signal handler.) The try/except is for the win32 case.
+    try:
+        while quit_signals_received == 0:
+            time.sleep(60)
+    except KeyboardInterrupt:
+        pass
+
+    config = openerp.tools.config
+    if config['pidfile']:
+        os.unlink(config['pidfile'])
+
+    openerp.service.stop_services()
+    sys.exit(0)
+
+def configure_babel_localedata_path():
+    # Workaround: py2exe and babel.
+    if hasattr(sys, 'frozen'):
+        import babel
+        babel.localedata._dirname = os.path.join(os.path.dirname(sys.executable), 'localedata')
+
+def main(args):
+    os.environ["TZ"] = "UTC"
+
+    check_root_user()
+    openerp.tools.config.parse_config(args)
+
+    check_postgres_user()
+    openerp.netsvc.init_logger()
+    report_configuration()
+
+    config = openerp.tools.config
+
+    configure_babel_localedata_path()
+
+    setup_signal_handlers()
+
+    if config["test_file"]:
+        run_test_file(config['db_name'], config['test_file'])
+        sys.exit(0)
+
+    if config["translate_out"]:
+        export_translation()
+        sys.exit(0)
+
+    if config["translate_in"]:
+        import_translation()
+        sys.exit(0)
+
+    if not config["stop_after_init"]:
+        setup_pid_file()
+        # Some module register themselves when they are loaded so we need the
+        # services to be running before loading any registry.
+        if config['workers']:
+            openerp.service.start_services_workers()
+        else:
+            openerp.service.start_services()
+
+    if config['db_name']:
+        for dbname in config['db_name'].split(','):
+            preload_registry(dbname)
+
+    if config["stop_after_init"]:
+        sys.exit(0)
+
+    _logger.info('OpenERP server is running, waiting for connections...')
+    quit_on_signals()
+
+class Server(Command):
+    def run(self, args):
+        main(args)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -119,21 +119,17 @@ def create_categories(cr, categories):
    category = []
    while categories:
        category.append(categories[0])
-        if p_id is not None:
-            cr.execute('SELECT id \
-                       FROM ir_module_category \
-                       WHERE name=%s AND parent_id=%s', (categories[0], p_id))
-        else:
-            cr.execute('SELECT id \
-                       FROM ir_module_category \
-                       WHERE name=%s AND parent_id IS NULL', (categories[0],))
+        xml_id = 'module_category_' + ('_'.join(map(lambda x: x.lower(), category))).replace('&', 'and').replace(' ', '_')
+        # search via xml_id (because some categories are renamed)
+        cr.execute("SELECT res_id FROM ir_model_data WHERE name=%s AND module=%s AND model=%s",
+                   (xml_id, "base", "ir.module.category"))
+
        c_id = cr.fetchone()
        if not c_id:
            cr.execute('INSERT INTO ir_module_category \
                    (name, parent_id) \
                    VALUES (%s, %s) RETURNING id', (categories[0], p_id))
            c_id = cr.fetchone()[0]
-            xml_id = 'module_category_' + ('_'.join(map(lambda x: x.lower(), category))).replace('&', 'and').replace(' ', '_')
            cr.execute('INSERT INTO ir_model_data (module, name, res_id, model) \
                       VALUES (%s, %s, %s, %s)', ('base', xml_id, c_id, 'ir.module.category'))
        else:
@@ -87,15 +87,19 @@ class Graph(dict):
            for k, v in additional_data[package.name].items():
                setattr(package, k, v)

-    def add_module(self, cr, module, force=None):
-        self.add_modules(cr, [module], force)
+    def add_module(self, cr, module, force_demo=False):
+        self.add_modules(cr, [module], force_demo)

-    def add_modules(self, cr, module_list, force=None):
-        if force is None:
-            force = []
+    def add_modules(self, cr, module_list, force_demo=False):
        packages = []
        len_graph = len(self)
        for module in module_list:
+            if force_demo:
+                cr.execute("""
+                    UPDATE ir_module_module
+                    SET demo='t'
+                    WHERE name = %s""",
+                    (module,))
            # This will raise an exception if no/unreadable descriptor file.
            # NOTE The call to load_information_from_description_file is already
            # done by db.initialize, so it is possible to not do it again here.
@@ -121,9 +125,6 @@ class Graph(dict):
                current.remove(package)
                node = self.add_node(package, info)
                node.data = info
-                for kind in ('init', 'demo', 'update'):
-                    if package in tools.config[kind] or 'all' in tools.config[kind] or kind in force:
-                        setattr(node, kind, True)
            else:
                later.add(package)
                packages.append((package, info))
@@ -185,18 +186,11 @@ class Node(Singleton):
        node.depth = self.depth + 1
        if node not in self.children:
            self.children.append(node)
-        for attr in ('init', 'update', 'demo'):
-            if hasattr(self, attr):
-                setattr(node, attr, True)
        self.children.sort(lambda x, y: cmp(x.name, y.name))
        return node

    def __setattr__(self, name, value):
        super(Singleton, self).__setattr__(name, value)
-        if name in ('init', 'update', 'demo'):
-            tools.config[name][self.name] = 1
-            for child in self.children:
-                setattr(child, name, value)
        if name == 'depth':
            for child in self.children:
                setattr(child, name, value + 1)
@@ -42,6 +42,7 @@ from openerp import SUPERUSER_ID

 from openerp import SUPERUSER_ID
 from openerp.tools.translate import _
+from openerp.tools import assertion_report
 from openerp.modules.module import initialize_sys_path, \
    load_openerp_module, init_module_models

@@ -157,7 +158,7 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=

        models = pool.load(cr, package)
        loaded_modules.append(package.name)
-        if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
+        if package.state in ('to install', 'to upgrade'):
            init_module_models(cr, package.name, models)
        pool._init_modules.add(package.name)
        status['progress'] = float(index) / len(graph)
@@ -171,18 +172,19 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=

        idref = {}

-        mode = 'update'
-        if hasattr(package, 'init') or package.state == 'to install':
+        if package.state == 'to install':
            mode = 'init'
+        else:
+            mode = 'update'

-        if hasattr(package, 'init') or hasattr(package, 'update') or package.state in ('to install', 'to upgrade'):
+        if package.state in ('to install', 'to upgrade'):
            if package.state=='to upgrade':
                # upgrading the module information
                modobj.write(cr, SUPERUSER_ID, [module_id], modobj.get_values_from_terp(package.data))
            load_init_xml(module_name, idref, mode)
            load_update_xml(module_name, idref, mode)
            load_data(module_name, idref, mode)
-            if hasattr(package, 'demo') or (package.dbdemo and package.state != 'installed'):
+            if package.dbdemo and package.state != 'installed':
                status['progress'] = (index + 0.75) / len(graph)
                load_demo_xml(module_name, idref, mode)
                load_demo(module_name, idref, mode)
@@ -212,9 +214,6 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
            modobj.update_translations(cr, SUPERUSER_ID, [module_id], None)

            package.state = 'installed'
-            for kind in ('init', 'demo', 'update'):
-                if hasattr(package, kind):
-                    delattr(package, kind)

        cr.commit()
    
@@ -269,10 +268,7 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
        if not openerp.modules.db.is_initialized(cr):
            _logger.info("init db")
            openerp.modules.db.initialize(cr)
-            tools.config["init"]["all"] = 1
-            tools.config['update']['all'] = 1
-            if not tools.config['without_demo']:
-                tools.config["demo"]['all'] = 1
+            update_module = True

        # This is a brand new pool, just created in pooler.get_db_and_pool()
        pool = pooler.get_pool(cr.dbname)
@@ -282,43 +278,51 @@ def load_modules(db, force_demo=False, status=None, update_module=False):

        # STEP 1: LOAD BASE (must be done before module dependencies can be computed for later steps) 
        graph = openerp.modules.graph.Graph()
-        graph.add_module(cr, 'base', force)
+        graph.add_module(cr, 'base', force_demo)
        if not graph:
            _logger.critical('module base cannot be loaded! (hint: verify addons-path)')
            raise osv.osv.except_osv(_('Could not load base module'), _('module base cannot be loaded! (hint: verify addons-path)'))

        # processed_modules: for cleanup step after install
        # loaded_modules: to avoid double loading
-        report = pool._assertion_report
-        loaded_modules, processed_modules = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
+        # After load_module_graph(), 'base' has been installed or updated and its state is 'installed'.
+        report = assertion_report.assertion_report()
+        loaded_modules, processed_modules = load_module_graph(cr, graph, status, report=report)

        if tools.config['load_language']:
            for lang in tools.config['load_language'].split(','):
                tools.load_language(cr, lang)

        # STEP 2: Mark other modules to be loaded/updated
+        # This is a one-shot use of tools.config[init|update] from the command line
+        # arguments. It is directly cleared to not interfer with later create/update
+        # issued via RPC.
        if update_module:
            modobj = pool.get('ir.module.module')
-            if ('base' in tools.config['init']) or ('base' in tools.config['update']):
+            if ('base' in tools.config['init']) or ('base' in tools.config['update']) \
+                or ('all' in tools.config['init']) or ('all' in tools.config['update']):
                _logger.info('updating modules list')
                modobj.update_list(cr, SUPERUSER_ID)

+            if 'all' in tools.config['init']:
+                ids = modobj.search(cr, 1, [])
+                tools.config['init'] = dict.fromkeys([m['name'] for m in modobj.read(cr, 1, ids, ['name'])], 1)
+
            _check_module_names(cr, itertools.chain(tools.config['init'].keys(), tools.config['update'].keys()))

-            mods = [k for k in tools.config['init'] if tools.config['init'][k]]
-            if mods:
-                ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
-                if ids:
-                    modobj.button_install(cr, SUPERUSER_ID, ids)
+            mods = [k for k in tools.config['init'] if tools.config['init'][k] and k not in ('base', 'all')]
+            ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'uninstalled'), ('name', 'in', mods)])
+            if ids:
+                modobj.button_install(cr, SUPERUSER_ID, ids) # goes from 'uninstalled' to 'to install'

-            mods = [k for k in tools.config['update'] if tools.config['update'][k]]
-            if mods:
-                ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
-                if ids:
-                    modobj.button_upgrade(cr, SUPERUSER_ID, ids)
-
-            cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
+            mods = [k for k in tools.config['update'] if tools.config['update'][k] and k not in ('base', 'all')]
+            ids = modobj.search(cr, SUPERUSER_ID, ['&', ('state', '=', 'installed'), ('name', 'in', mods)])
+            if ids:
+                modobj.button_upgrade(cr, SUPERUSER_ID, ids) # goes from 'installed' to 'to upgrade'

+        # Remove that funky global one-shot thingy.
+        for kind in ('init', 'demo', 'update'):
+            tools.config[kind] = {}

        # STEP 3: Load marked modules (skipping base which was done in STEP 1)
        # IMPORTANT: this is done in two parts, first loading all installed or
@@ -370,9 +374,6 @@ def load_modules(db, force_demo=False, status=None, update_module=False):
            # Cleanup orphan records
            pool.get('ir.model.data')._process_end(cr, SUPERUSER_ID, processed_modules)

-        for kind in ('init', 'demo', 'update'):
-            tools.config[kind] = {}
-
        cr.commit()

        # STEP 5: Cleanup menus 
@@ -196,10 +196,15 @@ class db(netsvc.ExportService):
            # Try to terminate all other connections that might prevent
            # dropping the database
            try:
-                cr.execute("""SELECT pg_terminate_backend(procpid)
+
+                # PostgreSQL 9.2 renamed pg_stat_activity.procpid to pid:
+                # http://www.postgresql.org/docs/9.2/static/release-9-2.html#AEN110389
+                pid_col = 'pid' if cr._cnx.server_version >= 90200 else 'procpid'
+
+                cr.execute("""SELECT pg_terminate_backend(%(pid_col)s)
                              FROM pg_stat_activity
-                              WHERE datname = %s AND 
-                                    procpid != pg_backend_pid()""",
+                              WHERE datname = %%s AND 
+                                    %(pid_col)s != pg_backend_pid()""" % {'pid_col': pid_col},
                           (db_name,))
            except Exception:
                pass
@@ -1140,6 +1140,10 @@ class test_datetime(ImporterCase):
        """ If there is no tz either in the context or on the user, falls back
        to UTC
        """
+        self.registry('res.users').write(
+            self.cr, openerp.SUPERUSER_ID, [openerp.SUPERUSER_ID],
+            {'tz': False})
+
        result = self.import_(['value'], [['2012-02-03 11:11:11']])
        self.assertFalse(result['messages'])
        self.assertEqual(
@@ -46,6 +46,8 @@ def _eval_expr(cr, ident, workitem, action):
    assert action, 'You used a NULL action in a workflow, use dummy node instead.'
    for line in action.split('\n'):
        line = line.strip()
+        if not line:
+            continue
        uid=ident[0]
        model=ident[1]
        ids=[ident[2]]